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

This commit is contained in:
evilsocket 2018-02-16 22:47:58 +01:00
commit 86456e76a9
2 changed files with 7 additions and 9 deletions

View file

@ -30,7 +30,6 @@ type WDiscovery struct {
wifi *WiFi
stats *WiFiStats
handle *pcap.Handle
BroadcastMac []byte
cliTarget net.HardwareAddr
apTarget net.HardwareAddr
}
@ -283,7 +282,7 @@ func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) {
dst := dot11.Address1
// packet sent to broadcast mac with a SSID set?
if bytes.Compare(dst, w.BroadcastMac) == 0 && len(ssid) > 0 {
if bytes.Compare(dst, network.BroadcastMac) == 0 && len(ssid) > 0 {
radiotap, _ := radiotapLayer.(*layers.RadioTap)
channel := mhz2chan(int(radiotap.ChannelFrequency))
w.wifi.AddIfNew(ssid, bssid, true, channel)
@ -341,7 +340,6 @@ func (w *WDiscovery) Configure() error {
}
w.wifi = NewWiFi(w.Session, w.Session.Interface)
w.BroadcastMac, _ = net.ParseMAC(network.BroadcastMac)
return nil
}

View file

@ -12,12 +12,12 @@ import (
const (
MonitorModeAddress = "0.0.0.0"
BroadcastMac = "ff:ff:ff:ff:ff:ff"
IPv4MulticastStart = "01:00:5e:00:00:00"
IPv4MulticastEnd = "01:00:5e:7f:ff:ff"
)
var (
BroadcastMac = []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
IPv4Validator = regexp.MustCompile("^[0-9\\.]+/?\\d*$")
)