Changeset 133 for binary-improvements/7dtd-server-fixes

Timestamp:

Aug 27, 2014, 3:29:15 AM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (5 diffs)
• src/NetConnections/NetTelnetServer.cs (modified) (6 diffs)
• src/NetConnections/Servers/Web (added)
• src/NetConnections/Servers/Web/MimeType.cs (added)
• src/NetConnections/Servers/Web/PathHandler.cs (added)
• src/NetConnections/Servers/Web/SimpleRedirectHandler.cs (added)
• src/NetConnections/Servers/Web/StaticHandler.cs (added)
• src/NetConnections/Servers/Web/Web.cs (added)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -10 +10 @@
     <AssemblyName>7dtd-server-fixes</AssemblyName>
     <RootNamespace>AllocsFixes</RootNamespace>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -42 +43 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="src\AllocsNetTelnetServer.cs" />
     <Compile Include="src\AssemblyInfo.cs" />
-    <Compile Include="src\AllocsTelnetConnection.cs" />
     <Compile Include="src\AllocsLogFunctions.cs" />
     <Compile Include="src\AdminToolsStuff.cs" />
@@ -50 +49 @@
     <Compile Include="src\CommandExtensions.cs" />
     <Compile Include="src\CommonMappingFunctions.cs" />
-    <Compile Include="src\ConsoleOutputSeparator.cs" />
     <Compile Include="src\MapRendering\MapRendering.cs" />
     <Compile Include="src\MapRendering\MapRenderBlockBuffer.cs" />
@@ -70 +68 @@
     <Compile Include="src\CustomCommands\Give.cs" />
     <Compile Include="src\CustomCommands\ListItems.cs" />
+    <Compile Include="src\NetConnections\ConsoleOutputSeparator.cs" />
+    <Compile Include="src\NetConnections\NetTelnetServer.cs" />
+    <Compile Include="src\NetConnections\IServer.cs" />
+    <Compile Include="src\NetConnections\IConnection.cs" />
+    <Compile Include="src\NetConnections\Servers\Telnet\Telnet.cs" />
+    <Compile Include="src\NetConnections\Servers\Telnet\TelnetConnection.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\Web.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\PathHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\StaticHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\SimpleRedirectHandler.cs" />
+    <Compile Include="src\NetConnections\Servers\Web\MimeType.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -76 +85 @@
     <Folder Include="src\MapRendering\" />
     <Folder Include="src\CustomCommands\" />
+    <Folder Include="src\NetConnections\" />
+    <Folder Include="src\NetConnections\Servers\" />
+    <Folder Include="src\NetConnections\Servers\Telnet\" />
+    <Folder Include="src\NetConnections\Servers\Web\" />
   </ItemGroup>
 </Project>

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

@@ -6 +6 @@
 using System.Reflection;
 using System.Threading;
+using UnityEngine;
 
 namespace AllocsFixes.NetConnections
@@ -11 +12 @@
         public class NetTelnetServer
         {
-                private static List<IServer> servers = new List<IServer>();
+                private static List<IServer> servers = new List<IServer> ();
 
                 public static void init (int port)
@@ -17 +18 @@
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-                                servers.Add(new Servers.Telnet.Telnet(port));
+                                servers.Add (new Servers.Telnet.Telnet (port));
+
+                                int webPort = GamePrefs.GetInt (EnumGamePrefs.ControlPanelPort);
+                                if (GamePrefs.GetBool (EnumGamePrefs.ControlPanelEnabled) && webPort > 0 && webPort < 65534) {
+                                        if (Directory.Exists (Application.dataPath + "/../webserver")) {
+                                                servers.Add (new Servers.Web.Web (webPort + 2));
+                                        }
+                                }
                         } catch (Exception e) {
-                                Log.Out ("Error in AllocsTelnetServer.init: " + e);
+                                Log.Out ("Error in NetTelnetServer.init: " + e);
                         }
                 }
@@ -30 +38 @@
                 {
                         foreach (IServer s in servers)
-                                s.Disconnect();
+                                s.Disconnect ();
                 }
 
@@ -39 +47 @@
                         }
                         foreach (IServer s in servers)
-                                s.WriteToClient(line);
+                                s.WriteToClient (line);
                 }
 
@@ -48 +56 @@
                         }
                         foreach (IServer s in servers)
-                                s.WriteToClient_Single(line, client);
+                                s.WriteToClient_Single (line, client);
                 }
         }