merge

Author: stealthcopter

app/build.gradle

@@ -34,8 +34,8 @@ android {
     targetSdkVersion targetSdkVer
 
     // When updating these, remember to update the vars in the root build.gradle
-    versionName "0.4.5.2"
-    versionCode 20
+    versionName "0.4.5.3"
+    versionCode 21
 
     archivesBaseName = "AndroidNetworkTools"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.stealthcotper.networktools"
+    android:installLocation="auto"
     >
 
   <uses-permission android:name="android.permission.INTERNET" />

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.1'
+    classpath 'com.android.tools.build:gradle:3.5.3'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
@@ -30,7 +30,9 @@ subprojects {
   ext.targetSdkVer = 29
   ext.supportLibVer = "27.1.1"
 
-  // When updating these, remember to update the vars in app/build.gradle (for FDroid compatibility)
-  ext.appVersionName = "0.4.5.2"
-  ext.appVersionCode = 20
+  // When updating these, remember to update the vars in app/build.gradle (for FDroid comptability)
+  // Remember to update readme, and lets keep these version numbers in line with the github releases
+  ext.appVersionName = "0.4.5.3"
+  ext.appVersionCode = 21
+
 }

library/src/main/java/com/stealthcopter/networktools/ARPInfo.java

@@ -3,16 +3,21 @@
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+
 /**
  * Looks at the file at /proc/net/arp to fromIPAddress ip/mac addresses from the cache
  * We assume that the file has this structure:
  *
  * IP address       HW type     Flags       HW address            Mask     Device
  * 192.168.18.11    0x1         0x2         00:04:20:06:55:1a     *        eth0
  * 192.168.18.36    0x1         0x2         00:22:43:ab:2a:5b     *        eth0
+ *
+ * Also looks at the output from `ip sleigh show` command
+ *
  */
 public class ARPInfo {
 
@@ -22,8 +27,7 @@ private ARPInfo() {
 
 
     /**
-     * Try to extract a hardware MAC address from a given IP address using the
-     * ARP cache (/proc/net/arp).
+     * Try to extract a hardware MAC address from a given IP address
      *
      * @param ip - IP address to search for
      * @return the MAC from the ARP cache or null in format "01:23:45:67:89:ab"
@@ -33,24 +37,13 @@ public static String getMACFromIPAddress(String ip) {
             return null;
         }
 
-        for (String line : getLinesInARPCache()) {
-            String[] splitted = line.split(" +");
-            if (splitted.length >= 4 && ip.equals(splitted[0])) {
-                String mac = splitted[3];
-                if (mac.matches("..:..:..:..:..:..")) {
-                    return mac;
-                } else {
-                    return null;
-                }
-            }
-        }
-        return null;
+        HashMap<String, String> cache = getAllIPAndMACAddressesInARPCache();
+        return cache.get(ip);
     }
 
 
     /**
-     * Try to extract a IP address from the given MAC address using the
-     * ARP cache (/proc/net/arp).
+     * Try to extract a IP address from the given MAC address
      *
      * @param macAddress in format "01:23:45:67:89:ab" to search for
      * @return the IP address found or null in format "192.168.0.1"
@@ -64,15 +57,16 @@ public static String getIPAddressFromMAC(String macAddress) {
             throw new IllegalArgumentException("Invalid MAC Address");
         }
 
-        for (String line : getLinesInARPCache()) {
-            String[] splitted = line.split(" +");
-            if (splitted.length >= 4 && macAddress.equals(splitted[3])) {
-                return splitted[0];
+        HashMap<String, String> cache = getAllIPAndMACAddressesInARPCache();
+        for (String ip : cache.keySet()) {
+            if (cache.get(ip).equalsIgnoreCase(macAddress)) {
+                return ip;
             }
         }
         return null;
     }
 
+
     /**
      * Returns all the ip addresses currently in the ARP cache (/proc/net/arp).
      *
@@ -93,19 +87,24 @@ public static ArrayList<String> getAllMACAddressesInARPCache() {
 
 
     /**
-     * Returns all the IP/MAC address pairs currently in the ARP cache (/proc/net/arp).
+     * Returns all the IP/MAC address pairs currently in the following places
+     *
+     * 1. ARP cache (/proc/net/arp).
+     * 2. `ip neigh show` command
      *
      * @return list of IP/MAC address pairs found
      */
     public static HashMap<String, String> getAllIPAndMACAddressesInARPCache() {
-        HashMap<String, String> macList = new HashMap<>();
+        HashMap<String, String> macList = getAllIPandMACAddressesFromIPSleigh();
         for (String line : getLinesInARPCache()) {
             String[] splitted = line.split(" +");
             if (splitted.length >= 4) {
                 // Ignore values with invalid MAC addresses
                 if (splitted[3].matches("..:..:..:..:..:..")
                         && !splitted[3].equals("00:00:00:00:00:00")) {
-                    macList.put(splitted[0], splitted[3]);
+                    if (!macList.containsKey(splitted[0])) {
+                        macList.put(splitted[0], splitted[3]);
+                    }
                 }
             }
         }
@@ -140,4 +139,37 @@ private static ArrayList<String> getLinesInARPCache() {
         return lines;
     }
 
+
+    /**
+     * Get the IP / MAC address pairs from `ip sleigh show` command
+     *
+     * @return hashmap of ips and mac addresses
+     */
+    private static HashMap<String, String> getAllIPandMACAddressesFromIPSleigh() {
+        HashMap<String, String> macList = new HashMap<>();
+
+        try {
+            Runtime runtime = Runtime.getRuntime();
+            Process proc = runtime.exec("ip neigh show");
+            proc.waitFor();
+            int exit = proc.exitValue();
+
+            InputStreamReader reader = new InputStreamReader(proc.getInputStream());
+            BufferedReader buffer = new BufferedReader(reader);
+            String line;
+            while ((line = buffer.readLine()) != null) {
+                String[] splits = line.split(" ");
+                if (splits.length < 4) {
+                    continue;
+                }
+                macList.put(splits[0], splits[4]);
+            }
+
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+        }
+
+        return macList;
+    }
+
 }

library/src/test/java/com/stealthcopter/networktools/IPToolsTest.java

@@ -1,15 +1,14 @@
 package com.stealthcopter.networktools;
 
+import static org.hamcrest.CoreMatchers.is;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.List;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Created by matthew on 03/11/17.
@@ -36,48 +35,25 @@ String[] getIPv6AddressesHexCompresed() {
 
     @Test
     public void testIsIPv4Address() {
+        assertIPv4Address(getIPv4Addresses(), true);
+        assertIPv4Address(getIPv6Addresses(), false);
+        assertIPv4Address(getInvalidIpAddresses(), false);
+    }
 
-        for (String address : getIPv4Addresses()) {
-            assertTrue(IPTools.isIPv4Address(address));
-        }
 
-        for (String address : getIPv6Addresses()) {
-            assertFalse(IPTools.isIPv4Address(address));
-        }
-
-        for (String address : getInvalidIpAddresses()) {
-            assertFalse(IPTools.isIPv4Address(address));
-        }
-    }
 
     @Test
     public void testIsIPv6Address() {
-        for (String address : getIPv4Addresses()) {
-            assertFalse(IPTools.isIPv6Address(address));
-        }
-
-        for (String address : getIPv6Addresses()) {
-            assertTrue(IPTools.isIPv6Address(address));
-        }
-
-        for (String address : getInvalidIpAddresses()) {
-            assertFalse(IPTools.isIPv6Address(address));
-        }
+        assertIPv6Address(getIPv4Addresses(), false);
+        assertIPv6Address(getIPv6Addresses(), true);
+        assertIPv6Address(getInvalidIpAddresses(), false);
     }
 
     @Test
     public void testIsIPv6AddressesStandard() {
-        for (String address : getIPv4Addresses()) {
-            assertFalse(IPTools.isIPv6StdAddress(address));
-        }
-
-        for (String address : getIPv6Addresses()) {
-            assertTrue(IPTools.isIPv6StdAddress(address));
-        }
-
-        for (String address : getInvalidIpAddresses()) {
-            assertFalse(IPTools.isIPv6StdAddress(address));
-        }
+        assertIPv6StdAddress(getIPv4Addresses(), false);
+        assertIPv6StdAddress(getIPv6Addresses(), true);
+        assertIPv6StdAddress(getInvalidIpAddresses(), false);
     }
 
     @Test
@@ -123,4 +99,22 @@ public void testLocalAddressesNetwork() throws UnknownHostException {
         assertFalse(IPTools.isIpAddressLocalNetwork(InetAddress.getByName("8.8.8.8")));
     }
 
+    private void assertIPv4Address(String[] ips, boolean isIPv4Address) {
+        for (String address : ips) {
+            assertThat(IPTools.isIPv4Address(address), is(isIPv4Address));
+        }
+    }
+
+    private void assertIPv6Address(String[] ips, boolean isIPv6Address) {
+        for (String address : ips) {
+            assertThat(IPTools.isIPv6Address(address), is(isIPv6Address));
+        }
+    }
+
+    private void assertIPv6StdAddress(String[] ips, boolean isIPv6StdAddress) {
+        for (String address : ips) {
+            assertThat(IPTools.isIPv6StdAddress(address), is(isIPv6StdAddress));
+        }
+    }
+
 }

readme.md

@@ -1,3 +1,5 @@
+> :warning: **Not under active development**: I am no longer actively developing this project as I have other priorities. However, I will still review and accept pull requests with bug fixes and enhancements.
+
 # Android Network Tools ![image](./app/src/main/res/mipmap-xhdpi/ic_launcher.png)
 
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-AndroidNetworkTools-green.svg?style=true)](https://android-arsenal.com/details/1/3112)
@@ -17,9 +19,14 @@ The javadoc should provide all information needed to understand the methods, but
 
 ### Sample app
 
-The sample app is published on Google play to allow you to quickly and easier test the library. Enjoy! And please do feedback to us if your tests produce different results. 
+The sample app is published on Google Play & F-Droid to allow you to quickly and easier test the library. Enjoy! And please do feedback to us if your tests produce different results. 
 
-<a href="https://play.google.com/store/apps/details?id=com.stealthcotper.networktools&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" width="150"/></a>
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="70">](https://f-droid.org/packages/com.stealthcotper.networktools/)
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="70">](https://play.google.com/store/apps/details?id=com.stealthcotper.networktools)
 
 ## Usage
 
@@ -41,7 +48,7 @@ then add a library dependency. **Remember** to check for latest release [here](h
 
 ```groovy
     dependencies {
-        compile 'com.github.stealthcopter:AndroidNetworkTools:0.4.0'
+        compile 'com.github.stealthcopter:AndroidNetworkTools:0.4.5.3'
     }
 ```
 
@@ -140,7 +147,6 @@ Other useful methods:
 
 It's a standard gradle project.
 
-
 # Contributing
 
 I welcome pull requests, issues and feedback.
@@ -150,4 +156,3 @@ I welcome pull requests, issues and feedback.
 - Commit your changes (git commit -am 'Added some feature')
 - Push to the branch (git push origin my-new-feature)
 - Create new Pull Request
-