From f541a13235f10d63c19db6f76ef1509c67144463 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 14 Sep 2017 15:54:48 +1200 Subject: [PATCH 1/4] Tried to get lobby working #story[1188] --- .../src/main/java/networkInterface/NetworkInterface.java | 2 ++ .../java/visualiser/network/MatchBrowserClientRunnable.java | 1 + .../src/main/java/visualiser/network/MatchBrowserInterface.java | 2 +- .../java/visualiser/network/MatchBrowserLobbyInterface.java | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java index ce211f68..84849c77 100644 --- a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java +++ b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java @@ -67,6 +67,7 @@ public class NetworkInterface { HostedGamesRequestEncoder encoder = new HostedGamesRequestEncoder(); try { byte[] message = encoder.encode(new HostGamesRequest(games)); + System.out.println(LocalDateTime.now() + ": Sending " + games.size() + " game/s"); for(ClientAddress address: clientsAddresses) { serverSocket.send(new DatagramPacket(message, message.length, InetAddress.getByName(address.getIp()), 4941)); } @@ -85,6 +86,7 @@ public class NetworkInterface { scheduler.scheduleAtFixedRate(new TimerTask() { @Override public void run() { + System.out.println("flush"); matchTable.getMatchTable().clear(); } }, period, period); diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java index 61faf7e3..27c1b27e 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java @@ -20,6 +20,7 @@ public class MatchBrowserClientRunnable implements RunnableWithFramePeriod { long previousFrameTime = System.currentTimeMillis(); while (!Thread.interrupted()) { + System.out.println("Receiving"); try{ matchBrowserLobbyInterface.receiveGameInfo(socket); }catch (IOException e){ diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java index 6586042b..17f5c497 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java @@ -26,7 +26,7 @@ public class MatchBrowserInterface { public MatchBrowserInterface() { try {//132.181.16.13 is the ip of the CI as of 13/9/17 - this.IPAddress = InetAddress.getByName("132.181.16.13"); //InetAddress.getLocalHost(); + this.IPAddress = InetAddress.getByName("umbrasheep.com"); //InetAddress.getLocalHost(); } catch (UnknownHostException e) { e.printStackTrace(); } diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java index 7bbad9c9..ec030b61 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java @@ -45,6 +45,7 @@ public class MatchBrowserLobbyInterface extends Observable { byte[] data = new byte[64]; DatagramPacket receivedPacket = new DatagramPacket(data, 64); socket.receive(receivedPacket); + System.out.println(receivedPacket); HostedGamesRequestDecoder hostedGamesRequestDecoder = new HostedGamesRequestDecoder(); try { From 22e9db473e7321922300a82723f71fcce522d92f Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Fri, 15 Sep 2017 02:28:09 +1200 Subject: [PATCH 2/4] Removed test that took a manditory socket --- .../src/main/java/networkInterface/NetworkInterface.java | 1 + .../java/visualiser/network/MatchBrowserLobbyInterface.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java index 84849c77..46276b66 100644 --- a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java +++ b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java @@ -69,6 +69,7 @@ public class NetworkInterface { byte[] message = encoder.encode(new HostGamesRequest(games)); System.out.println(LocalDateTime.now() + ": Sending " + games.size() + " game/s"); for(ClientAddress address: clientsAddresses) { + System.out.println("Sending to " + address.getIp()); serverSocket.send(new DatagramPacket(message, message.length, InetAddress.getByName(address.getIp()), 4941)); } } catch (InvalidMessageException | IOException e) { diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java index ec030b61..ba6b5776 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java @@ -44,6 +44,8 @@ public class MatchBrowserLobbyInterface extends Observable { protected void receiveGameInfo(DatagramSocket socket) throws IOException { byte[] data = new byte[64]; DatagramPacket receivedPacket = new DatagramPacket(data, 64); + System.out.println("waiting"); + System.out.println(socket.getInetAddress()); socket.receive(receivedPacket); System.out.println(receivedPacket); From 34a803f92ea9dcc7dcc4c796583f121ac6210bfd Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Fri, 15 Sep 2017 02:39:47 +1200 Subject: [PATCH 3/4] More changes --- .../src/main/java/visualiser/network/MatchBrowserInterface.java | 1 + .../main/java/visualiser/network/MatchBrowserLobbyInterface.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java index 17f5c497..d54c6564 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserInterface.java @@ -27,6 +27,7 @@ public class MatchBrowserInterface { public MatchBrowserInterface() { try {//132.181.16.13 is the ip of the CI as of 13/9/17 this.IPAddress = InetAddress.getByName("umbrasheep.com"); //InetAddress.getLocalHost(); + this.IPAddress = InetAddress.getByName("191.101.233.116"); //InetAddress.getLocalHost(); } catch (UnknownHostException e) { e.printStackTrace(); } diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java index ba6b5776..363b3a26 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java @@ -45,7 +45,6 @@ public class MatchBrowserLobbyInterface extends Observable { byte[] data = new byte[64]; DatagramPacket receivedPacket = new DatagramPacket(data, 64); System.out.println("waiting"); - System.out.println(socket.getInetAddress()); socket.receive(receivedPacket); System.out.println(receivedPacket); From 0348b0c642bef12c3e5397af54b89693781eb8c6 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Fri, 15 Sep 2017 02:50:06 +1200 Subject: [PATCH 4/4] Merged in master --- .../java/visualiser/network/MatchBrowserClientRunnable.java | 1 - .../java/visualiser/network/MatchBrowserLobbyInterface.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java index 27c1b27e..61faf7e3 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserClientRunnable.java @@ -20,7 +20,6 @@ public class MatchBrowserClientRunnable implements RunnableWithFramePeriod { long previousFrameTime = System.currentTimeMillis(); while (!Thread.interrupted()) { - System.out.println("Receiving"); try{ matchBrowserLobbyInterface.receiveGameInfo(socket); }catch (IOException e){ diff --git a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java index 363b3a26..7bbad9c9 100644 --- a/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java +++ b/racevisionGame/src/main/java/visualiser/network/MatchBrowserLobbyInterface.java @@ -44,9 +44,7 @@ public class MatchBrowserLobbyInterface extends Observable { protected void receiveGameInfo(DatagramSocket socket) throws IOException { byte[] data = new byte[64]; DatagramPacket receivedPacket = new DatagramPacket(data, 64); - System.out.println("waiting"); socket.receive(receivedPacket); - System.out.println(receivedPacket); HostedGamesRequestDecoder hostedGamesRequestDecoder = new HostedGamesRequestDecoder(); try {