Changeset 103 for binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs

Timestamp:

Jul 24, 2014, 3:25:58 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs

@@ -18 +18 @@
         public static void init (int port)
         {
-                Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-                authEnabled = GamePrefs.GetString (EnumGamePrefs.TelnetPassword).Length != 0;
-                if (authEnabled)
-                        listener = new TcpListener (IPAddress.Any, port);
-                else
-                        listener = new TcpListener (IPAddress.Loopback, port);
-                telnetThread = ThreadMaster.Create ("thread Allocs TelnetListenThread", new ThreadStart (telnetListenThread));
-                telnetThread.Start ();
-                Log.Out ("Started Allocs NetTelnetServer thread on " + port);
+                try {
+                        Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
+                        authEnabled = GamePrefs.GetString (EnumGamePrefs.TelnetPassword).Length != 0;
+                        if (authEnabled)
+                                listener = new TcpListener (IPAddress.Any, port);
+                        else
+                                listener = new TcpListener (IPAddress.Loopback, port);
+                        telnetThread = ThreadMaster.Create ("thread Allocs TelnetListenThread", new ThreadStart (telnetListenThread));
+                        telnetThread.Start ();
+                        Log.Out ("Started Allocs NetTelnetServer thread on " + port);
+                } catch (Exception e) {
+                        Log.Out ("Error in AllocsTelnetServer.init: " + e);
+                }
         }
 
@@ -90 +94 @@
         {
                 c.WriteLine ("*** Connected with 7DTD server.");
-                c.WriteLine ("*** Server version: Alpha 8.7 (b29) Compatibility Version: Alpha 8.7");
+                c.WriteLine ("*** Dedicated server only build");
                 c.WriteLine ("*** Allocs server fixes loaded");
                 c.WriteLine (string.Empty);
@@ -120 +124 @@
         public static void Disconnect ()
         {
-                closed = true;
-                if (listener != null) {
-                        listener.Stop ();
+                try {
+                        closed = true;
+                        if (listener != null) {
+                                listener.Stop ();
+                        }
+                        foreach (AllocsTelnetConnection c in connections) {
+                                c.Close ();
+                        }
+                        Thread.Sleep (100);
+                } catch (Exception e) {
+                        Log.Out ("Error in AllocsTelnetServer.Disconnect: " + e);
                 }
-                foreach (AllocsTelnetConnection c in connections) {
-                        c.Close ();
-                }
-                Thread.Sleep (100);
         }
 
         public static void SetConsole (ConsoleSdtd console)
         {
-                Log.Out("Telnet SetConsole called");
+                Log.Out ("Telnet SetConsole called");
                 AllocsNetTelnetServer.console = console;
         }
@@ -138 +146 @@
         private static void RemoveClosedConnections ()
         {
-                foreach (AllocsTelnetConnection c in connections) {
-                        if (c.IsClosed ()) {
-                                c.Close ();
+                try {
+                        foreach (AllocsTelnetConnection c in connections) {
+                                if (c.IsClosed ()) {
+                                        c.Close ();
+                                }
                         }
+                } catch (Exception e) {
+                        Log.Out ("Error in AllocsTelnetServer.RemvoeClosedConnections: " + e);
                 }
         }