Merge pull request #6 from mikan/5-use-ip-cmd

#5 Use ip command instead arp command if it available

README.md

@@ -21,13 +21,13 @@ See [releases](https://github.com/mikan/arping-gui/releases) page.
 
 1. Check available network adapter information (e.g. eth0)
 2. Send ICMP ping to the target using native `ping` command
-3. Lookup ARP table using native `arp` command
+3. Lookup ARP table using native `arp` (`ip`) command
 
 ### MAC to IP
 
 1. Check available network adapter information (e.g. eth0)
 2. Send ICMP ping to the *broadcast* address using native `ping` command
-3. Lookup ARP table using native `arp` command
+3. Lookup ARP table using native `arp` (`ip`) command
 
 ## Limitations
 

resolver.go

@@ -21,7 +21,11 @@ func ip2mac(ip string, adapter adapter) (string, error) {
 		arpCmd = exec.Command("arp", "-i", adapter.name, ip)
 	default:
 		pingCmd = exec.Command("ping", "-I", adapter.name, "-c", "1", ip)
-		arpCmd = exec.Command("arp", "-i", adapter.name, ip)
+		if _, err := exec.LookPath("ip"); err == nil {
+			arpCmd = exec.Command("ip", "neigh", "show", "dev", adapter.name, ip)
+		} else {
+			arpCmd = exec.Command("arp", "-i", adapter.name, ip)
+		}
 	}
 	if err := pingCmd.Run(); err != nil {
 		return "", err
@@ -51,7 +55,11 @@ func mac2ip(mac string, adapter adapter) (string, error) {
 	default:
 		mac = strings.ReplaceAll(strings.ToLower(mac), "-", ":")
 		pingCmd = exec.Command("ping", "-I", adapter.name, "-c", "1", adapter.broadcast, "-b")
-		arpCmd = exec.Command("arp", "-a", "-i", adapter.name)
+		if _, err := exec.LookPath("ip"); err == nil {
+			arpCmd = exec.Command("ip", "neigh", "show", "dev", adapter.name)
+		} else {
+			arpCmd = exec.Command("arp", "-a", "-i", adapter.name)
+		}
 	}
 	if err := pingCmd.Run(); err != nil {
 		fmt.Printf("WARNING: broadcast ping failed: %v\n", err)