Updated project libraries and added PortScanUDP, and some tidying

Author: stealthcopter

app/build.gradle

@@ -57,31 +57,17 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
-
-  productFlavors {
-    regular {  }
-    // Add a CI only flavor that has extra permissions needed for CI to perform
-    ci {  }
-  }
-
-}
-
-// Spoon used for CI / Testing
-spoon {
-  debug = true
-  // To grant permissions to Android M >= devices */
-  grantAllPermissions = true
 }
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile "com.android.support:appcompat-v7:$supportLibVer"
-  compile "com.android.support:design:$supportLibVer"
-  compile project(':library')
+    implementation project(':library')
+
+    implementation "com.android.support:appcompat-v7:$supportLibVer"
+    implementation "com.android.support:design:$supportLibVer"
 
-  testCompile 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
 
-  androidTestCompile 'com.squareup.spoon:spoon-client:1.6.4'
-  androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-  androidTestCompile('com.android.support.test.espresso:espresso-intents:2.2')
+    androidTestImplementation 'com.squareup.spoon:spoon-client:1.6.4'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation('com.android.support.test.espresso:espresso-intents:2.2')
 }

app/src/main/java/com/stealthcotper/networktools/MainActivity.java

@@ -21,7 +21,7 @@
 import com.stealthcopter.networktools.WakeOnLan;
 import com.stealthcopter.networktools.ping.PingResult;
 import com.stealthcopter.networktools.ping.PingStats;
