From f13f51aa024be0d0b16e09b1495c38e8a91270c1 Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Mon, 4 Jan 2016 16:36:00 -0600 Subject: [PATCH] Removed bind address for server --- src/resources/network/TCPServer.java | 4 ++++ src/services/network/NetworkClientManager.java | 13 +------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/resources/network/TCPServer.java b/src/resources/network/TCPServer.java index 657bf9cfe..d38b7c20d 100644 --- a/src/resources/network/TCPServer.java +++ b/src/resources/network/TCPServer.java @@ -53,6 +53,10 @@ public class TCPServer { private TCPCallback callback; private TCPListener listener; + public TCPServer(int port, int bufferSize) { + this(null, port, bufferSize); + } + public TCPServer(InetAddress addr, int port, int bufferSize) { this.sockets = new HashMap<>(); this.addr = addr; diff --git a/src/services/network/NetworkClientManager.java b/src/services/network/NetworkClientManager.java index 1390e600e..5bca63744 100644 --- a/src/services/network/NetworkClientManager.java +++ b/src/services/network/NetworkClientManager.java @@ -87,7 +87,7 @@ public class NetworkClientManager extends Manager implements TCPCallback, Packet } } }; - tcpServer = new TCPServer(getBindAddr(), getBindPort(), getBufferSize()); + tcpServer = new TCPServer(getBindPort(), getBufferSize()); registerForIntent(OutboundPacketIntent.TYPE); registerForIntent(CloseConnectionIntent.TYPE); @@ -170,17 +170,6 @@ public class NetworkClientManager extends Manager implements TCPCallback, Packet tcpServer.send(sock, data); } - private InetAddress getBindAddr() { - Config c = getConfig(ConfigFile.NETWORK); - String ip = c.getString("BIND-ADDR", "::1"); - try { - return InetAddress.getByName(ip); - } catch (UnknownHostException e) { - System.err.println("NetworkListenerService: Unknown host for IP: " + ip); - } - return null; - } - private int getBindPort() { return getConfig(ConfigFile.NETWORK).getInt("BIND-PORT", 44463); }