diff --git a/client/index.html b/client/index.html
index 3b8cefd..05446ea 100644
--- a/client/index.html
+++ b/client/index.html
@@ -1,7 +1,7 @@
- CircleScape
+ SockScape
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 6ce1e8e..35c8cf3 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -31,8 +31,11 @@ namespace SockScape {
MaxTotal = server["Max Users"] ?? Configuration.General["Max Users"]
};
+ var serverHandle = new Server((ushort)server["Port"], pool, server);
+
pools.Add(server["Id"], pool);
- servers.Add(server["Id"], new Server((ushort)server["Port"], pool, server));
+ servers.Add(server["Id"], serverHandle);
+ serverHandle.Start();
}
//var server = new Server(6770, PoolManager.Pending);
diff --git a/server/SockScape.csproj b/server/SockScape.csproj
index e400a68..ab9fea1 100644
--- a/server/SockScape.csproj
+++ b/server/SockScape.csproj
@@ -119,6 +119,7 @@
App.config
+ PreserveNewest
Designer
diff --git a/server/Socks/MasterUdpClient.cs b/server/Socks/MasterUdpClient.cs
index d5ca665..773b3a3 100644
--- a/server/Socks/MasterUdpClient.cs
+++ b/server/Socks/MasterUdpClient.cs
@@ -3,11 +3,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Net.Sockets;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
-namespace SockScape.Socks {
+namespace SockScape {
class MasterUdpClient {
private static UdpClient Sock;
+ private static Thread ListeningThread;
private static bool IsOpen;
public static void Initialize() {
@@ -15,9 +17,19 @@ namespace SockScape.Socks {
return;
short port = (short) Configuration.General["Master Port"];
- Sock = new UdpClient(port);
+ Sock = new UdpClient(Configuration.General["Master Addr"], port);
IsOpen = true;
}
+
+ public static void Listener() {
+
+ }
+
+ public static void Close() {
+ IsOpen = false;
+ ListeningThread.Join();
+ ListeningThread = null;
+ }
}
}
diff --git a/server/Socks/MasterUdpServer.cs b/server/Socks/MasterUdpServer.cs
index 21e8826..3ec2e0b 100644
--- a/server/Socks/MasterUdpServer.cs
+++ b/server/Socks/MasterUdpServer.cs
@@ -7,7 +7,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
-namespace SockScape.Socks {
+namespace SockScape {
static class MasterUdpServer {
private static UdpClient Sock;
private static Thread ListeningThread;
@@ -18,7 +18,7 @@ namespace SockScape.Socks {
return;
short port = (short)Configuration.General["Master Port"];
- Sock = new UdpClient(port);
+ Sock = new UdpClient(new IPEndPoint(IPAddress.Any, port));
IsOpen = true;
ListeningThread = new Thread(Listener);
@@ -39,6 +39,7 @@ namespace SockScape.Socks {
IsOpen = false;
ListeningThread.Join();
ListeningThread = null;
+ Sock.Dispose();
}
}
}