github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 13:33:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: each module now has its own tagged logging

Browse source
This commit is contained in:
evilsocket 2019-02-12 15:16:02 +01:00
commit 9cd4e380fb
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
47 changed files with 343 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/wifi/wifi_assoc.go
View file

@ -6,20 +6,19 @@ import (
"net"
"sort"
"github.com/bettercap/bettercap/log"
"github.com/bettercap/bettercap/network"
"github.com/bettercap/bettercap/packets"
)
func (w *WiFiModule) sendAssocPacket(ap *network.AccessPoint) {
if err, pkt := packets.NewDot11Auth(w.Session.Interface.HW, ap.HW, 1); err != nil {
log.Error("cloud not create auth packet: %s", err)
w.Error("cloud not create auth packet: %s", err)
} else {
w.injectPacket(pkt)
}
if err, pkt := packets.NewDot11AssociationRequest(w.Session.Interface.HW, ap.HW, ap.ESSID(), 1); err != nil {
log.Error("cloud not create association request packet: %s", err)
w.Error("cloud not create association request packet: %s", err)
} else {
w.injectPacket(pkt)
}
@ -36,7 +35,7 @@ func (w *WiFiModule) skipAssoc(to net.HardwareAddr) bool {
func (w *WiFiModule) isAssocSilent() bool {
if err, is := w.BoolParam("wifi.assoc.silent"); err != nil {
log.Warning("%v", err)
w.Warning("%v", err)
} else {
w.assocSilent = is
}
@ -45,7 +44,7 @@ func (w *WiFiModule) isAssocSilent() bool {
func (w *WiFiModule) doAssocOpen() bool {
if err, is := w.BoolParam("wifi.assoc.open"); err != nil {
log.Warning("%v", err)
w.Warning("%v", err)
} else {
w.assocOpen = is
}
@ -78,7 +77,7 @@ func (w *WiFiModule) startAssoc(to net.HardwareAddr) error {
if !w.skipAssoc(ap.HW) {
toAssoc = append(toAssoc, ap)
} else {
log.Debug("skipping ap:%v because skip list %v", ap, w.assocSkip)
w.Debug("skipping ap:%v because skip list %v", ap, w.assocSkip)
}
}
}
@ -104,13 +103,13 @@ func (w *WiFiModule) startAssoc(to net.HardwareAddr) error {
// send the association request frames
for _, ap := range toAssoc {
if w.Running() {
logger := log.Info
logger := w.Info
if w.isAssocSilent() {
logger = log.Debug
logger = w.Debug
}
if ap.IsOpen() && !w.doAssocOpen() {
log.Debug("skipping association for open network %s (wifi.assoc.open is false)", ap.ESSID())
w.Debug("skipping association for open network %s (wifi.assoc.open is false)", ap.ESSID())
} else {
logger("sending association request to AP %s (channel:%d encryption:%s)", ap.ESSID(), ap.Channel(), ap.Encryption)