From 79d90f6ad5a065a398f75e08faa147e7505cff4a Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Mon, 9 Oct 2017 03:01:10 +1300 Subject: [PATCH] Fixed match client --- .../visualiser/network/HttpMatchBrowserClient.java | 4 ++-- .../java/visualiser/network/HttpMatchBrowserHost.java | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserClient.java b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserClient.java index c4a14bb9..cf62119a 100644 --- a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserClient.java +++ b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserClient.java @@ -33,9 +33,9 @@ public class HttpMatchBrowserClient extends Thread { Thread.sleep(5000); } catch (IOException e) { - e.printStackTrace(); + //e.printStackTrace(); } catch (InterruptedException e) { - e.printStackTrace(); + //e.printStackTrace(); } } } diff --git a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java index 7e1126bf..170bea27 100644 --- a/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java +++ b/racevisionGame/src/main/java/visualiser/network/HttpMatchBrowserHost.java @@ -42,7 +42,8 @@ public class HttpMatchBrowserHost extends Thread { Enumeration e = NetworkInterface.getNetworkInterfaces(); boolean matches = false; String ip = ""; - Pattern ipPattern = Pattern.compile("192.168.1.*"); + Pattern localIpPattern = Pattern.compile("192\\.168\\..*"); + Pattern ipPattern = Pattern.compile("[0-9]{0,3}\\.[0-9]{0,3}\\.[0-9]{0,3}\\.[0-9]{0,3}"); while(e.hasMoreElements()) { if (matches){ @@ -54,10 +55,12 @@ public class HttpMatchBrowserHost extends Thread { { InetAddress i = ee.nextElement(); matches = ipPattern.matcher(i.getHostAddress()).matches(); + System.out.println(i.getHostAddress()); if (matches){ - ip = i.getHostAddress(); - //System.out.println(ip); - break; + if (!localIpPattern.matcher(i.getHostAddress()).matches()) { + ip = i.getHostAddress(); + //break; + } } } }