fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed local ip detection to use regex

Browse Source
This commit is contained in:
Fan-Wu Yang
2017-09-20 22:07:46 +12:00
parent ffa1d8b0c4
commit 1ffef51d7c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java
+6 -5
View File
@@ -18,6 +18,7 @@ import java.net.NetworkInterface;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List; import java.util.List;
import java.util.regex.Pattern;
/** /**
* Creates an Http connection that hosts a game * Creates an Http connection that hosts a game
@@ -39,11 +40,12 @@ public class HttpMatchBrowserHost extends Thread {
httpClient = HttpClients.createDefault(); httpClient = HttpClients.createDefault();
Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
int count = 0; boolean matches = false;
String ip = ""; String ip = "";
Pattern ipPattern = Pattern.compile("192.168.1.*");
while(e.hasMoreElements()) while(e.hasMoreElements())
{ {
if (count > 3){ if (matches){
break; break;
} }
NetworkInterface n = (NetworkInterface) e.nextElement(); NetworkInterface n = (NetworkInterface) e.nextElement();
@@ -51,13 +53,12 @@ public class HttpMatchBrowserHost extends Thread {
while (ee.hasMoreElements()) while (ee.hasMoreElements())
{ {
InetAddress i = ee.nextElement(); InetAddress i = ee.nextElement();
if (count == 3){ matches = ipPattern.matcher(i.getHostAddress()).matches();
if (matches){
ip = i.getHostAddress(); ip = i.getHostAddress();
//System.out.println(ip); //System.out.println(ip);
count++;
break; break;
} }
count++;
} }
} }