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

bettercap · Nov 25, 2019 · 2f3390c · 2f3390c
1 parent 83c6cde
commit 2f3390c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/network/net.go b/network/net.go
@@ -285,7 +285,14 @@ func ActivateInterface(name string) 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 {
  return err
  } else if out != "" {

diff --git a/network/net_linux.go b/network/net_linux.go
@@ -41,11 +41,22 @@ func SetInterfaceChannel(iface string, channel int) error {
  return nil
  }
 
- 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)
+ if core.HasBinary("iw") {
+ Debug("SetInterfaceChannel(%s, %d) iw based", iface, channel)
+ out, err := core.Exec("iw", []string{"dev", iface, "set", "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)
+ }
+ } 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)