Index: binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj =================================================================== --- binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj (revision 106) +++ binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj (revision 107) @@ -55,4 +55,5 @@ + Index: binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs =================================================================== --- binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs (revision 106) +++ binary-improvements/7dtd-server-fixes/7dtd-server-fixes.userprefs (revision 107) @@ -1,13 +1,15 @@  - + - - - - - - + + + + + + + + Index: binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs (revision 107) @@ -25,4 +25,15 @@ } } + + if (tmpInfo.PermissionLevel <= 0) { + List commands = console.commands; + foreach (ConsoleCommand c in commands) { + if (!allowed.Contains (c.Names () [0])) { + if (!hasPermissionLevel (admTools, c.Names () [0])) { + addAllowed (console, allowed, c.Names () [0]); + } + } + } + } } catch (Exception e) { Log.Out ("Error in GetAllowedCommandsList: " + e); @@ -33,15 +44,34 @@ } + private static bool hasPermissionLevel (AdminTools admTools, string cmd) + { + List perms = admTools.commandPermissions; + + foreach (AdminToolsCommandPermissions atcp in perms) { + foreach (string ccName in getAlternativeNames(cmd)) { + if (atcp.Command.ToLower ().Equals (ccName)) { + return true; + } + } + } + return false; + } + private static void addAllowed (ConsoleSdtd console, List list, string cmd) { - ConsoleCommand cc = console.getCommand (cmd); + foreach (string ccName in getAlternativeNames(cmd)) { + if (!list.Contains (ccName)) { + list.Add (ccName); + } + } + } + + private static string[] getAlternativeNames (string cmd) + { + ConsoleCommand cc = CommonMappingFunctions.GetGameManager ().m_GUIConsole.getCommand (cmd); if (cc != null) { - foreach (string ccName in cc.Names()) { - if (!list.Contains (ccName)) { - list.Add (ccName); - } - } + return cc.Names (); } else { - list.Add (cmd); + return new string[0]; } } Index: binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (revision 107) @@ -28,8 +28,3 @@ } } - - public static void ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command) - { - Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\""); - } } Index: binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/AllocsNetTelnetServer.cs (revision 107) @@ -78,5 +78,5 @@ } Log.Out ("Telnet executed \"" + line + "\" from: " + c.GetEndPoint ()); - console.md000f (line); + ConsoleOutputSeparator.QueueTelnetCommand (line, c); } } @@ -168,3 +168,15 @@ } } + + public static void WriteToClient (string line, AllocsTelnetConnection client) + { + if (line == null) { + return; + } + RemoveClosedConnections (); + foreach (AllocsTelnetConnection c in connections) { + if (c.IsAuthenticated () && (c == client)) + c.WriteLine (line); + } + } } Index: binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs (revision 107) @@ -1,3 +1,4 @@ using System; +using System.Collections.Generic; public class CommandExtensions @@ -5,10 +6,33 @@ public static void InitCommandExtensions (GameManager manager) { - manager.m_GUIConsole.AddCommand(new GetGamePrefs(manager.m_GUIConsole)); - manager.m_GUIConsole.AddCommand(new GetTime(manager.m_GUIConsole)); - manager.m_GUIConsole.AddCommand(new ListPlayersExtended(manager.m_GUIConsole)); - manager.m_GUIConsole.AddCommand(new SayToPlayer(manager.m_GUIConsole)); - manager.m_GUIConsole.AddCommand(new SetTimeReal(manager.m_GUIConsole)); - manager.m_GUIConsole.AddCommand(new ShowInventory(manager.m_GUIConsole)); + try { + manager.m_GUIConsole.AddCommand (new GetGamePrefs (manager.m_GUIConsole)); + manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole)); + manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole)); + manager.m_GUIConsole.AddCommand (new SayToPlayer (manager.m_GUIConsole)); + manager.m_GUIConsole.AddCommand (new SetTimeReal (manager.m_GUIConsole)); + manager.m_GUIConsole.AddCommand (new ShowInventory (manager.m_GUIConsole)); + } catch (Exception e) { + Log.Out ("Error registering custom commands: " + e); + } + /* + try { + List commands = manager.m_GUIConsole.commands; + foreach (ConsoleCommand c in commands) { + string name = string.Empty; + foreach (string cname in c.Names()) { + if (cname.Length > 0) { + if (name.Length > 0) + name += ", "; + name += cname; + } + } + name += " => " + c.Description(); + Log.Out (name); + } + } catch (Exception e) { + Log.Out ("Error listing commands: " + e); + } + */ } } Index: binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs (revision 107) +++ binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs (revision 107) @@ -0,0 +1,153 @@ +using System; +using System.Collections.Generic; +using ManagedSteam.SteamTypes; + +public class CommonMappingFunctions +{ + public static ConnectionManager GetConnectionManager () + { + return ConnectionManager.Instance; + } + + public static GameManager GetGameManager () + { + return GetConnectionManager ().gameManager; + } + + public static string GetPlayerName (ClientInfo _ci) + { + try { + int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId]; + return GetGameManager ().World.playerEntities.dict [entityId].EntityName; + } catch (Exception e) { + Log.Out ("Error getting player name for ClientInfo: " + e); + } + return null; + } + + public static EntityPlayer GetEntityPlayer (ClientInfo _ci) + { + try { + int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId]; + return GetGameManager ().World.playerEntities.dict [entityId]; + } catch (Exception e) { + Log.Out ("Error getting entity player for ClientInfo: " + e); + } + return null; + } + + public static string GetSteamID (ClientInfo _ci) + { + return SingletonMonoBehaviour.Instance.GetPlayerId (GetPlayerName (_ci)); + } + + public static int GetClientID (ClientInfo _ci) + { + if (_ci != null) + return _ci.clientId; + else + return -1; + } + + public static int GetEntityID (ClientInfo _ci) + { + try { + ConnectionManager cm = GetConnectionManager (); + + if (cm.mapClientToEntity.ContainsKey (_ci.clientId)) + return cm.mapClientToEntity [_ci.clientId]; + else + return -1; + } catch (Exception e) { + Log.Out ("Error getting entity ID for ClientInfo: " + e); + } + return -1; + } + + public static ClientInfo GetClientInfoFromEntityID (int _entityId) + { + try { + ConnectionManager cm = GetConnectionManager (); + + if (cm.mapClientToEntity.ContainsValue (_entityId)) { + foreach (KeyValuePair kvp in cm.mapClientToEntity) { + if (kvp.Value == _entityId) { + return cm.connectedClients [kvp.Key]; + } + } + } + + return null; + } catch (Exception e) { + Log.Out ("Error getting ClientInfo for entity ID: " + e); + } + return null; + } + + public static ClientInfo GetClientInfoFromClientID (int _clientId) + { + try { + ConnectionManager cm = GetConnectionManager (); + + if (cm.connectedClients.ContainsKey (_clientId)) + return cm.connectedClients [_clientId]; + else + return null; + } catch (Exception e) { + Log.Out ("Error getting ClientInfo for client ID: " + e); + } + return null; + } + + public static ClientInfo GetClientInfoFromPlayerName (string _playerName) + { + try { + ConnectionManager cm = GetConnectionManager (); + + _playerName = _playerName.ToLower (); + foreach (ClientInfo ci in cm.connectedClients.Values) { + if (GetPlayerName (ci).ToLower ().Equals (_playerName)) { + return ci; + } + } + } catch (Exception e) { + Log.Out ("Error getting ClientInfo for player name: " + e); + } + return null; + } + + public static ClientInfo GetClientInfoFromNameOrID (string _nameOrId) + { + try { + int entityId = -1; + if (int.TryParse (_nameOrId, out entityId)) { + ClientInfo ci = GetClientInfoFromEntityID (entityId); + if (ci != null) + return ci; + } + + return GetClientInfoFromPlayerName (_nameOrId); + } catch (Exception e) { + Log.Out ("Error getting ClientInfo for entity ID or player name: " + e); + } + return null; + } + + public static ClientInfo GetClientInfoFromSteamID (string _steamId) + { + try { + Dictionary uToID = Authenticator.Instance.usersToIDs; + foreach (KeyValuePair kvp in uToID) { + string curId = string.Empty + ((SteamID)kvp.Value).AsUInt64; + if (curId.Equals (_steamId)) { + return GetClientInfoFromPlayerName (kvp.Key); + } + } + } catch (Exception e) { + Log.Out ("Error getting ClientInfo for steam ID: " + e); + } + return null; + } + +} + Index: binary-improvements/7dtd-server-fixes/src/ConsoleOutputSeparator.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/ConsoleOutputSeparator.cs (revision 107) +++ binary-improvements/7dtd-server-fixes/src/ConsoleOutputSeparator.cs (revision 107) @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using UnityEngine; + +public class ConsoleOutputSeparator +{ + public struct AllocsTelnetCommand + { + public string command; + public AllocsTelnetConnection client; + + public AllocsTelnetCommand (string _cmd, AllocsTelnetConnection _client) + { + command = _cmd; + client = _client; + } + } + + private static List telnetCommandQueue = new List (); + private static bool isCurrentCommandFromClient = false; + private static AllocsTelnetConnection issuerOfCurrentTelnetCommand; + + public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command) + { + Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\""); + + object obj = telnetCommandQueue; + Monitor.Enter (obj); + try { + isCurrentCommandFromClient = true; + console.issuerOfCurrentClientCommand = _networkPlayer; + console.ExecuteClientCmdInternal (_playerID, _command); + isCurrentCommandFromClient = false; + } finally { + Monitor.Exit (obj); + } + + } + + public static void C_SendResult (ConsoleSdtd console, string _line) + { + if (isCurrentCommandFromClient) { + console.gameManager.GetRPCNetworkView ().RPC ("RPC_Console", console.issuerOfCurrentClientCommand, new object[] + { + _line, + false + } + ); + } else { + if (console.telnetServer != null && issuerOfCurrentTelnetCommand != null) + AllocsNetTelnetServer.WriteToClient (_line, issuerOfCurrentTelnetCommand); + else if (ControlPanel.IsStarted ()) + ControlPanel.AddTextToOutputBuffer (_line); + } + } + + public static void C_Run (ConsoleSdtd console) + { + if (telnetCommandQueue.Count > 0) { + object obj = telnetCommandQueue; + Monitor.Enter (obj); + try { + issuerOfCurrentTelnetCommand = telnetCommandQueue [0].client; + console.ExecuteRemoteCmdInternal (telnetCommandQueue [0].command, false); + telnetCommandQueue.RemoveAt (0); + issuerOfCurrentTelnetCommand = null; + } finally { + Monitor.Exit (obj); + } + } + } + + public static void QueueTelnetCommand (string _line, AllocsTelnetConnection _con) + { + object obj = telnetCommandQueue; + Monitor.Enter (obj); + try { + telnetCommandQueue.Add (new AllocsTelnetCommand (_line, _con)); + } finally { + Monitor.Exit (obj); + } + } +} + Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs (revision 107) @@ -65,11 +65,11 @@ } foreach (string s in sortedList.Keys) { - m_Console.md000a (sortedList [s]); + m_Console.SendResult (sortedList [s]); } } else { if (prefAccessAllowed (enumGamePrefs)) - m_Console.md000a (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs))); + m_Console.SendResult (string.Format ("{0} = {1}", enumGamePrefs, GamePrefs.GetObject (enumGamePrefs))); else - m_Console.md000a ("Access to requested preference is forbidden"); + m_Console.SendResult ("Access to requested preference is forbidden"); } } catch (Exception e) { Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetTime.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetTime.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/GetTime.cs (revision 107) @@ -28,5 +28,5 @@ } int min = (int)(time % 1000) * 60 / 1000; - m_Console.md000a (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min)); + m_Console.SendResult (String.Format ("Day {0}, {1:00}:{2:00} ", day, hour, min)); } catch (Exception e) { Log.Out ("Error in GetTime.Run: " + e); Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs (revision 107) @@ -29,5 +29,5 @@ ip = ci.networkPlayer.ipAddress; } - m_Console.md000a (string.Concat (new object[] + m_Console.SendResult (string.Concat (new object[] { string.Empty, @@ -63,5 +63,5 @@ ); } - m_Console.md000a ("Total of " + w.playerEntities.list.Count + " in the game"); + m_Console.SendResult ("Total of " + w.playerEntities.list.Count + " in the game"); } catch (Exception e) { Log.Out ("Error in ListPlayersExtended.Run: " + e); Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs (revision 107) @@ -23,5 +23,5 @@ new object[] { _message, -1, _sender + " (PM)", true }); string receiverName = CommonMappingFunctions.GetPlayerName (_receiver); - m_Console.md000a ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\""); + m_Console.SendResult ("Message to player " + (receiverName != null ? "\"" + receiverName + "\"" : "unknownName") + " sent with sender \"" + _sender + "\""); } @@ -29,5 +29,5 @@ { if (_params.Length < 2) { - m_Console.md000a ("Usage: sayplayer "); + m_Console.SendResult ("Usage: sayplayer "); return; } @@ -42,5 +42,5 @@ SendMessage (ci, _sender, message); } else { - m_Console.md000a ("Playername or entity ID not found."); + m_Console.SendResult ("Playername or entity ID not found."); } } Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/SetTimeReal.cs (revision 107) @@ -21,5 +21,5 @@ try { if (_params.Length != 3) { - m_Console.md000a ("Usage: settimereal "); + m_Console.SendResult ("Usage: settimereal "); return; } @@ -27,29 +27,29 @@ int day, hour, min; if (!int.TryParse (_params [0], out day)) { - m_Console.md000a ("Could not parse day number \"" + _params [0] + "\""); + m_Console.SendResult ("Could not parse day number \"" + _params [0] + "\""); return; } if (day < 1) { - m_Console.md000a ("Day must be >= 1"); + m_Console.SendResult ("Day must be >= 1"); return; } if (!int.TryParse (_params [1], out hour)) { - m_Console.md000a ("Could not parse hour \"" + _params [1] + "\""); + m_Console.SendResult ("Could not parse hour \"" + _params [1] + "\""); return; } if (hour > 23) { - m_Console.md000a ("Hour must be <= 23"); + m_Console.SendResult ("Hour must be <= 23"); return; } if (!int.TryParse (_params [2], out min)) { - m_Console.md000a ("Could not parse minute \"" + _params [2] + "\""); + m_Console.SendResult ("Could not parse minute \"" + _params [2] + "\""); return; } if (min > 59) { - m_Console.md000a ("Minute must be <= 59"); + m_Console.SendResult ("Minute must be <= 59"); return; } if ((day < 1) || (hour < 8 && day < 1)) { - m_Console.md000a ("Time may not be prior to day 1, 8:00"); + m_Console.SendResult ("Time may not be prior to day 1, 8:00"); return; } @@ -57,5 +57,5 @@ ulong time = ((ulong)(day - 1) * 24000) + ((ulong)hour * 1000) + ((ulong)min * 1000 / 60) - 8000; m_Console.gameManager.World.gameTime = time; - m_Console.md000a (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time)); + m_Console.SendResult (String.Format ("Set time to Day {0}, {1:00}:{2:00} = {3}", day, hour, min, time)); } catch (Exception e) { Log.Out ("Error in SetTimeReal.Run: " + e); Index: binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs =================================================================== --- binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs (revision 106) +++ binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs (revision 107) @@ -25,5 +25,5 @@ try { if (_params.Length < 1) { - m_Console.md000a ("Usage: showinventory "); + m_Console.SendResult ("Usage: showinventory "); return; } @@ -47,18 +47,18 @@ if (items == null) { - m_Console.md000a ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s)."); + m_Console.SendResult ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s)."); return; } - m_Console.md000a ("Belt of player:"); + m_Console.SendResult ("Belt of player:"); foreach (KeyValuePair kvp in items.belt) { - m_Console.md000a (string.Format (" {0:000} * {1}", kvp.Value, kvp.Key)); + m_Console.SendResult (string.Format (" {0:000} * {1}", kvp.Value, kvp.Key)); } - m_Console.md000a (string.Empty); - m_Console.md000a ("Bagpack of player:"); + m_Console.SendResult (string.Empty); + m_Console.SendResult ("Bagpack of player:"); foreach (KeyValuePair kvp in items.bag) { - m_Console.md000a (string.Format (" {0:000} * {1}", kvp.Value, kvp.Key)); + m_Console.SendResult (string.Format (" {0:000} * {1}", kvp.Value, kvp.Key)); } - m_Console.md000a (string.Empty); + m_Console.SendResult (string.Empty); } catch (Exception e) { Log.Out ("Error in ShowInventory.Run: " + e);