github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace if/else by switch

Browse source
This commit is contained in:
Edznux 2018-10-28 18:01:55 +01:00
parent b119f815d9
commit 25a2f48a02
3 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/net_recon_show.go
View file

@ -119,14 +119,14 @@ func (d *Discovery) Show(by string, expr string) (err error) {
} else { } else {
targets = d.Session.Lan.List() targets = d.Session.Lan.List()
} }
switch by {
if by == "seen" { case "seen":
sort.Sort(BySeenSorter(targets)) sort.Sort(BySeenSorter(targets))
} else if by == "sent" { case "sent":
sort.Sort(BySentSorter(targets)) sort.Sort(BySentSorter(targets))
} else if by == "rcvd" { case "rcvd":
sort.Sort(ByRcvdSorter(targets)) sort.Sort(ByRcvdSorter(targets))
} else { default:
sort.Sort(ByAddressSorter(targets)) sort.Sort(ByAddressSorter(targets))
} }

10
modules/wifi_show.go
View file

@ -123,14 +123,14 @@ func (w *WiFiModule) Show(by string) error {
} else { } else {
stations = w.Session.WiFi.Stations() stations = w.Session.WiFi.Stations()
} }
switch by {
if by == "seen" { case "seen":
sort.Sort(ByWiFiSeenSorter(stations)) sort.Sort(ByWiFiSeenSorter(stations))
} else if by == "essid" { case "essid":
sort.Sort(ByEssidSorter(stations)) sort.Sort(ByEssidSorter(stations))
} else if by == "channel" { case "channel":
sort.Sort(ByChannelSorter(stations)) sort.Sort(ByChannelSorter(stations))
} else { default:
sort.Sort(ByRSSISorter(stations)) sort.Sort(ByRSSISorter(stations))
} }

19
session/module_param.go
View file

@ -64,9 +64,10 @@ func (p ModuleParam) Validate(value string) (error, interface{}) {
} }
} }
if p.Type == STRING { switch p.Type {
case STRING:
return nil, value return nil, value
} else if p.Type == BOOL { case BOOL:
lvalue := strings.ToLower(value) lvalue := strings.ToLower(value)
if lvalue == "true" { if lvalue == "true" {
return nil, true return nil, true
@ -75,7 +76,7 @@ func (p ModuleParam) Validate(value string) (error, interface{}) {
} else { } else {
return fmt.Errorf("Can't typecast '%s' to boolean.", value), nil return fmt.Errorf("Can't typecast '%s' to boolean.", value), nil
} }
} else if p.Type == INT { case INT:
i, err := strconv.Atoi(value) i, err := strconv.Atoi(value)
return err, i return err, i
} }
@ -90,17 +91,21 @@ const ParamRandomMAC = "<random mac>"
func (p ModuleParam) Get(s *Session) (error, interface{}) { func (p ModuleParam) Get(s *Session) (error, interface{}) {
_, v := s.Env.Get(p.Name) _, v := s.Env.Get(p.Name)
if v == ParamIfaceName { switch v {
case ParamIfaceName:
v = s.Interface.Name() v = s.Interface.Name()
} else if v == ParamIfaceAddress { case ParamIfaceAddress:
v = s.Interface.IpAddress v = s.Interface.IpAddress
} else if v == ParamSubnet { case ParamSubnet:
v = s.Interface.CIDR() v = s.Interface.CIDR()
} else if v == ParamRandomMAC { case ParamRandomMAC:
hw := make([]byte, 6) hw := make([]byte, 6)
rand.Read(hw) rand.Read(hw)
v = net.HardwareAddr(hw).String() v = net.HardwareAddr(hw).String()
default:
return fmt.Errorf("Uknown value for v"), nil
} }
return p.Validate(v) return p.Validate(v)
} }