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

fix: new wifi.skip-broken option, default to true, to skip dot11 packets with an invalid checksum ( ref #61 )

Browse source
This commit is contained in:
evilsocket 2018-02-24 21:23:46 +01:00
parent 107109a7ac
commit e753245221
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/wifi_recon.go
View file

@ -33,6 +33,7 @@ type WiFiRecon struct {
frequencies []int frequencies []int
ap *network.AccessPoint ap *network.AccessPoint
stickChan int stickChan int
skipBroken bool
} }
func NewWiFiRecon(s *session.Session) *WiFiRecon { func NewWiFiRecon(s *session.Session) *WiFiRecon {
@ -42,6 +43,7 @@ func NewWiFiRecon(s *session.Session) *WiFiRecon {
stickChan: 0, stickChan: 0,
hopPeriod: 250 * time.Millisecond, hopPeriod: 250 * time.Millisecond,
ap: nil, ap: nil,
skipBroken: true,
} }
w.AddHandler(session.NewModuleHandler("wifi.recon on", "", w.AddHandler(session.NewModuleHandler("wifi.recon on", "",
@ -102,6 +104,10 @@ func NewWiFiRecon(s *session.Session) *WiFiRecon {
"250", "250",
"If channel hopping is enabled (empty wifi.recon.channel), this is the time in millseconds the algorithm will hop on every channel (it'll be doubled if both 2.4 and 5.0 bands are available).")) "If channel hopping is enabled (empty wifi.recon.channel), this is the time in millseconds the algorithm will hop on every channel (it'll be doubled if both 2.4 and 5.0 bands are available)."))
w.AddParam(session.NewBoolParameter("wifi.skip-broken",
"true",
"If true, dot11 packets with an invalid checksum will be skipped."))
return w return w
} }
@ -287,7 +293,9 @@ func (w *WiFiRecon) Configure() error {
return err return err
} }
if err, hopPeriod = w.IntParam("wifi.hop.period"); err != nil { if err, w.skipBroken = w.BoolParam("wifi.skip-broken"); err != nil {
return err
} else if err, hopPeriod = w.IntParam("wifi.hop.period"); err != nil {
return err return err
} }
@ -526,6 +534,12 @@ func (w *WiFiRecon) Start() error {
// perform initial dot11 parsing and layers validation // perform initial dot11 parsing and layers validation
if ok, radiotap, dot11 := packets.Dot11Parse(packet); ok == true { if ok, radiotap, dot11 := packets.Dot11Parse(packet); ok == true {
// check FCS checksum
if w.skipBroken && dot11.ChecksumValid() == false {
log.Debug("Skipping dot11 packet with invalid checksum.")
continue
}
w.updateStats(dot11, packet) w.updateStats(dot11, packet)
w.discoverAccessPoints(radiotap, dot11, packet) w.discoverAccessPoints(radiotap, dot11, packet)
w.discoverClients(radiotap, dot11, packet) w.discoverClients(radiotap, dot11, packet)