github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-14 02:36:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc: small fix or general refactoring i did not bother commenting

Browse source
This commit is contained in:
evilsocket 2018-02-16 13:54:49 +01:00
commit d2f2bac023
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/wlan_recon.go
View file

@ -275,19 +275,11 @@ func (w *WDiscovery) startDeauth() error {
}
func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) {
var bssid string
var dst net.HardwareAddr
var ssid string
var channel int
radiotapLayer := packet.Layer(layers.LayerTypeRadioTap)
if radiotapLayer == nil {
return
}
radiotap, _ := radiotapLayer.(*layers.RadioTap)
//! InformationElement Layer found
dot11infoLayer := packet.Layer(layers.LayerTypeDot11InformationElement)
if dot11infoLayer == nil {
return
@ -298,19 +290,20 @@ func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) {
return
}
//! Dot11 Layer Found
dot11Layer := packet.Layer(layers.LayerTypeDot11)
if dot11Layer == nil {
return
}
dot11, _ := dot11Layer.(*layers.Dot11)
ssid = string(dot11info.Info)
bssid = dot11.Address3.String()
dst = dot11.Address1
ssid := string(dot11info.Info)
bssid := dot11.Address3.String()
dst := dot11.Address1
// packet sent to broadcast mac with a SSID set?
if bytes.Compare(dst, w.BroadcastMac) == 0 && len(ssid) > 0 {
channel = mhz2chan(int(radiotap.ChannelFrequency))
radiotap, _ := radiotapLayer.(*layers.RadioTap)
channel := mhz2chan(int(radiotap.ChannelFrequency))
w.Stations.AddIfNew(ssid, bssid, true, channel)
}
}
@ -321,8 +314,6 @@ func (w *WDiscovery) discoverClients(bs net.HardwareAddr, packet gopacket.Packet
return
}
radiotap, _ := radiotapLayer.(*layers.RadioTap)
dot11Layer := packet.Layer(layers.LayerTypeDot11)
if dot11Layer == nil {
return
@ -339,8 +330,9 @@ func (w *WDiscovery) discoverClients(bs net.HardwareAddr, packet gopacket.Packet
if toDS && !fromDS {
src := dot11.Address2
bssid := dot11.Address1
// packet going to this specific BSSID?
if bytes.Compare(bssid, bs) == 0 {
radiotap, _ := radiotapLayer.(*layers.RadioTap)
channel := mhz2chan(int(radiotap.ChannelFrequency))
w.Stations.AddIfNew("", src.String(), false, channel)
}