Index: /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj =================================================================== --- /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj (revision 73) +++ /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj (revision 73) @@ -0,0 +1,45 @@ + + + + Debug + AnyCPU + 10.0.0 + 2.0 + {81DA7F87-1A66-4920-AADA-6EAF1971F8D0} + Library + dtdserverfixes + 7dtd-server-fixes + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + false + + + none + true + bin\Release + prompt + 4 + false + + + + + Assembly-CSharp.dll + + + + + + + + + + + Index: /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.sln =================================================================== --- /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.sln (revision 73) +++ /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.sln (revision 73) @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "7dtd-server-fixes", "7dtd-server-fixes.csproj", "{81DA7F87-1A66-4920-AADA-6EAF1971F8D0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {81DA7F87-1A66-4920-AADA-6EAF1971F8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81DA7F87-1A66-4920-AADA-6EAF1971F8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81DA7F87-1A66-4920-AADA-6EAF1971F8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81DA7F87-1A66-4920-AADA-6EAF1971F8D0}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = 7dtd-server-fixes.csproj + EndGlobalSection +EndGlobal Index: /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs =================================================================== --- /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs (revision 73) +++ /binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs (revision 73) @@ -0,0 +1,12 @@ + + + + + + + + + + + + Index: /binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs =================================================================== --- /binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs (revision 73) +++ /binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs (revision 73) @@ -0,0 +1,158 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Net; +using System.Net.Sockets; +using System.Threading; + +public class AllocsNetTelnetServer +{ + private static ឦ console; + private static Thread telnetThread; + private static Dictionary endpointsAuthed; + private static TcpListener listener; + private static NetworkStream stream; + private static bool closed; + private static string lineRead = string.Empty; + + public static void init (int port) + { + listener = new TcpListener (IPAddress.Any, port); + telnetThread = ThreadMaster.Create ("thread Allocs TelnetListenThread", new ThreadStart (telnetListenThread)); + telnetThread.Start (); + endpointsAuthed = new Dictionary (); + Console.Out.WriteLine ("Started Allocs NetTelnetServer thread on " + port); +// Log.Out ("Started Allocs NetTelnetServer thread on " + port); + } + + private static void telnetListenThread () + { + Console.Out.WriteLine ("Started thread_Allocs_TelnetListenThread()"); + //Log.Out ("Started thread_Allocs_TelnetListenThread()"); + listener.Start (); + while (!closed) { + Thread.Sleep (10); + TcpClient tcpClient = listener.AcceptTcpClient (); + if (tcpClient != null) { + try { + Console.Out.WriteLine ("Someone connected to telnet!"); + endpointsAuthed.Add (tcpClient.Client.RemoteEndPoint, false); + stream = tcpClient.GetStream (); + StreamReader streamReader = new StreamReader (stream); + WriteToClient ("Please enter password:"); + while (!closed && !endpointsAuthed[tcpClient.Client.RemoteEndPoint]) { + lineRead = streamReader.ReadLine (); + string text = string.Empty; + lineCorrecter (ref text); + text = text.Trim (); + if (text.Equals (GamePrefs.GetString (EnumGamePrefs.TelnetPassword))) { + endpointsAuthed [tcpClient.Client.RemoteEndPoint] = true; + WriteToClient ("Logon successful."); + WriteToClient (string.Empty); + WriteToClient (string.Empty); + WriteToClient (string.Empty); + } else { + WriteToClient ("Password incorrect, please enter password:"); + } + } + WriteToClient ("*** Connected with 7DTD server."); + WriteToClient ("*** Server version: Alpha 8.7 (b29) Compatibility Version: Alpha 8.7"); + WriteToClient (string.Empty); + WriteToClient ("Server IP: " + + ((GamePrefs.GetString (EnumGamePrefs.ServerIP) != null && GamePrefs.GetString (EnumGamePrefs.ServerIP).Length != 0) ? GamePrefs.GetString (EnumGamePrefs.ServerIP) : "Any") + ); + WriteToClient ("Server port: " + GamePrefs.GetInt (EnumGamePrefs.ServerPort)); + WriteToClient ("Max players: " + GamePrefs.GetInt (EnumGamePrefs.ServerMaxPlayerCount)); + WriteToClient ("Game mode: " + GamePrefs.GetString (EnumGamePrefs.GameMode)); + WriteToClient ("World: " + GamePrefs.GetString (EnumGamePrefs.GameWorld)); + WriteToClient ("Game name: " + GamePrefs.GetString (EnumGamePrefs.GameName)); + WriteToClient ("Difficulty: " + GamePrefs.GetInt (EnumGamePrefs.GameDifficulty)); + WriteToClient (string.Empty); + WriteToClient ("Press 'help' to get a list of all commands. Press 'exit' to end session."); + WriteToClient (string.Empty); + while (!closed) { + lineRead = streamReader.ReadLine (); + string text2 = string.Empty; + lineCorrecter (ref text2); + text2 = text2.Trim (); + if (text2.Equals ("exit")) { + endpointsAuthed [tcpClient.Client.RemoteEndPoint] = false; + break; + } + + if (text2.Length != 0) { + Console.WriteLine ("Telnet executed \"" + text2 + "\" by " + tcpClient.Client.RemoteEndPoint); +// console.᝚ᙂ (text2); + lineRead = string.Empty; + } + Thread.Sleep (50); + } + if (stream != null) { + endpointsAuthed [tcpClient.Client.RemoteEndPoint] = false; + stream.Close (); + stream = null; + } + } catch (Exception ex) { + Console.Out.WriteLine ("Error in Allocs telnetListenThread: " + ex.Message); + //Log.Out ("Error in Allocs telnetListenThread: " + ex.Message); + Console.Out.WriteLine ("Stack Trace: " + ex.StackTrace); + //Log.Out ("Stack Trace: " + ex.StackTrace); + } + if (stream != null) { + endpointsAuthed [tcpClient.Client.RemoteEndPoint] = false; + stream.Close (); + stream = null; + } + } + } + Console.Out.WriteLine ("Exited thread_Allocs_TelnetListenThread()"); + //Log.Out ("Exited thread_Allocs_TelnetListenThread()"); + ThreadMaster.Remove (Thread.CurrentThread.Name); + } + + private static void lineCorrecter (ref string line) + { + if (lineRead == null) { + return; + } + for (int i = 0; i < lineRead.Length; i++) { + if ((lineRead [i] == '\b' || lineRead [i] == '~') && line.Length > 0) { + line = line.Substring (0, line.Length); + } + if (lineRead [i] >= ' ' && lineRead [i] != '\'' && lineRead [i] <= '~') { + line += lineRead [i]; + } + } + } + + public static void Disconnect () + { + closed = true; + if (listener != null) { + listener.Stop (); + } + if (stream != null) { + stream.Close (); + } + Thread.Sleep (100); + } + + public static void SetConsole (ឦ console) + { + AllocsNetTelnetServer.console = console; + } + + public static void WriteToClient (string line) + { + if (line == null) { + return; + } + if (stream != null) { + for (int i = 0; i < line.Length; i++) { + stream.WriteByte ((byte)line [i]); + } + stream.WriteByte (13); + stream.WriteByte (10); + } + } +} Index: /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs =================================================================== --- /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs (revision 73) +++ /binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs (revision 73) @@ -0,0 +1,27 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle("7dtd-server-fixes")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("Alloc")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion("0.8.7.*")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. + +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + Index: /binary-improvements/assembly-patcher/7dtd-fixer.userprefs =================================================================== --- /binary-improvements/assembly-patcher/7dtd-fixer.userprefs (revision 73) +++ /binary-improvements/assembly-patcher/7dtd-fixer.userprefs (revision 73) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + Index: /binary-improvements/assembly-patcher/Assembly-Patcher.csproj =================================================================== --- /binary-improvements/assembly-patcher/Assembly-Patcher.csproj (revision 73) +++ /binary-improvements/assembly-patcher/Assembly-Patcher.csproj (revision 73) @@ -0,0 +1,49 @@ + + + + Debug + x86 + 10.0.0 + 2.0 + {FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D} + Exe + dtdfixer + 7dtd-fixer + + + true + full + false + bin\Debug + DEBUG; + prompt + 4 + x86 + true + + + none + true + bin\Release + prompt + 4 + x86 + true + + + + + False + monodevelop + + + ..\7dtd-server-fixes\bin\Release\7dtd-server-fixes.dll + False + + + + + + + + Index: /binary-improvements/assembly-patcher/Assembly-Patcher.sln =================================================================== --- /binary-improvements/assembly-patcher/Assembly-Patcher.sln (revision 73) +++ /binary-improvements/assembly-patcher/Assembly-Patcher.sln (revision 73) @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-Patcher", "Assembly-Patcher.csproj", "{FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D}.Debug|x86.ActiveCfg = Debug|x86 + {FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D}.Debug|x86.Build.0 = Debug|x86 + {FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D}.Release|x86.ActiveCfg = Release|x86 + {FFDBEC4C-E28E-4BF5-A271-33D9368F7F6D}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = Assembly-Patcher.csproj + EndGlobalSection +EndGlobal Index: /binary-improvements/assembly-patcher/Assembly-Patcher.userprefs =================================================================== --- /binary-improvements/assembly-patcher/Assembly-Patcher.userprefs (revision 73) +++ /binary-improvements/assembly-patcher/Assembly-Patcher.userprefs (revision 73) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + Index: /binary-improvements/assembly-patcher/AssemblyInfo.cs =================================================================== --- /binary-improvements/assembly-patcher/AssemblyInfo.cs (revision 73) +++ /binary-improvements/assembly-patcher/AssemblyInfo.cs (revision 73) @@ -0,0 +1,27 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle("Assembly-Patcher")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("Alloc")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion("1.0.*")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. + +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + Index: /binary-improvements/assembly-patcher/Main.cs =================================================================== --- /binary-improvements/assembly-patcher/Main.cs (revision 73) +++ /binary-improvements/assembly-patcher/Main.cs (revision 73) @@ -0,0 +1,67 @@ +using System; +using System.Reflection; +using Mono.Cecil; +using Mono.Cecil.Cil; + +namespace dtdfixer +{ + class MainClass + { + public static void Main (string[] args) + { + ModuleDefinition module = ModuleDefinition.ReadModule ("Assembly-CSharp.dll"); + telnetPatch (module); + module.Write ("Assembly-CSharp.dll"); + Console.WriteLine ("Done"); + } + + private static void telnetPatch (ModuleDefinition module) + { + TypeDefinition type = module.GetType ("NetTelnetServer"); + + if (isPatched (type)) { + return; + } + + markTypePatched (module, type); + patchMethod (type, ".ctor", 1, typeof(AllocsNetTelnetServer).GetMethod ("init")); + patchMethod (type, "Disconnect", 0, typeof(AllocsNetTelnetServer).GetMethod ("Disconnect")); + patchMethod (type, "SetConsole", 1, typeof(AllocsNetTelnetServer).GetMethod ("SetConsole")); + patchMethod (type, "WriteToClient", 1, typeof(AllocsNetTelnetServer).GetMethod ("WriteToClient")); + } + + private static void markTypePatched (ModuleDefinition module, TypeDefinition type) + { + type.Fields.Add (new FieldDefinition ("AllocsPatch", Mono.Cecil.FieldAttributes.Private | Mono.Cecil.FieldAttributes.SpecialName, module.Import (typeof(int)))); + } + + private static void patchMethod (TypeDefinition type, string methodName, int opCount, MethodBase targetMethod) + { + foreach (MethodDefinition method in type.Methods) { + if (method.Name.Equals (methodName)) { + Console.WriteLine ("Patching " + methodName); + var il = method.Body.GetILProcessor (); + var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod)); + var i = 0; + for (int op = 0; op < opCount; op++) { + il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1)); + } + il.InsertBefore (method.Body.Instructions [i++], call); + il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ret)); + } + } + } + + private static bool isPatched (TypeDefinition type) + { + foreach (FieldDefinition fd in type.Fields) { + if (fd.Name.Equals ("AllocsPatch")) { + Console.WriteLine ("\"" + type.Name + "\" is already patched, skipping"); + return true; + } + } + Console.WriteLine ("Patching \"" + type.Name + "\""); + return false; + } + } +}