From a1fa09962aa79d056a91cd0222d12afdc360a203 Mon Sep 17 00:00:00 2001 From: hba56 Date: Thu, 31 Aug 2017 13:55:16 +1200 Subject: [PATCH] matching table now stores the correct ip of the hosts #story[1188] --- matchBrowser/src/main/java/model/MatchTable.java | 4 ++-- .../src/main/java/networkInterface/NetworkInterface.java | 2 +- matchBrowser/src/test/java/model/MatchTableTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/matchBrowser/src/main/java/model/MatchTable.java b/matchBrowser/src/main/java/model/MatchTable.java index dbc05ae8..f181c8b5 100644 --- a/matchBrowser/src/main/java/model/MatchTable.java +++ b/matchBrowser/src/main/java/model/MatchTable.java @@ -17,9 +17,9 @@ public class MatchTable { this.matchTable = new HashMap(); } - public void addEntry(HostGame newEntry) { + public void addEntry(String ip, int port, HostGame newEntry) { //create a key from the ip and port - TableKey entryKey = new TableKey( newEntry.getIp(), newEntry.getPort()); + TableKey entryKey = new TableKey(ip, port); //get the rest of the entry and use it as the value List entryItems = new ArrayList(); diff --git a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java index 6c0babd8..bb5ad260 100644 --- a/matchBrowser/src/main/java/networkInterface/NetworkInterface.java +++ b/matchBrowser/src/main/java/networkInterface/NetworkInterface.java @@ -55,7 +55,7 @@ public class NetworkInterface { try{ newKnownGame = (HostGame) decoder.decode(messageDecoder.getMessageBody()); - this.matchTable.addEntry(newKnownGame); + this.matchTable.addEntry(receivePacket.getAddress().getHostAddress(), receivePacket.getPort(), newKnownGame); System.out.println(matchTable); }catch (InvalidMessageException e){ diff --git a/matchBrowser/src/test/java/model/MatchTableTest.java b/matchBrowser/src/test/java/model/MatchTableTest.java index 7b19c34f..6fb6a55c 100644 --- a/matchBrowser/src/test/java/model/MatchTableTest.java +++ b/matchBrowser/src/test/java/model/MatchTableTest.java @@ -22,7 +22,7 @@ public class MatchTableTest { public void testTable() { HostGame entry = new HostGame("127.0.0.1", 4942, (byte)1, (byte)1, RaceStatusEnum.PRESTART, (byte)6, (byte)1); - testTable.addEntry(entry); + testTable.addEntry("127.0.0.1", 3779, entry); assertEquals(testTable.getMatchTable().get(new TableKey("127.0.0.1", 4942)), Arrays.asList(1, 1, 2, 6, 1)); }