Changeset 183

Timestamp:

Sep 9, 2014, 8:12:00 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/NetConnections/Servers/Telnet/Telnet.cs (modified) (5 diffs)
• 7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (1 diff)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/Telnet.cs

@@ -9 +9 @@
         public class Telnet : IServer
         {
-                private Thread telnetThread = null;
                 private TcpListener listener = null;
-                private bool closed = false;
                 private bool authEnabled = false;
                 private List<TelnetConnection> connections = new List<TelnetConnection> ();
@@ -29 +27 @@
                                 else
                                         listener = new TcpListener (IPAddress.Loopback, port);
-                                telnetThread = ThreadMaster.Create ("thread TelnetListenThread", new ThreadStart (telnetListenThread));
-                                telnetThread.Start ();
+
+                                listener.Start ();
+                                listener.BeginAcceptTcpClient (new AsyncCallback (AcceptClient), null);
 
                                 NetTelnetServer.RegisterServer (this);
@@ -40 +39 @@
                 }
 
-                private void telnetListenThread ()
+                private void AcceptClient (IAsyncResult asyncResult)
                 {
-                        try {
-                                listener.Start ();
-                                try {
-                                        while (!closed) {
-                                                TelnetConnection c = new TelnetConnection (listener.AcceptTcpClient (), authEnabled);
-                                                connections.Add (c);
-                                        }
-                                } catch (SocketException) {
-                                } catch (ThreadInterruptedException) {
-                                }
-                                ThreadMaster.Remove (Thread.CurrentThread.Name);
-                        } catch (Exception ex) {
-                                Log.Out ("Error in TelnetListenThread: " + ex);
+                        if (listener.Server.IsBound) {
+                                TelnetConnection c = new TelnetConnection (listener.EndAcceptTcpClient (asyncResult), authEnabled);
+                                connections.Add (c);
+                                listener.BeginAcceptTcpClient (new AsyncCallback (AcceptClient), null);
                         }
                 }
@@ -61 +51 @@
                 {
                         try {
-                                closed = true;
                                 if (listener != null) {
                                         listener.Stop ();
@@ -68 +57 @@
                                 foreach (TelnetConnection c in connections) {
                                         c.Close ();
-                                }
-                                Thread.Sleep (100);
-                                if (telnetThread != null) {
-                                        telnetThread.Interrupt ();
                                 }
                         } catch (Exception e) {

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs

@@ -93 +93 @@
                                                 }
                                         }
+                                } catch (ObjectDisposedException) {
                                 } catch (IOException) {
                                 } catch (ThreadInterruptedException) {

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -29 +29 @@
                                 }
 
-                                if (!HttpListener.IsSupported)
-                                        throw new NotSupportedException ("Needs Windows XP SP2, Server 2003 or later.");
+                                if (!HttpListener.IsSupported) {
+                                        Log.Out ("Webserver not started (needs Windows XP SP2, Server 2003 or later or Mono)");
+                                        return;
+                                }
  
                                 handlers.Add ("/index.htm", new SimpleRedirectHandler ("/static/index.html"));

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.92.5365.35778
+Version:       0.93.5365.36355