-import com.stealthcopter.networktools.subnet.SubnetInfo;
+import com.stealthcopter.networktools.subnet.SubnetDevice;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -222,12 +222,12 @@ private void findSubnetDevices() {
 
         SubnetDevices.fromLocalAddress().findDevices(new SubnetDevices.OnSubnetDeviceFound() {
             @Override
-            public void onDeviceFound(SubnetInfo subnetInfo) {
-                appendResultsText("Device: " + subnetInfo.ip+" "+subnetInfo.hostname);
+            public void onDeviceFound(SubnetDevice subnetDevice) {
+                appendResultsText("Device: " + subnetDevice.ip+" "+ subnetDevice.hostname);
             }
 
             @Override
-            public void onFinished(ArrayList<SubnetInfo> devicesFound) {
+            public void onFinished(ArrayList<SubnetDevice> devicesFound) {
                 float timeTaken =  (System.currentTimeMillis() - startTimeMillis)/1000.0f;
                 appendResultsText("Finished "+timeTaken+" s");
             }

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
   repositories {
     jcenter()
+    google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.2'
+    classpath 'com.android.tools.build:gradle:3.1.2'
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
   }
@@ -14,6 +15,7 @@ buildscript {
 allprojects {
   repositories {
     jcenter()
+    google()
   }
 }
 
@@ -22,9 +24,9 @@ task clean(type: Delete) {
 }
 
 subprojects {
-  ext.compileSdkVer = 24
-  ext.buildToolsVer = "24.0.0"
-  ext.minSdkVer = 10
-  ext.targetSdkVer = 24
-  ext.supportLibVer = "24.0.0"
+  ext.compileSdkVer = 27
+  ext.buildToolsVer = "27.0.3"
+  ext.minSdkVer = 14
+  ext.targetSdkVer = 27
+  ext.supportLibVer = "27.1.1"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 09 11:58:50 GMT 2016
+#Tue May 01 19:31:51 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

library/build.gradle

@@ -19,7 +19,9 @@ android {
 }
 
 dependencies {
-  testCompile 'junit:junit:4.12'
-  testCompile 'org.mockito:mockito-core:1.10.19'
-  provided 'com.android.support:appcompat-v7:24.2.0'
+  // Should be easy enough to replace with a non-android annotations class if want to make it
+  // a totally java project
+  implementation 'com.android.support:support-annotations:27.1.1'
+  testImplementation 'junit:junit:4.12'
+  testImplementation 'org.mockito:mockito-core:2.10.0'
 }

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

@@ -1,13 +1,12 @@
 package com.stealthcopter.networktools;
 
 import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
-import android.text.TextUtils;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
  * Created by mat on 09/12/15.
@@ -86,11 +85,7 @@ public static String getIPAddressFromMAC(String macAddress) {
      * @return list of IP addresses found
      */
     public static ArrayList<String> getAllIPAddressesInARPCache() {
-        ArrayList<String> ipList = new ArrayList<>();
-        for (Pair<String, String> ipMacPair : getAllIPAndMACAddressesInARPCache()) {
-            ipList.add(ipMacPair.first);
-        }
-        return ipList;
+        return new ArrayList<>(getAllIPAndMACAddressesInARPCache().keySet());
     }
 
     /**
@@ -99,11 +94,7 @@ public static ArrayList<String> getAllIPAddressesInARPCache() {
      * @return list of MAC addresses found
      */
     public static ArrayList<String> getAllMACAddressesInARPCache() {
-        ArrayList<String> macList = new ArrayList<>();
-        for (Pair<String, String> ipMacPair : getAllIPAndMACAddressesInARPCache()) {
-            macList.add(ipMacPair.second);
-        }
-        return macList;
+        return new ArrayList<>(getAllIPAndMACAddressesInARPCache().values());
     }
 
 
@@ -112,15 +103,15 @@ public static ArrayList<String> getAllMACAddressesInARPCache() {
      *
      * @return list of IP/MAC address pairs found
      */
-    public static ArrayList<Pair<String, String>> getAllIPAndMACAddressesInARPCache() {
-        ArrayList<Pair<String, String>> macList = new ArrayList<>();
+    public static HashMap<String, String> getAllIPAndMACAddressesInARPCache() {
+        HashMap<String, String> macList = new HashMap<>();
         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.add(new Pair<>(splitted[0], splitted[3]));
+                    macList.put(splitted[0], splitted[3]);
                 }
             }
         }

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

@@ -3,7 +3,7 @@
 import android.support.annotation.NonNull;
 
 import com.stealthcopter.networktools.ping.PingResult;
-import com.stealthcopter.networktools.subnet.SubnetInfo;
+import com.stealthcopter.networktools.subnet.SubnetDevice;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -19,16 +19,16 @@ public class SubnetDevices {
     private int noThreads = 255;
 
     private ArrayList<String> addresses;
-    private ArrayList<SubnetInfo> devicesFound;
+    private ArrayList<SubnetDevice> devicesFound;
     private OnSubnetDeviceFound listener;
 
     // This class is not to be instantiated
     private SubnetDevices() {
     }
 
     public interface OnSubnetDeviceFound {
-        void onDeviceFound(SubnetInfo subnetInfo);
-        void onFinished(ArrayList<SubnetInfo> devicesFound);
+        void onDeviceFound(SubnetDevice subnetDevice);
+        void onFinished(ArrayList<SubnetDevice> devicesFound);
     }
 
     /**
@@ -118,9 +118,9 @@ public void findDevices(final OnSubnetDeviceFound listener) {
         this.listener.onFinished(devicesFound);
     }
 
-    private synchronized void subnetDeviceFound(SubnetInfo subnetInfo){
-        devicesFound.add(subnetInfo);
-        listener.onDeviceFound(subnetInfo);
+    private synchronized void subnetDeviceFound(SubnetDevice subnetDevice){
+        devicesFound.add(subnetDevice);
+        listener.onDeviceFound(subnetDevice);
     }
 
     public class SubnetDeviceFinderRunnable implements Runnable {
@@ -136,10 +136,10 @@ public void run() {
                 InetAddress ia = InetAddress.getByName(address);
                 PingResult pingResult = Ping.onAddress(ia).doPing();
                 if (pingResult.isReachable) {
-                    SubnetInfo subnetInfo = new SubnetInfo(ia);
-                    subnetInfo.mac = ARPInfo.getMACFromIPAddress(ia.getHostAddress());
-                    subnetInfo.time = pingResult.timeTaken;
-                    subnetDeviceFound(subnetInfo);
+                    SubnetDevice subnetDevice = new SubnetDevice(ia);
+                    subnetDevice.mac = ARPInfo.getMACFromIPAddress(ia.getHostAddress());
+                    subnetDevice.time = pingResult.timeTaken;
+                    subnetDeviceFound(subnetDevice);
                 }
             } catch (UnknownHostException e) {
                 e.printStackTrace();

library/src/main/java/com/stealthcopter/networktools/ping/PingResult.java

@@ -24,7 +24,7 @@ public boolean isReachable(){
     }
 
     public boolean hasError(){
-        return !TextUtils.isEmpty(error);
+        return error != null;
     }
 
     public float getTimeTaken(){

library/src/main/java/com/stealthcopter/networktools/ping/PingStats.java

@@ -17,7 +17,7 @@ public PingStats(InetAddress ia, long noPings, long packetsLost, float totalTime
         this.ia=ia;
         this.noPings = noPings;
         this.packetsLost = packetsLost;
-        this.averageTimeTaken = (100.0f * totalTimeTaken) / noPings;
+        this.averageTimeTaken = totalTimeTaken / noPings;
         this.minTimeTaken = minTimeTaken;
         this.maxTimeTaken = maxTimeTaken;
     }

library/src/main/java/com/stealthcopter/networktools/portscanning/PortInfo.java

@@ -0,0 +1,15 @@
+package com.stealthcopter.networktools.portscanning;
+
+public class PortInfo {
+    public String ip;
+    public int portNo;
+    public String openState;
+    public boolean open;
+
+    public PortInfo(String ip, int portNo) {
+        this.portNo = portNo;
+        this.ip = ip;
+    }
+
+    public boolean isOpen(){return open;}
+}

library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanTCP.java

@@ -14,13 +14,17 @@ public class PortScanTCP {
     private PortScanTCP() {
     }
 
-    public static boolean scanAddress(InetAddress ia, int portNo, int timeoutMillis){
+    public static PortInfo scanAddress(InetAddress ia, int portNo, int timeoutMillis){
+
+        PortInfo portInfo = new PortInfo(ia.getHostAddress(), portNo);
+        portInfo.open = false;
+
         Socket s = null;
         try {
             s = new Socket();
             s.connect(new InetSocketAddress(ia, portNo), timeoutMillis);
 
-            return true;
+            portInfo.open = true;
         } catch (IOException e) {
             // Don't log anything as we are expecting a lot of these from closed ports.
         }
@@ -33,7 +37,7 @@ public static boolean scanAddress(InetAddress ia, int portNo, int timeoutMillis)
                 }
             }
         }
-        return false;
+        return portInfo;
     }
 
 }

library/src/main/java/com/stealthcopter/networktools/portscanning/PortScanUDP.java

@@ -0,0 +1,47 @@
+package com.stealthcopter.networktools.portscanning;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.PortUnreachableException;
+import java.net.SocketTimeoutException;
+
+/**
+ * Created by mat on 13/12/15.
+ */
+public class PortScanUDP {
+
+    // This class is not to be instantiated
+    private PortScanUDP() {
+    }
+
+    public static PortInfo scanAddress(InetAddress ia, int portNo, int timeoutMillis){
+
+        PortInfo portInfo = new PortInfo(ia.getHostAddress(), portNo);
+        portInfo.open = false;
+
+        try {
+            byte[] bytes = new byte[128];
+            DatagramPacket dp = new DatagramPacket(bytes, bytes.length);
+
+            DatagramSocket ds = new DatagramSocket();
+            ds.setSoTimeout(timeoutMillis);
+            ds.connect(ia, portNo);
+            ds.send(dp);
+            ds.isConnected();
+            ds.receive(dp);
+            ds.close();
+        } catch (PortUnreachableException e) {
+            portInfo.openState = "closed";
+        } catch (SocketTimeoutException e) {
+            portInfo.open = true;
+            portInfo.openState = "open|filtered";
+        } catch (IOException e) {
+            portInfo.openState = "unknown";
+        }
+        return portInfo;
+    }
+
+}

library/src/main/java/com/stealthcopter/networktools/subnet/SubnetInfo.java renamed to library/src/main/java/com/stealthcopter/networktools/subnet/SubnetDevice.java

@@ -13,22 +13,22 @@
  * @author <a href="mailto:[email protected]">Matthew Rollings</a>
  *         Copyright (c) 2014 Intohand Ltd. All rights reserved.
  */
-public class SubnetInfo {
-    public String ip = "";
-    public String hostname = "";
-    public String mac = "";
+public class SubnetDevice {
+    public String ip;
+    public String hostname;
+    public String mac;
 
 
     public float time = 0;
 
-    public SubnetInfo(InetAddress ip) {
+    public SubnetDevice(InetAddress ip) {
         this.ip = ip.getHostAddress();
         this.hostname = ip.getCanonicalHostName();
     }
 
     @Override
     public String toString() {
-        return "SubnetInfo{" +
+        return "SubnetDevice{" +
                 "ip='" + ip + '\'' +
                 ", hostname='" + hostname + '\'' +
                 ", mac='" + mac + '\'' +