github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 21:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: using iw instead of iwconfig whenever possible (fixes #657)

Browse source
This commit is contained in:
Simone Margaritelli 2019-11-25 11:59:04 +01:00
commit 2f3390cf36
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
network/net.go
View file

@ -285,7 +285,14 @@ func ActivateInterface(name string) error {
} }
func SetInterfaceTxPower(name string, txpower int) error { func SetInterfaceTxPower(name string, txpower int) error {
if core.HasBinary("iwconfig") { if core.HasBinary("iw") {
Debug("SetInterfaceTxPower(%s, %d) iw based", name, txpower)
if _, err := core.Exec("iw", []string{"dev", name, "set", "txpower", fmt.Sprintf("%dmBm",
txpower)}); err != nil {
return err
}
} else if core.HasBinary("iwconfig") {
Debug("SetInterfaceTxPower(%s, %d) iwconfig based", name, txpower)
if out, err := core.Exec("iwconfig", []string{name, "txpower", fmt.Sprintf("%d", txpower)}); err != nil { if out, err := core.Exec("iwconfig", []string{name, "txpower", fmt.Sprintf("%d", txpower)}); err != nil {
return err return err
} else if out != "" { } else if out != "" {

21
network/net_linux.go
View file

@ -41,11 +41,22 @@ func SetInterfaceChannel(iface string, channel int) error {
return nil return nil
} }
out, err := core.Exec("iwconfig", []string{iface, "channel", fmt.Sprintf("%d", channel)}) if core.HasBinary("iw") {
if err != nil { Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel)
return err out, err := core.Exec("iw", []string{"dev", iface, "set", "channel", fmt.Sprintf("%d", channel)})
} else if out != "" { if err != nil {
return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out) return err
} else if out != "" {
return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out)
}
} else if core.HasBinary("iwconfig") {
Debug("SetInterfaceChannel(%s, %d) iwconfig based")
out, err := core.Exec("iwconfig", []string{iface, "channel", fmt.Sprintf("%d", channel)})
if err != nil {
return err
} else if out != "" {
return fmt.Errorf("Unexpected output while setting interface %s to channel %d: %s", iface, channel, out)
}
} }
SetInterfaceCurrentChannel(iface, channel) SetInterfaceCurrentChannel(iface, channel)