From 1ffef51d7c8583df2d98235189aefc8ad830ffc4 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Wed, 20 Sep 2017 22:07:46 +1200 Subject: [PATCH] Changed local ip detection to use regex --- .../java/visualiser/network/HttpMatchBrowserHost.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java index 1a4792e1..331cc772 100644 --- a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java +++ b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java @@ -18,6 +18,7 @@ import java.net.NetworkInterface; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; +import java.util.regex.Pattern; /** * Creates an Http connection that hosts a game @@ -39,11 +40,12 @@ public class HttpMatchBrowserHost extends Thread { httpClient = HttpClients.createDefault(); Enumeration e = NetworkInterface.getNetworkInterfaces(); - int count = 0; + boolean matches = false; String ip = ""; + Pattern ipPattern = Pattern.compile("192.168.1.*"); while(e.hasMoreElements()) { - if (count > 3){ + if (matches){ break; } NetworkInterface n = (NetworkInterface) e.nextElement(); @@ -51,13 +53,12 @@ public class HttpMatchBrowserHost extends Thread { while (ee.hasMoreElements()) { InetAddress i = ee.nextElement(); - if (count == 3){ + matches = ipPattern.matcher(i.getHostAddress()).matches(); + if (matches){ ip = i.getHostAddress(); //System.out.println(ip); - count++; break; } - count++; } }