Added port number randomization

- Servers all run on different ports, so multiple servers can run on one host
- Port is displayed in lobby

Tags: #story[1281]

src/main/java/seng302/discoveryServer/DiscoveryServerClient.java

@@ -19,7 +19,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 public class DiscoveryServerClient {
-    private final Integer UPDATE_INTERVAL_MS = 700;
+    private final Integer UPDATE_INTERVAL_MS = 1000;
 
     private static String roomCode = null;
     private Timer serverListingUpdateTimer;

src/main/java/seng302/gameServer/MainServerThread.java

@@ -35,6 +35,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     private Logger logger = LoggerFactory.getLogger(MainServerThread.class);
 
     private static final int PORT = 4942;
+    private static int selectedPort = PORT;
     private static final Integer CLIENT_UPDATES_PER_SECOND = 60;
 
     private boolean terminated;
@@ -65,7 +66,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 .setMapName(regattaXMLData.getCourseName())
                 .setCapacity(capacity)
                 .setNumberOfPlayers(numPlayers - 1)
-                .registerGame(PORT, regattaXMLData.getRegattaName());
+                .registerGame(selectedPort, regattaXMLData.getRegattaName());
         } catch (IOException e) {
             logger.warn("Could not register server");
         }
@@ -74,7 +75,10 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     public MainServerThread() {
         new GameState();
         try {
-            serverSocket = new ServerSocket(PORT);
+            serverSocket = new ServerSocket(0);
+            selectedPort = serverSocket.getLocalPort();
+            System.out.println("selectedPort = " + selectedPort);
+
         } catch (IOException e) {
             logger.trace("IO error in server thread handler upon trying to make new server socket",
                 0);
@@ -459,4 +463,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
     public boolean hasStarted() {
         return hasStarted;
     }
+
+    public int getPortNumber() {
+        return selectedPort;
+    }
 }

src/main/java/seng302/visualiser/GameClient.java

@@ -165,7 +165,7 @@ public class GameClient {
         }
 
         try {
-            startClientToServerThread(ipAddress, 4942);
+            startClientToServerThread(ipAddress, server.getPortNumber());
         } catch (IOException e) {
             showConnectionError("Cannot connect to server as host");
         }
@@ -199,8 +199,10 @@ public class GameClient {
 
         this.lobbyController = ViewManager.getInstance().goToLobby(false);
 
+        lobbyController.setPortNumber(""+server.getPortNumber());
+
         ViewManager.getInstance().setPlayerList(clientLobbyList);
-        return new ServerDescription(serverName, regattaData.getCourseName(), GameState.getNumberOfPlayers(), GameState.getCapacity(), ipAddress, 4942);
+        return new ServerDescription(serverName, regattaData.getCourseName(), GameState.getNumberOfPlayers(), GameState.getCapacity(), ipAddress, server.getPortNumber());
     }
 
     private void tearDownConnection() {

src/main/java/seng302/visualiser/controllers/LobbyController.java

@@ -71,6 +71,8 @@ public class LobbyController implements Initializable {
     @FXML
     private Label roomLabel;
     @FXML
+    private Label portNumber;
+    @FXML
     private Pane speedTokenPane, handlingTokenPane, windWalkerTokenPane, bumperTokenPane, randomTokenPane;
     //---------FXML END---------//
 
@@ -85,6 +87,8 @@ public class LobbyController implements Initializable {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         roomLabel.setText("");
+        portNumber.setText("");
+
         this.playerBoats = ViewManager.getInstance().getGameClient().getAllBoatsMap();
 
         if (this.playersColor == null) {
@@ -376,4 +380,8 @@ public class LobbyController implements Initializable {
     public void setRoomCode(String roomCode) {
         roomLabel.setText("Room: " + roomCode);
     }
+
+    public void setPortNumber(String p){
+        portNumber.setText("Port: " + p);
+    }
 }

src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java

@@ -115,7 +115,7 @@ public class ServerCreationController implements Initializable {
      */
     private void createServer() {
         ServerDescription serverDescription = ViewManager.getInstance().getGameClient()
-            .runAsHost("localhost", 4941, serverName.getText(), (int) maxPlayersSlider
+            .runAsHost("localhost", 0, serverName.getText(), (int) maxPlayersSlider
                 .getValue(), mapMaker.getCurrentRacePath(), (int) legsSlider.getValue(), pickupsCheckBox.isSelected());
 
         if (serverDescription == null){