github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 13:09:49 -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 2019-08-22 13:48:52 -04:00
commit ff3add0fe2
No known key found for this signature in database
GPG key ID: 82E42E7F3B34C97E
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/wifi/wifi.go
View file

@ -364,14 +364,14 @@ func (mod *WiFiModule) Configure() error {
return err return err
} }
if err, mod.shakesFile = mod.StringParam("wifi.handshakes.file"); err != nil { if err, mod.shakesAggregate = mod.BoolParam("wifi.handshakes.aggregate"); err != nil {
return err
} else if err, mod.shakesFile = mod.StringParam("wifi.handshakes.file"); err != nil {
return err return err
} else if mod.shakesFile != "" { } else if mod.shakesFile != "" {
if mod.shakesFile, err = fs.Expand(mod.shakesFile); err != nil { if mod.shakesFile, err = fs.Expand(mod.shakesFile); err != nil {
return err return err
} }
} else if err, mod.shakesAggregate = mod.BoolParam("wifi.handshakes.aggregate"); err != nil {
return err
} }
if err, ifName = mod.StringParam("wifi.interface"); err != nil { if err, ifName = mod.StringParam("wifi.interface"); err != nil {

2
modules/wifi/wifi_recon_handshakes.go
View file

@ -89,7 +89,7 @@ func (mod *WiFiModule) discoverHandshakes(radiotap *layers.RadioTap, dot11 *laye
numUnsaved := station.Handshake.NumUnsaved() numUnsaved := station.Handshake.NumUnsaved()
shakesFileName := mod.shakesFile shakesFileName := mod.shakesFile
if mod.shakesAggregate == false { if mod.shakesAggregate == false {
shakesFileName = path.Join(shakesFileName, fmt.Sprintf("%s.pcap", station.PathFriendlyName())) shakesFileName = path.Join(shakesFileName, fmt.Sprintf("%s.pcap", ap.PathFriendlyName()))
} }
doSave := numUnsaved > 0 doSave := numUnsaved > 0
if doSave && shakesFileName != "" { if doSave && shakesFileName != "" {

7
network/wifi_station.go
View file

@ -65,9 +65,12 @@ func (s *Station) IsOpen() bool {
} }
func (s *Station) PathFriendlyName() string { func (s *Station) PathFriendlyName() string {
name := strings.Replace(s.HwAddress, ":", "", -1) name := ""
bssid := strings.Replace(s.HwAddress, ":", "", -1)
if essid := pathNameCleaner.ReplaceAllString(s.Hostname, ""); essid != "" { if essid := pathNameCleaner.ReplaceAllString(s.Hostname, ""); essid != "" {
name = fmt.Sprintf("%s_%s", name, essid) name = fmt.Sprintf("%s_%s", essid, bssid)
} else {
name = bssid
} }
return name return name
} }