From ae223d7110ac74f45425c32668cb3a7643a746d0 Mon Sep 17 00:00:00 2001 From: evilsocket Date: Wed, 6 Feb 2019 08:46:19 +0100 Subject: [PATCH] misc: small fix or general refactoring i did not bother commenting --- modules/wifi_deauth.go | 11 +++++++---- network/wifi_station.go | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/wifi_deauth.go b/modules/wifi_deauth.go index 6a045035..bfe138c6 100644 --- a/modules/wifi_deauth.go +++ b/modules/wifi_deauth.go @@ -130,12 +130,15 @@ func (w *WiFiModule) startDeauth(to net.HardwareAddr) error { client := deauth.Client ap := deauth.Ap if w.Running() { + logger := log.Info + if w.isDeauthSilent() { + logger = log.Debug + } + if ap.IsOpen() && !w.doDeauthOpen() { - log.Debug("skipping deauth for open network %s", ap.ESSID()) + logger("skipping deauth for open network %s (wifi.deauth.open is false)", ap.ESSID()) } else { - if !w.isDeauthSilent() { - log.Info("deauthing client %s from AP %s (channel %d)", client.String(), ap.ESSID(), ap.Channel()) - } + logger("deauthing client %s from AP %s (channel:%d encryption:%s)", client.String(), ap.ESSID(), ap.Channel(), ap.Encryption) w.onChannel(ap.Channel(), func() { w.sendDeauthPacket(ap.HW, client.HW) diff --git a/network/wifi_station.go b/network/wifi_station.go index 243ab715..8e4db9c2 100644 --- a/network/wifi_station.go +++ b/network/wifi_station.go @@ -57,5 +57,5 @@ func (s *Station) HasWPS() bool { } func (s *Station) IsOpen() bool { - return s.Encryption == "" + return s.Encryption == "" || s.Encryption == "OPEN" }