Fixed subnet devices returning out of scope IPs and removed pointless comments

Author: stealthcopter

build.gradle

@@ -30,7 +30,7 @@ subprojects {
   ext.targetSdkVer = 29
   ext.supportLibVer = "27.1.1"
 
-  // When updating these, remember to update the vars in app/build.gradle (for FDroid comptability)
+  // When updating these, remember to update the vars in app/build.gradle (for FDroid compatibility)
   ext.appVersionName = "0.4.5.2"
   ext.appVersionCode = 20
 }

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

@@ -7,8 +7,6 @@
 import java.util.HashMap;
 
 /**
- * Created by mat on 09/12/15.
- *
  * Looks at the file at /proc/net/arp to fromIPAddress ip/mac addresses from the cache
  * We assume that the file has this structure:
  *

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

@@ -8,9 +8,6 @@
 import java.util.Enumeration;
 import java.util.regex.Pattern;
 
-/**
- * Created by mat on 14/12/15.
- */
 public class IPTools {
 
     /**

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

@@ -8,9 +8,6 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-/**
- * Created by mat on 09/12/15.
- */
 public class Ping {
 
     // Only try ping using the java method

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

@@ -11,9 +11,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Created by mat on 14/12/15.
- */
 public class PortScan {
 
     private static final int TIMEOUT_LOCALHOST = 25;

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

@@ -12,9 +12,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Created by mat on 03/11/17.
- */
 public class SubnetDevices {
     private int noThreads = 100;
 
@@ -71,15 +68,20 @@ public static SubnetDevices fromIPAddress(final String ipAddress) {
             throw new IllegalArgumentException("Invalid IP Address");
         }
 
+        String segment = ipAddress.substring(0, ipAddress.lastIndexOf(".") + 1);
+
         SubnetDevices subnetDevice = new SubnetDevices();
 
         subnetDevice.addresses = new ArrayList<>();
 
         // Get addresses from ARP Info first as they are likely to be reachable
-        subnetDevice.addresses.addAll(ARPInfo.getAllIPAddressesInARPCache());
+        for(String ip : ARPInfo.getAllIPAddressesInARPCache()) {
+            if (ip.startsWith(segment)) {
+                subnetDevice.addresses.add(ip);
+            }
+        }
 
         // Add all missing addresses in subnet
-        String segment = ipAddress.substring(0, ipAddress.lastIndexOf(".") + 1);
         for (int j = 0; j < 255; j++) {
             if (!subnetDevice.addresses.contains(segment + j)) {
                 subnetDevice.addresses.add(segment + j);

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

@@ -6,7 +6,6 @@
 import java.net.InetAddress;
 
 /**
- * Created by mat on 09/12/15.
  *
  * Tested this and it wakes my computer up :)
  *

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

@@ -7,9 +7,6 @@
 import java.io.InputStreamReader;
 import java.net.InetAddress;
 
-/**
- * Created by mat on 09/12/15.
- */
 public class PingNative {
 
     // This class is not to be instantiated

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

@@ -2,9 +2,6 @@
 
 import java.net.InetAddress;
 
-/**
- * Created by mat on 09/12/15.
- */
 public class PingResult {
     public final InetAddress ia;
     public boolean isReachable;

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

@@ -2,9 +2,6 @@
 
 import java.net.InetAddress;
 
-/**
- * Created by mat on 09/12/15.
- */
 public class PingStats {
     private final InetAddress ia;
     private final long noPings;

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

@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 
-/**
- * Created by mat on 09/12/15.
- */
 public class PingTools {
 
     // This class is not to be instantiated

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

@@ -5,9 +5,6 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
-/**
- * Created by mat on 13/12/15.
- */
 public class PortScanTCP {
 
     // This class is not to be instantiated

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

@@ -5,9 +5,6 @@
 import java.net.InetAddress;
 import java.net.SocketTimeoutException;
 
-/**
- * Created by mat on 13/12/15.
- */
 public class PortScanUDP {
 
     // This class is not to be instantiated