mirror of
https://github.com/bettercap/bettercap
synced 2025-08-20 13:33:21 -07:00
misc: small fix or general refactoring i did not bother commenting
This commit is contained in:
parent
a79ed9b4d4
commit
ff3add0fe2
3 changed files with 9 additions and 6 deletions
|
@ -364,14 +364,14 @@ func (mod *WiFiModule) Configure() error {
|
|||
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
|
||||
} else if mod.shakesFile != "" {
|
||||
if mod.shakesFile, err = fs.Expand(mod.shakesFile); err != nil {
|
||||
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 {
|
||||
|
|
|
@ -89,7 +89,7 @@ func (mod *WiFiModule) discoverHandshakes(radiotap *layers.RadioTap, dot11 *laye
|
|||
numUnsaved := station.Handshake.NumUnsaved()
|
||||
shakesFileName := mod.shakesFile
|
||||
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
|
||||
if doSave && shakesFileName != "" {
|
||||
|
|
|
@ -65,9 +65,12 @@ func (s *Station) IsOpen() bool {
|
|||
}
|
||||
|
||||
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 != "" {
|
||||
name = fmt.Sprintf("%s_%s", name, essid)
|
||||
name = fmt.Sprintf("%s_%s", essid, bssid)
|
||||
} else {
|
||||
name = bssid
|
||||
}
|
||||
return name
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue