From 11bbbfdf080f2a6d13c2f7fa6d2d89843493eec8 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Fri, 16 Feb 2018 22:59:15 +0100 Subject: [PATCH] misc: small fix or general refactoring i did not bother commenting --- modules/wifi_recon.go | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/wifi_recon.go b/modules/wifi_recon.go index 53d1bf7c..2c491223 100644 --- a/modules/wifi_recon.go +++ b/modules/wifi_recon.go @@ -213,6 +213,28 @@ func (w *WiFiRecon) Show(by string) error { return nil } +func (w *WiFiRecon) Configure() error { + ihandle, err := pcap.NewInactiveHandle(w.Session.Interface.Name()) + if err != nil { + return err + } + defer ihandle.CleanUp() + + if err = ihandle.SetRFMon(true); err != nil { + return err + } else if err = ihandle.SetSnapLen(65536); err != nil { + return err + } else if err = ihandle.SetTimeout(pcap.BlockForever); err != nil { + return err + } else if w.handle, err = ihandle.Activate(); err != nil { + return err + } + + w.wifi = NewWiFi(w.Session, w.Session.Interface) + + return nil +} + func (w *WiFiRecon) sendDeauthPacket(ap net.HardwareAddr, client net.HardwareAddr) { for seq := uint16(0); seq < 64; seq++ { if err, pkt := packets.NewDot11Deauth(ap, client, ap, layers.Dot11TypeMgmtDeauthentication, layers.Dot11ReasonClass2FromNonAuth, seq); err != nil { @@ -320,28 +342,6 @@ func (w *WiFiRecon) discoverClients(bs net.HardwareAddr, packet gopacket.Packet) } } -func (w *WiFiRecon) Configure() error { - ihandle, err := pcap.NewInactiveHandle(w.Session.Interface.Name()) - if err != nil { - return err - } - defer ihandle.CleanUp() - - if err = ihandle.SetRFMon(true); err != nil { - return err - } else if err = ihandle.SetSnapLen(65536); err != nil { - return err - } else if err = ihandle.SetTimeout(pcap.BlockForever); err != nil { - return err - } else if w.handle, err = ihandle.Activate(); err != nil { - return err - } - - w.wifi = NewWiFi(w.Session, w.Session.Interface) - - return nil -} - func (w *WiFiRecon) updateStats(packet gopacket.Packet) { radiotapLayer := packet.Layer(layers.LayerTypeRadioTap) if radiotapLayer == nil {