themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Changed method names according to GUIDELINE

Browse source
This commit is contained in:
Deathmax 2011-07-08 22:45:32 +08:00
parent a465943eee
commit 2b382a3cee
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/RconHandler.cs
View file

@ -80,7 +80,7 @@ namespace TShockAPI
lastRequest = DateTime.Now; lastRequest = DateTime.Now;
byte[] bytes = listener.Receive(ref listenEP); byte[] bytes = listener.Receive(ref listenEP);
Log.Info(string.Format("Recieved packet from {0}:{1}", listenEP.Address.ToString(), listenEP.Port.ToString())); Log.Info(string.Format("Recieved packet from {0}:{1}", listenEP.Address.ToString(), listenEP.Port.ToString()));
var packet = parsePacket(bytes, listenEP); var packet = ParsePacket(bytes, listenEP);
listener.Send(packet, packet.Length, listenEP); listener.Send(packet, packet.Length, listenEP);
listener.Close(); listener.Close();
} }
@ -92,7 +92,7 @@ namespace TShockAPI
} }
} }
private static string sendPacket(byte[] bytes, string hostname, int port) private static string SendPacket(byte[] bytes, string hostname, int port)
{ {
var response = Encoding.UTF8.GetString(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF }) + "disconnect"; var response = Encoding.UTF8.GetString(new byte[] { 0xFF, 0xFF, 0xFF, 0xFF }) + "disconnect";
try try
@ -111,10 +111,10 @@ namespace TShockAPI
return response; return response;
} }
private static byte[] parsePacket(byte[] bytes, IPEndPoint EP) private static byte[] ParsePacket(byte[] bytes, IPEndPoint EP)
{ {
string response = ""; string response = "";
var packetstring = Encoding.UTF8.GetString(padPacket(bytes)); var packetstring = Encoding.UTF8.GetString(PadPacket(bytes));
var redirect = false; var redirect = false;
var print = true; var print = true;
if ((DateTime.Now - lastRequest).Milliseconds >= 100) if ((DateTime.Now - lastRequest).Milliseconds >= 100)
@ -132,7 +132,7 @@ namespace TShockAPI
for (int i = 2; i < args.Length; i++) for (int i = 2; i < args.Length; i++)
command += args[i] + " "; command += args[i] + " ";
command = command.TrimEnd(' ').TrimEnd('\0'); command = command.TrimEnd(' ').TrimEnd('\0');
response = executeCommand(command); response = ExecuteCommand(command);
if (response == "" && Response != "") if (response == "" && Response != "")
{ {
response = Response; response = Response;
@ -158,12 +158,12 @@ namespace TShockAPI
redirect = true; redirect = true;
} }
if (!redirect) if (!redirect)
return (constructPacket(response, print)); return (ConstructPacket(response, print));
else else
return (constructPacket("", false)); return (ConstructPacket("", false));
} }
private static string executeCommand(string text) private static string ExecuteCommand(string text)
{ {
if (Main.rand == null) if (Main.rand == null)
Main.rand = new Random(); Main.rand = new Random();
@ -218,7 +218,7 @@ namespace TShockAPI
return ""; return "";
} }
private static byte[] constructPacket(string response, bool print) private static byte[] ConstructPacket(string response, bool print)
{ {
var oob = new byte[] { 0xFF, 0xFF, 0xFF, 0xFF }; var oob = new byte[] { 0xFF, 0xFF, 0xFF, 0xFF };
MemoryStream stream = new MemoryStream(); MemoryStream stream = new MemoryStream();
@ -234,7 +234,7 @@ namespace TShockAPI
return packet; return packet;
} }
private static byte[] padPacket(byte[] packet) private static byte[] PadPacket(byte[] packet)
{ {
var returnpacket = new byte[(4 + packet.Length)]; var returnpacket = new byte[(4 + packet.Length)];
int h = 0; int h = 0;