github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-30 03:29: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:27:28 +01:00
parent f5606f081e
commit f01e9021a1
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
modules/wlan_recon.go
View file

@ -25,8 +25,8 @@ type WDiscovery struct {
session.SessionModule session.SessionModule
Stations *WiFi Stations *WiFi
ClientTarget net.HardwareAddr cliTarget net.HardwareAddr
BSTarget net.HardwareAddr apTarget net.HardwareAddr
Handle *pcap.Handle Handle *pcap.Handle
BroadcastMac []byte BroadcastMac []byte
@ -35,8 +35,8 @@ type WDiscovery struct {
func NewWDiscovery(s *session.Session) *WDiscovery { func NewWDiscovery(s *session.Session) *WDiscovery {
w := &WDiscovery{ w := &WDiscovery{
SessionModule: session.NewSessionModule("wlan.recon", s), SessionModule: session.NewSessionModule("wlan.recon", s),
ClientTarget: make([]byte, 0), cliTarget: make([]byte, 0),
BSTarget: make([]byte, 0), apTarget: make([]byte, 0),
} }
w.AddHandler(session.NewModuleHandler("wlan.recon on", "", w.AddHandler(session.NewModuleHandler("wlan.recon on", "",
@ -61,14 +61,14 @@ func NewWDiscovery(s *session.Session) *WDiscovery {
"Set client to deauth (single target).", "Set client to deauth (single target).",
func(args []string) error { func(args []string) error {
var err error var err error
w.ClientTarget, err = net.ParseMAC(args[0]) w.cliTarget, err = net.ParseMAC(args[0])
return err return err
})) }))
w.AddHandler(session.NewModuleHandler("wlan.recon clear client", "", w.AddHandler(session.NewModuleHandler("wlan.recon clear client", "",
"Remove client to deauth.", "Remove client to deauth.",
func(args []string) error { func(args []string) error {
w.ClientTarget = make([]byte, 0) w.cliTarget = make([]byte, 0)
return nil return nil
})) }))
@ -79,7 +79,7 @@ func NewWDiscovery(s *session.Session) *WDiscovery {
if w.Stations != nil { if w.Stations != nil {
w.Stations.Clear() w.Stations.Clear()
} }
w.BSTarget, err = net.ParseMAC(args[0]) w.apTarget, err = net.ParseMAC(args[0])
return err return err
})) }))
@ -89,7 +89,7 @@ func NewWDiscovery(s *session.Session) *WDiscovery {
if w.Stations != nil { if w.Stations != nil {
w.Stations.Clear() w.Stations.Clear()
} }
w.BSTarget = make([]byte, 0) w.apTarget = make([]byte, 0)
return nil return nil
})) }))
@ -234,7 +234,7 @@ func (w *WDiscovery) buildDeauthPkt(address1 net.HardwareAddr, address2 net.Hard
return buffer.Bytes() return buffer.Bytes()
} }
func (w *WDiscovery) SendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) { func (w *WDiscovery) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) {
var pkt []byte var pkt []byte
var err error var err error
@ -260,12 +260,12 @@ func (w *WDiscovery) SendDeauthPacket(ap net.HardwareAddr, client net.HardwareAd
func (w *WDiscovery) startDeauth() error { func (w *WDiscovery) startDeauth() error {
switch { switch {
case len(w.BSTarget) > 0 && len(w.ClientTarget) > 0: case len(w.apTarget) > 0 && len(w.cliTarget) > 0:
w.SendDeauthPacket(w.BSTarget, w.ClientTarget) w.sendDeauthPacket(w.apTarget, w.cliTarget)
case len(w.BSTarget) > 0: case len(w.apTarget) > 0:
for _, t := range w.Stations.Stations { for _, t := range w.Stations.Stations {
w.SendDeauthPacket(w.BSTarget, t.Endpoint.HW) w.sendDeauthPacket(w.apTarget, t.Endpoint.HW)
} }
default: default:
@ -275,7 +275,7 @@ func (w *WDiscovery) startDeauth() error {
return nil return nil
} }
func (w *WDiscovery) BSScan(packet gopacket.Packet) { func (w *WDiscovery) discoverAccessPoints(packet gopacket.Packet) {
var bssid string var bssid string
var dst net.HardwareAddr var dst net.HardwareAddr
var ssid string var ssid string
@ -316,7 +316,7 @@ func (w *WDiscovery) BSScan(packet gopacket.Packet) {
} }
} }
func (w *WDiscovery) ClientScan(bs net.HardwareAddr, packet gopacket.Packet) { func (w *WDiscovery) discoverClients(bs net.HardwareAddr, packet gopacket.Packet) {
radiotapLayer := packet.Layer(layers.LayerTypeRadioTap) radiotapLayer := packet.Layer(layers.LayerTypeRadioTap)
if radiotapLayer == nil { if radiotapLayer == nil {
return return
@ -392,10 +392,10 @@ func (w *WDiscovery) Start() error {
break break
} }
if len(w.BSTarget) > 0 { if len(w.apTarget) > 0 {
w.ClientScan(w.BSTarget, packet) w.discoverClients(w.apTarget, packet)
} else { } else {
w.BSScan(packet) w.discoverAccessPoints(packet)
} }
} }
}) })