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

Timestamp:

Aug 26, 2014, 7:29:11 PM (10 years ago)

Author:

alloc

Message:

Fixes: Source cleanups

Location:

binary-improvements/7dtd-server-fixes/src/NetConnections

Files:

• . (added)
• Servers (added)
• Servers/Telnet (added)
• Servers/Telnet/Telnet.cs (moved) (moved from binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs ) (12 diffs)

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
 using System.Threading;
 
-namespace AllocsFixes
+namespace AllocsFixes.NetConnections.Servers.Telnet
 {
-        public class AllocsNetTelnetServer
+        public class Telnet : IServer
         {
                 private static Thread telnetThread = null;
@@ -15 +13 @@
                 private static bool closed = false;
                 private static bool authEnabled = false;
-                private static List<AllocsTelnetConnection> connections = new List<AllocsTelnetConnection> ();
+                private static List<TelnetConnection> connections = new List<TelnetConnection> ();
 
-                public static void init (int port)
+                public Telnet (int port)
                 {
                         try {
-                                Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
                                 authEnabled = GamePrefs.GetString (EnumGamePrefs.TelnetPassword).Length != 0;
                                 if (authEnabled)
@@ -26 +23 @@
                                 else
                                         listener = new TcpListener (IPAddress.Loopback, port);
-                                telnetThread = ThreadMaster.Create ("thread Allocs TelnetListenThread", new ThreadStart (telnetListenThread));
+                                telnetThread = ThreadMaster.Create ("thread TelnetListenThread", new ThreadStart (telnetListenThread));
                                 telnetThread.Start ();
-                                Log.Out ("Started Allocs NetTelnetServer thread on " + port);
+                                Log.Out ("Started Telnet thread on " + port);
                         } catch (Exception e) {
-                                Log.Out ("Error in AllocsTelnetServer.init: " + e);
+                                Log.Out ("Error in Telnet.ctor: " + e);
                         }
                 }
 
-                private static void telnetListenThread ()
+                private void telnetListenThread ()
                 {
                         try {
-                                Log.Out ("Started thread_Allocs_TelnetListenThread()");
+                                Log.Out ("Started thread_TelnetListenThread()");
                                 listener.Start ();
                                 while (!closed) {
                                         Thread.Sleep (10);
                                         if (listener.Pending ()) {
-                                                AllocsTelnetConnection c = new AllocsTelnetConnection (listener.AcceptTcpClient (), authEnabled);
+                                                TelnetConnection c = new TelnetConnection (listener.AcceptTcpClient (), authEnabled);
                                                 connections.Add (c);
                                                 Log.Out ("Telnet connection from: " + c.GetEndPoint ());
@@ -52 +49 @@
                                         }
 
-                                        foreach (AllocsTelnetConnection c in connections) {
+                                        foreach (TelnetConnection c in connections) {
                                                 if (c.IsClosed ()) {
                                                         c.Close ();
@@ -79 +76 @@
                                                                 }
                                                                 Log.Out ("Telnet executed \"" + line + "\" from: " + c.GetEndPoint ());
-                                                                ConsoleOutputSeparator.QueueTelnetCommand (line, c);
+                                                                ConsoleOutputSeparator.QueueNetCommand (line, c);
                                                         }
                                                 }
                                         }
                                 }
-                                Log.Out ("Exited thread_Allocs_TelnetListenThread()");
+                                Log.Out ("Exited thread_TelnetListenThread()");
                                 ThreadMaster.Remove (Thread.CurrentThread.Name);
                         } catch (Exception ex) {
-                                Log.Out ("Error in Allocs telnetListenThread: " + ex.Message);
+                                Log.Out ("Error in TelnetListenThread: " + ex.Message);
                                 Log.Out ("Stack Trace: " + ex.StackTrace);
                         }
                 }
 
-                private static void LoginMessage (AllocsTelnetConnection c)
+                private void LoginMessage (TelnetConnection c)
                 {
                         c.WriteLine ("*** Connected with 7DTD server.");
@@ -112 +109 @@
                 }
 
-                private static string lineCorrecter (string line)
+                private string lineCorrecter (string line)
                 {
                         string res = "";
@@ -123 +120 @@
                 }
 
-                public static void Disconnect ()
+                public void Disconnect ()
                 {
                         try {
@@ -130 +127 @@
                                         listener.Stop ();
                                 }
-                                foreach (AllocsTelnetConnection c in connections) {
+                                foreach (TelnetConnection c in connections) {
                                         c.Close ();
                                 }
                                 Thread.Sleep (100);
                         } catch (Exception e) {
-                                Log.Out ("Error in AllocsTelnetServer.Disconnect: " + e);
+                                Log.Out ("Error in Telnet.Disconnect: " + e);
                         }
                 }
 
-                public static void SetConsole (ConsoleSdtd console)
-                {
-                }
-
-                private static void RemoveClosedConnections ()
+                private void RemoveClosedConnections ()
                 {
                         try {
-                                foreach (AllocsTelnetConnection c in connections) {
+                                foreach (TelnetConnection c in connections) {
                                         if (c.IsClosed ()) {
                                                 c.Close ();
@@ -152 +145 @@
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in AllocsTelnetServer.RemoveClosedConnections: " + e);
+                                Log.Out ("Error in Telnet.RemoveClosedConnections: " + e);
                         }
                 }
 
-                public static void WriteToClient (string line)
+                public void WriteToClient (string line)
                 {
                         if (line == null) {
@@ -162 +155 @@
                         }
                         RemoveClosedConnections ();
-                        foreach (AllocsTelnetConnection c in connections) {
+                        foreach (TelnetConnection c in connections) {
                                 if (c.IsAuthenticated ())
                                         c.WriteLine (line);
@@ -168 +161 @@
                 }
 
-                public static void WriteToClient_Single (string line, AllocsTelnetConnection client)
+                public void WriteToClient_Single (string line, IConnection client)
                 {
                         if (line == null) {
@@ -174 +167 @@
                         }
                         RemoveClosedConnections ();
-                        foreach (AllocsTelnetConnection c in connections) {
-                                if (c.IsAuthenticated () && (c == client))
-                                        c.WriteLine (line);
+                        foreach (TelnetConnection con in connections) {
+                                if (con == client) {
+                                        if (con.IsAuthenticated ())
+                                                con.WriteLine (line);
+                                }
                         }
                 }
+
         }
 }
+