Pass interface argument to arp/ip command if there is only one interface

douglaswth · Jul 27, 2022 · 99dfa88 · 99dfa88
1 parent 7cd34ff
commit 99dfa88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/neighbors/arp_freebsd.go b/neighbors/arp_freebsd.go
@@ -58,6 +58,11 @@ func (a *arp) Present(ctx context.Context, ifs Interfaces, state State, addrStat
 	}
 
 	cmd := exec.CommandContext(ctx, a.cmd, "--libxo=json", "-an")
+	if len(ifs) == 1 {
+		for ifi := range ifs {
+			cmd.Args = append(cmd.Args, "-i", ifi)
+		}
+	}
 	log.Debug(ctx, log.KV{K: "cmd", V: cmd})
 	b, err := cmd.Output()
 	if err != nil {

diff --git a/neighbors/arp_linux.go b/neighbors/arp_linux.go
@@ -46,6 +46,11 @@ func (a *arp) Present(ctx context.Context, ifs Interfaces, state State, addrStat
 	}
 
 	cmd := exec.CommandContext(ctx, a.cmd, "-family", "inet", "-json", "neighbor", "show", "nud", "reachable")
+	if len(ifs) == 1 {
+		for ifi := range ifs {
+			cmd.Args = append(cmd.Args, "dev", ifi)
+		}
+	}
 	log.Debug(ctx, log.KV{K: "cmd", V: cmd})
 	b, err := cmd.Output()
 	if err != nil {