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

fix: wifi.AccessPoint and wifi.Station now export the Channel field via JSON

Browse source
This commit is contained in:
evilsocket 2019-02-24 20:12:41 +01:00
commit 78c341c2b3
No known key found for this signature in database
GPG key ID: 1564D7F30393A456
5 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/wifi/wifi.go
View file

@ -106,7 +106,7 @@ func NewWiFiModule(s *session.Session) *WiFiModule {
return err
} else if ap, found := mod.Session.WiFi.Get(bssid.String()); found {
mod.ap = ap
mod.stickChan = ap.Channel()
mod.stickChan = ap.Channel
return nil
}
return fmt.Errorf("Could not find station with BSSID %s", args[0])

6
modules/wifi/wifi_assoc.go
View file

@ -97,7 +97,7 @@ func (mod *WiFiModule) startAssoc(to net.HardwareAddr) error {
// association request, let's sort by channel so we do the minimum
// amount of hops possible
sort.Slice(toAssoc, func(i, j int) bool {
return toAssoc[i].Channel() < toAssoc[j].Channel()
return toAssoc[i].Channel < toAssoc[j].Channel
})
// send the association request frames
@ -111,9 +111,9 @@ func (mod *WiFiModule) startAssoc(to net.HardwareAddr) error {
if ap.IsOpen() && !mod.doAssocOpen() {
mod.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)
logger("sending association request to AP %s (channel:%d encryption:%s)", ap.ESSID(), ap.Channel, ap.Encryption)
mod.onChannel(ap.Channel(), func() {
mod.onChannel(ap.Channel, func() {
mod.sendAssocPacket(ap)
})
}

6
modules/wifi/wifi_deauth.go
View file

@ -121,7 +121,7 @@ func (mod *WiFiModule) startDeauth(to net.HardwareAddr) error {
// deauth packet, let's sort by channel so we do the minimum
// amount of hops possible
sort.Slice(toDeauth, func(i, j int) bool {
return toDeauth[i].Ap.Channel() < toDeauth[j].Ap.Channel()
return toDeauth[i].Ap.Channel < toDeauth[j].Ap.Channel
})
// send the deauth frames
@ -137,9 +137,9 @@ func (mod *WiFiModule) startDeauth(to net.HardwareAddr) error {
if ap.IsOpen() && !mod.doDeauthOpen() {
mod.Debug("skipping deauth for open network %s (wifi.deauth.open is false)", ap.ESSID())
} else {
logger("deauthing client %s from AP %s (channel:%d encryption:%s)", client.String(), ap.ESSID(), ap.Channel(), ap.Encryption)
logger("deauthing client %s from AP %s (channel:%d encryption:%s)", client.String(), ap.ESSID(), ap.Channel, ap.Encryption)
mod.onChannel(ap.Channel(), func() {
mod.onChannel(ap.Channel, func() {
mod.sendDeauthPacket(ap.HW, client.HW)
})
}

8
modules/wifi/wifi_show.go
View file

@ -86,7 +86,7 @@ func (mod *WiFiModule) getRow(station *network.Station) ([]string, bool) {
rssi,
bssid,
tui.Dim(station.Vendor),
strconv.Itoa(station.Channel()),
strconv.Itoa(station.Channel),
sent,
recvd,
seen,
@ -95,7 +95,7 @@ func (mod *WiFiModule) getRow(station *network.Station) ([]string, bool) {
return []string{
rssi,
bssid,
strconv.Itoa(station.Channel()),
strconv.Itoa(station.Channel),
sent,
recvd,
seen,
@ -137,7 +137,7 @@ func (mod *WiFiModule) getRow(station *network.Station) ([]string, bool) {
ssid,
encryption,
wps,
strconv.Itoa(station.Channel()),
strconv.Itoa(station.Channel),
clients,
sent,
recvd,
@ -150,7 +150,7 @@ func (mod *WiFiModule) getRow(station *network.Station) ([]string, bool) {
ssid,
encryption,
wps,
strconv.Itoa(station.Channel()),
strconv.Itoa(station.Channel),
clients,
sent,
recvd,