Changeset 189 for binary-improvements/7dtd-server-fixes/src/NetConnections

Timestamp:

Sep 12, 2014, 11:14:11 AM (10 years ago)

Author:

alloc

Message:

fixes

Location:

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

Files:

• ConsoleOutputSeparator.cs (modified) (3 diffs)
• Servers/Telnet/TelnetConnection.cs (modified) (2 diffs)
• Servers/Web/StaticHandler.cs (modified) (3 diffs)

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

@@ -28 +28 @@
                         Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
 
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 isCurrentCommandFromClient = true;
                                 console.issuerOfCurrentClientCommand = _networkPlayer;
                                 console.ExecuteClientCmdInternal (_playerID, _command);
                                 isCurrentCommandFromClient = false;
-                        } finally {
-                                Monitor.Exit (obj);
                         }
 
@@ -61 +57 @@
                 {
                         if (netCommandQueue.Count > 0) {
-                                object obj = netCommandQueue;
-                                Monitor.Enter (obj);
-                                try {
+                                lock (netCommandQueue) {
                                         issuerOfCurrentCommand = netCommandQueue [0].client;
-                                        console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        try {
+                                                console.ExecuteRemoteCmdInternal (netCommandQueue [0].command, false);
+                                        } catch (Exception e) {
+                                                Log.Out("Exception while executing command: " + e);
+                                        }
                                         netCommandQueue.RemoveAt (0);
                                         issuerOfCurrentCommand = null;
-                                } finally {
-                                        Monitor.Exit (obj);
                                 }
                         }
@@ -76 +72 @@
                 public static void QueueNetCommand (string _line, IConnection _con)
                 {
-                        object obj = netCommandQueue;
-                        Monitor.Enter (obj);
-                        try {
+                        lock (netCommandQueue) {
                                 netCommandQueue.Add (new NetCommand (_line, _con));
-                        } finally {
-                                Monitor.Exit (obj);
                         }
                 }

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

@@ -38 +38 @@
 
                         if (endpoint is IPEndPoint) {
-                                endpointAddressHash = ((IPEndPoint)endpoint).Address.GetHashCode();
+                                endpointAddressHash = ((IPEndPoint)endpoint).Address.GetHashCode ();
                                 //Log.Out ("Hash: " + endpointAddressHash);
                         } else {
-                                Log.Out ("EndPoint is not an IPEndPoint but: " + endpoint.GetType().ToString());
+                                Log.Out ("EndPoint is not an IPEndPoint but: " + endpoint.GetType ().ToString ());
                         }
 
@@ -78 +78 @@
                                         while (!IsClosed()) {
                                                 string line = reader.ReadLine ();
-                                                if (line != null) {
+                                                if (line != null && line.Length > 0) {
                                                         line = line.Trim ();
-
-                                                        if (!IsAuthenticated ()) {
-                                                                if (line.Equals (GamePrefs.GetString (EnumGamePrefs.TelnetPassword))) {
-                                                                        authenticated = true;
-                                                                        WriteLine ("Logon successful.");
-                                                                        WriteLine (string.Empty);
-                                                                        WriteLine (string.Empty);
-                                                                        WriteLine (string.Empty);
-                                                                        LoginMessage ();
+                                                        if (line.Length > 0) {
+                                                                if (!IsAuthenticated ()) {
+                                                                        if (line.Equals (GamePrefs.GetString (EnumGamePrefs.TelnetPassword))) {
+                                                                                authenticated = true;
+                                                                                WriteLine ("Logon successful.");
+                                                                                WriteLine (string.Empty);
+                                                                                WriteLine (string.Empty);
+                                                                                WriteLine (string.Empty);
+                                                                                LoginMessage ();
+                                                                        } else {
+                                                                                if (owner.RegisterFailedLogin (endpointAddressHash)) {
+                                                                                        WriteLine ("Password incorrect, please enter password:");
+                                                                                } else {
+                                                                                        WriteLine ("Too many failed login attempts!");
+                                                                                        Thread.Sleep (100);
+                                                                                        Close ();
+                                                                                        Log.Out ("Telnet connection closed for too many login attempts: " + endpoint);
+                                                                                        break;
+                                                                                }
+                                                                        }
                                                                 } else {
-                                                                        if (owner.RegisterFailedLogin(endpointAddressHash)) {
-                                                                                WriteLine ("Password incorrect, please enter password:");
-                                                                        } else {
-                                                                                WriteLine ("Too many failed login attempts!");
-                                                                                Thread.Sleep(100);
+                                                                        if (line.ToLower ().Equals ("exit")) {
+                                                                                Log.Out ("Telnet connection closed by client: " + endpoint);
                                                                                 Close ();
-                                                                                Log.Out ("Telnet connection closed for too many login attempts: " + endpoint);
                                                                                 break;
                                                                         }
+                                                                        Log.Out ("Telnet executed \"" + line + "\" from: " + endpoint);
+                                                                        ConsoleOutputSeparator.QueueNetCommand (line, this);
                                                                 }
-                                                        } else {
-                                                                if (line.ToLower ().Equals ("exit")) {
-                                                                        Log.Out ("Telnet connection closed by client: " + endpoint);
-                                                                        Close ();
-                                                                        break;
-                                                                }
-                                                                Log.Out ("Telnet executed \"" + line + "\" from: " + endpoint);
-                                                                ConsoleOutputSeparator.QueueNetCommand (line, this);
                                                         }
                                                 }

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

@@ -30 +30 @@
                                 byte[] content;
                                 if (cache) {
-                                        Monitor.Enter (fileCache);
-                                        try {
+                                        lock (fileCache) {
                                                 if (!fileCache.ContainsKey (fn)) {
                                                         if (!File.Exists (datapath + "/" + fn)) {
@@ -41 +40 @@
 
                                                 content = fileCache [fn];
-                                        } finally {
-                                                Monitor.Exit (fileCache);
                                         }
                                 } else {
@@ -55 +52 @@
                                 resp.ContentLength64 = content.Length;
                                 resp.OutputStream.Write (content, 0, content.Length);
-                        } catch (FileNotFoundException e) {
+                        } catch (FileNotFoundException) {
                                 resp.StatusCode = (int)HttpStatusCode.NotFound;
                                 if (logMissingFiles)