Added start of traceroute

Author: stealthcopter

.circleci/config.yml

@@ -31,11 +31,12 @@ jobs:
           name: Run Tests
           command: ./gradlew test
 
-      - store_test_results:
-          path: app/build/reports
-          destination: reports
+      #- store_test_results:
+          #path: app/build/reports
+          #destination: reports
 
       - store_test_results:
+          name: Save Libary Unit Tests
           path: library/build/reports
           destination: reports
 

.circleci/keystore.enc

@@ -30,8 +30,8 @@ android {
     applicationId "com.stealthcotper.networktools"
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 9
-    versionName "0.1.14"
+    versionCode versionCode
+    versionName versionName
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 

app/build.gradle

@@ -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.SubnetDevice;
+import com.stealthcopter.networktools.subnet.Device;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         InetAddress ipAddress = IPTools.getLocalIPv4Address();
         if (ipAddress != null){
-            editIpAddress.setText(ipAddress.toString());
+            editIpAddress.setText(ipAddress.getHostAddress());
         }
 
         findViewById(R.id.pingButton).setOnClickListener(new View.OnClickListener() {
@@ -198,8 +198,10 @@ private void doPortScan() throws Exception {
         appendResultsText("PortScanning IP: " + ipAddress);
         ArrayList<Integer> openPorts = PortScan.onAddress(ipAddress).setPort(21).doScan();
 
+        final long startTimeMillis = System.currentTimeMillis();
+
         // Perform an asynchronous port scan
-        PortScan.onAddress(ipAddress).setTimeOutMillis(1000).setPortsAll().doScan(new PortScan.PortListener() {
+        PortScan.onAddress(ipAddress).setPortsAll().doScan(new PortScan.PortListener() {
             @Override
             public void onResult(int portNo, boolean open) {
                 if (open) appendResultsText("Open: " + portNo);
@@ -208,6 +210,7 @@ public void onResult(int portNo, boolean open) {
             @Override
             public void onFinished(ArrayList<Integer> openPorts) {
                 appendResultsText("Open Ports: " + openPorts.size());
+                appendResultsText("Time Taken: " + ((System.currentTimeMillis() - startTimeMillis)/1000.0f));
             }
         });
 
@@ -218,17 +221,16 @@ private void findSubnetDevices() {
 
         final long startTimeMillis = System.currentTimeMillis();
 
-        String partialIpAddress = editIpAddress.getText().toString();
-
         SubnetDevices.fromLocalAddress().findDevices(new SubnetDevices.OnSubnetDeviceFound() {
             @Override
-            public void onDeviceFound(SubnetDevice subnetDevice) {
-                appendResultsText("Device: " + subnetDevice.ip+" "+ subnetDevice.hostname);
+            public void onDeviceFound(Device device) {
+                appendResultsText("Device: " + device.ip+" "+ device.hostname);
             }
 
             @Override
-            public void onFinished(ArrayList<SubnetDevice> devicesFound) {
+            public void onFinished(ArrayList<Device> devicesFound) {
                 float timeTaken =  (System.currentTimeMillis() - startTimeMillis)/1000.0f;
+                appendResultsText("Devices Found: " + devicesFound.size());
                 appendResultsText("Finished "+timeTaken+" s");
             }
         });

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

@@ -54,9 +54,8 @@
 
             <Button
                 android:id="@+id/wolButton"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:text="@string/wol"
                 />
             <Button

app/src/main/res/layout/content_main.xml

@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 7
-    versionName "0.2.34"
+    versionCode versionCode
+    versionName versionName
   }
   buildTypes {
     release {

library/build.gradle

@@ -92,4 +92,38 @@ public static ArrayList<InetAddress> getLocalIPv4Addresses() {
     }
 
 
+    /**
+     * Check if the provided ip address refers to the localhost
+     *
+     * https://stackoverflow.com/a/2406819/315998
+     *
+     * @param addr - address to check
+     * @return - true if ip address is self
+     */
+    public static boolean isIpAddressLocalhost(InetAddress addr) {
+        // Check if the address is a valid special local or loop back
+        if (addr.isAnyLocalAddress() || addr.isLoopbackAddress())
+            return true;
+
+        // Check if the address is defined on any interface
+        try {
+            return NetworkInterface.getByInetAddress(addr) != null;
+        } catch (SocketException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Check if the provided ip address refers to the localhost
+     *
+     * https://stackoverflow.com/a/2406819/315998
+     *
+     * @param addr - address to check
+     * @return - true if ip address is self
+     */
+    public static boolean isIpAddressLocalNetwork(InetAddress addr) {
+        return addr.isSiteLocalAddress();
+    }
+
+
 }