diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index 2d9f615..07697b6 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -13,6 +13,4 @@ $src/com/mercurys/encryption/Key.java,2/1/21dd4242503d81d0bdc133ffee4a870bffd14 [ +src/com/mercurys/encryption/Encryption.java,9/6/96a1e0b4ba9cb3e7c1682f3a3f3038c902a29072 ^ -.src/com/mercurys/readers/TextReaderThread.java,7/5/751ea9d57a60ac3487c713ca6a7d89436ad389dd -9 - README.md,8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d \ No newline at end of file +.src/com/mercurys/readers/TextReaderThread.java,7/5/751ea9d57a60ac3487c713ca6a7d89436ad389dd \ No newline at end of file diff --git a/src/com/mercurys/MercurysServer.java b/src/com/mercurys/MercurysServer.java index 568a55f..bd19bf7 100644 --- a/src/com/mercurys/MercurysServer.java +++ b/src/com/mercurys/MercurysServer.java @@ -3,6 +3,7 @@ import com.mercurys.handlers.ServerSocketHandler; import java.io.IOException; +import java.util.Scanner; public class MercurysServer { @@ -10,7 +11,7 @@ public class MercurysServer { private MercurysServer(final int port) { try { - serverSocketHandler = new ServerSocketHandler(port); + serverSocketHandler = new ServerSocketHandler(getIPAddress(), port); } catch (final IOException e) { System.out.println("Exception occurred!"); e.printStackTrace(); @@ -23,6 +24,11 @@ public static void main(final String[] args) { System.out.println("Thank you for using Project Mercurys!"); } + private String getIPAddress() { + System.out.println("Enter your device's LAN IP address: "); + return new Scanner(System.in).nextLine(); + } + private void startTalking() { try { serverSocketHandler.talkToClient(); diff --git a/src/com/mercurys/handlers/ServerSocketHandler.java b/src/com/mercurys/handlers/ServerSocketHandler.java index 76c680f..76c0132 100644 --- a/src/com/mercurys/handlers/ServerSocketHandler.java +++ b/src/com/mercurys/handlers/ServerSocketHandler.java @@ -14,15 +14,14 @@ public class ServerSocketHandler { private MediaReaderThread incomingReaderThread; private MessageHandler messageHandler; - public ServerSocketHandler(int serverPort) throws IOException { + public ServerSocketHandler(String hostIPAddress, int serverPort) throws IOException { serverSocket = new ServerSocket(); - initialiseServerSocket(serverPort); + initialiseServerSocket(hostIPAddress, serverPort); acceptClientRequest(); initialiseIO(); } - private void initialiseServerSocket(int serverPort) throws IOException { - String hostAddress = "192.168.0.151"; //replace with one's own LAN IP address + private void initialiseServerSocket(String hostAddress, int serverPort) throws IOException { serverSocket.bind(new InetSocketAddress(hostAddress, serverPort)); System.out.println(""" Server initiated.