From f541a13235f10d63c19db6f76ef1509c67144463 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 14 Sep 2017 15:54:48 +1200 Subject: [PATCH] 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 {