From 59078d13f508c9563f796ce659debe6b1df6ac2d Mon Sep 17 00:00:00 2001 From: Alex Macocian Date: Mon, 22 Jul 2019 15:00:29 +0300 Subject: [PATCH] Modified from ASCII to Unicode Encoding for broadcasting. --- MTSC-TestClient/Program.cs | 1 + MTSC-TestServer/Program.cs | 1 + MTSC/Client/Handlers/BroadcastHandler.cs | 6 ++--- MTSC/Common/HTTPMessage.cs | 28 ++++++++++++++++++++++++ MTSC/Server/Handlers/BroadcastHandler.cs | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 MTSC/Common/HTTPMessage.cs diff --git a/MTSC-TestClient/Program.cs b/MTSC-TestClient/Program.cs index cdca8bb..4c67b00 100644 --- a/MTSC-TestClient/Program.cs +++ b/MTSC-TestClient/Program.cs @@ -17,6 +17,7 @@ namespace MTSC_TestClient .AddHandler(new EncryptionHandler(client)) .AddHandler(broadcastHandler) .AddLogger(new ConsoleLogger()) + .AddLogger(new DebugConsoleLogger()) .Connect(); while (true) { diff --git a/MTSC-TestServer/Program.cs b/MTSC-TestServer/Program.cs index e52c681..690876f 100644 --- a/MTSC-TestServer/Program.cs +++ b/MTSC-TestServer/Program.cs @@ -18,6 +18,7 @@ namespace MTSC_TestServer server .AddHandler(encryptionHandler) .AddLogger(new ConsoleLogger()) + .AddLogger(new DebugConsoleLogger()) .AddExceptionHandler(new ExceptionConsoleLogger()) .AddHandler(broadcastHandler) .Run(); diff --git a/MTSC/Client/Handlers/BroadcastHandler.cs b/MTSC/Client/Handlers/BroadcastHandler.cs index cbf5040..f1cd7e0 100644 --- a/MTSC/Client/Handlers/BroadcastHandler.cs +++ b/MTSC/Client/Handlers/BroadcastHandler.cs @@ -24,7 +24,7 @@ namespace MTSC.Client.Handlers /// Message to be broadcasted. public void Broadcast(string message) { - managedClient.QueueMessage(ASCIIEncoding.ASCII.GetBytes(message)); + managedClient.QueueMessage(UnicodeEncoding.Unicode.GetBytes(message)); } public void Disconnected(TcpClient client) @@ -34,8 +34,8 @@ namespace MTSC.Client.Handlers public bool HandleReceivedMessage(TcpClient client, Message message) { - managedClient.LogDebug("Broadcast: " + ASCIIEncoding.ASCII.GetString(message.MessageBytes)); - managedClient.Log(">" + ASCIIEncoding.ASCII.GetString(message.MessageBytes)); + managedClient.LogDebug("Broadcast: " + UnicodeEncoding.Unicode.GetString(message.MessageBytes)); + managedClient.Log(">" + UnicodeEncoding.Unicode.GetString(message.MessageBytes)); return false; } diff --git a/MTSC/Common/HTTPMessage.cs b/MTSC/Common/HTTPMessage.cs new file mode 100644 index 0000000..d88165e --- /dev/null +++ b/MTSC/Common/HTTPMessage.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace MTSC.Common +{ + public class HTTPMessage + { + private enum MethodEnum + { + Options = 0, + Get = 1, + Head = 2, + Post = 3, + Put = 4, + Delete = 5, + Trace = 6, + Connect = 7, + ExtensionMethod = 8 + } + private static string[] methods = new string[] { "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE", "CONNECT", "extension-method" }; + + public Dictionary GeneralHeaders = new Dictionary(); + public Dictionary RequestHeaders = new Dictionary(); + public Dictionary ResponseHeaders = new Dictionary(); + public Dictionary EntityHeaders = new Dictionary(); + } +} diff --git a/MTSC/Server/Handlers/BroadcastHandler.cs b/MTSC/Server/Handlers/BroadcastHandler.cs index 9bd1187..fbf7991 100644 --- a/MTSC/Server/Handlers/BroadcastHandler.cs +++ b/MTSC/Server/Handlers/BroadcastHandler.cs @@ -28,7 +28,7 @@ namespace MTSC.Server.Handlers public bool HandleReceivedMessage(ClientStruct client, Message message) { - managedServer.LogDebug("Broadcast: " + ASCIIEncoding.ASCII.GetString(message.MessageBytes)); + managedServer.LogDebug("Broadcast: " + UnicodeEncoding.Unicode.GetString(message.MessageBytes)); managedServer.LogDebug("From: " + client.TcpClient.Client.RemoteEndPoint.ToString()); foreach(ClientStruct clientStruct in managedServer.Clients) {