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

Timestamp:

Aug 29, 2014, 4:18:16 PM (10 years ago)

Author:

alloc

Message:

Fixes: Fixed #49

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (3 diffs)
• src/MapRendering/MapRenderBlockBuffer.cs (modified) (1 diff)
• src/NetConnections/Servers/Telnet/Telnet.cs (modified) (1 diff)
• src/NetConnections/Servers/Telnet/TelnetConnection.cs (modified) (5 diffs)
• src/NetConnections/Servers/Web/Web.cs (modified) (2 diffs)
• src/PersistentData (added)
• src/PersistentData/KnownPlayers.cs (added)
• src/PersistentData/PersistentContainer.cs (added)
• src/StateManager.cs (added)

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

@@ -28 +28 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Version|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="bash -c &quot;monodis --assembly ${TargetFile} | grep Version &gt; ${TargetDir}/${ProjectName}_version.txt&quot;" />
+      </CustomCommands>
+    </CustomCommands>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
@@ -80 +93 @@
     <Compile Include="src\NetConnections\Servers\Web\MimeType.cs" />
     <Compile Include="src\CustomCommands\EnableRendering.cs" />
+    <Compile Include="src\PersistentData\PersistentContainer.cs" />
+    <Compile Include="src\PersistentData\KnownPlayers.cs" />
+    <Compile Include="src\StateManager.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -90 +106 @@
     <Folder Include="src\NetConnections\Servers\Telnet\" />
     <Folder Include="src\NetConnections\Servers\Web\" />
+    <Folder Include="src\PersistentData\" />
   </ItemGroup>
 </Project>

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRenderBlockBuffer.cs

@@ -37 +37 @@
                                 Directory.CreateDirectory (folder);
                                 if (!fileName.Equals (currentBlockMap)) {
-                                        if (currentBlockMap.Length > 0)
-                                                saveTextureToFile (currentBlockMap);
+                                        SaveBlock();
                                         loadTextureFromFile (fileName);
                                 }

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

@@ -113 +113 @@
                         string res = "";
                         for (int i = 0; i < line.Length; i++) {
-                                if (line [i] >= ' ' && line [i] != '\'' && line [i] <= '~') {
+                                if (line [i] >= ' ' && line [i] != '\'') {
                                         res += line [i];
                                 }

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

@@ -2 +2 @@
 using System.Net;
 using System.Net.Sockets;
+using System.Text;
 
 namespace AllocsFixes.NetConnections.Servers.Telnet
@@ -11 +12 @@
                 private TcpClient client;
                 private NetworkStream stream;
-                private string lineBuffer = string.Empty;
+                private int lineBufferLength = 0;
+                private byte[] lineBuffer = new byte[200];
                 private EndPoint endpoint;
 
@@ -38 +40 @@
                         try {
                                 if (!IsClosed () && stream.CanWrite) {
-                                        for (int i = 0; i < s.Length; i++) {
-                                                WriteByte ((byte)s [i]);
-                                        }
+                                        byte[] utfData = Encoding.UTF8.GetBytes (s);
+                                        stream.Write(utfData, 0, utfData.Length);
                                         WriteByte (13);
                                         WriteByte (10);
@@ -79 +80 @@
                                 int b = stream.ReadByte ();
                                 if (b == '\r' || b == '\n') {
-                                        if (lineBuffer.Length > 0)
+                                        if (lineBufferLength > 0)
                                                 return true;
-                                } else {
-                                        lineBuffer += (char)b;
+                                } else if (b >= 0) {
+                                        lineBuffer[lineBufferLength] = (byte)b;
+                                        lineBufferLength++;
                                 }
                         }
@@ -90 +92 @@
                 public string GetLine ()
                 {
-                        string res = lineBuffer;
-                        lineBuffer = string.Empty;
+                        string res = Encoding.UTF8.GetString(lineBuffer, 0, lineBufferLength);;
+                        lineBufferLength = 0;
                         return res;
                 }

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

@@ -113 +113 @@
                 {
                         try {
-                                Log.Out ("NOT IMPLEMENTED: Web.WriteToClient");
+                                //Log.Out ("NOT IMPLEMENTED: Web.WriteToClient");
                         } catch (Exception e) {
                                 Log.Out ("Error in Web.WriteToClient: " + e);
@@ -122 +122 @@
                 {
                         try {
-                                Log.Out ("NOT IMPLEMENTED: Web.WriteToClient_Single");
+                                //Log.Out ("NOT IMPLEMENTED: Web.WriteToClient_Single");
                         } catch (Exception e) {
                                 Log.Out ("Error in Web.WriteToClient_Single: " + e);