From 9ef51ddeca9598c27195d16712f67fb4e4a69dbe Mon Sep 17 00:00:00 2001 From: shinichi Date: Fri, 16 Oct 2020 12:18:03 +0200 Subject: [PATCH 1/3] connecting to doctor after works --- ClientApp/Utils/EngineConnection.cs | 8 +++--- Hashing/DataParser.cs | 4 +++ Server/Client.cs | 10 ++++---- Server/Communication.cs | 40 ++++++++++++++++++++++------- 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/ClientApp/Utils/EngineConnection.cs b/ClientApp/Utils/EngineConnection.cs index a82dfb7..ec3e5a5 100644 --- a/ClientApp/Utils/EngineConnection.cs +++ b/ClientApp/Utils/EngineConnection.cs @@ -230,9 +230,9 @@ namespace ClientApp.Utils WriteTextMessage(mainCommand.ShowRoute("showRouteFalse", false)); }); }); - setEnvironment(); + setEnvironment(); + - } private void setEnvironment() @@ -298,7 +298,7 @@ namespace ClientApp.Utils { // TODO check if is drawn }); - SendMessageAndOnResponse(stream, mainCommand.showMessage(panelId, "message", lastMessage), "message", + SendMessageAndOnResponse(mainCommand.showMessage(panelId, "message", lastMessage), "message", (message) => { // TODO check if is drawn @@ -322,7 +322,7 @@ namespace ClientApp.Utils ImprovedPerlin improvedPerlin = new ImprovedPerlin(0, LibNoise.NoiseQuality.Best); for (int i = 0; i < 256 * 256; i++) { - height[i] = improvedPerlin.GetValue(x /10, x / 10, x * 100) / 3.5f + 1; + height[i] = improvedPerlin.GetValue(x / 10, x / 10, x * 100) / 3.5f + 1; //if (height[i] > 1.1f) //{ diff --git a/Hashing/DataParser.cs b/Hashing/DataParser.cs index b4b3be5..4c3e995 100644 --- a/Hashing/DataParser.cs +++ b/Hashing/DataParser.cs @@ -128,6 +128,8 @@ namespace Util } byte messageId = bytes[4]; + System.Diagnostics.Debug.WriteLine(Encoding.ASCII.GetString(bytes.Skip(5).ToArray())); + if (messageId == 0x01) { dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(bytes.Skip(5).ToArray())); @@ -225,6 +227,8 @@ namespace Util public static byte[] getNewConnectionJson(string user) { + if (user == null) + throw new ArgumentNullException("user null"); dynamic data = new { username = user diff --git a/Server/Client.cs b/Server/Client.cs index 2184dcf..6e3272a 100644 --- a/Server/Client.cs +++ b/Server/Client.cs @@ -97,16 +97,17 @@ namespace Server switch (identifier) { case DataParser.LOGIN: - handleLogin(payloadbytes); + if (handleLogin(payloadbytes)) + communication.NewLogin(this); break; case DataParser.LOGIN_DOCTOR: - if (communication.doctor != null) + if (communication.Doctor != null) return; if (handleLogin(payloadbytes)) { - communication.doctor = this; - Console.WriteLine("Set doctor to " + communication.doctor + " , this is " + this); + communication.Doctor = this; + Console.WriteLine("Set doctor to " + communication.Doctor + " , this is " + this); } break; case DataParser.START_SESSION: @@ -168,7 +169,6 @@ namespace Server this.username = username; sendMessage(DataParser.getLoginResponse("OK")); sendMessage(DataParser.getStartSessionJson()); - communication.NewLogin(this); return true; } else diff --git a/Server/Communication.cs b/Server/Communication.cs index 1169597..d064de4 100644 --- a/Server/Communication.cs +++ b/Server/Communication.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO.Pipes; using System.Linq; using System.Net.Sockets; @@ -13,7 +14,24 @@ namespace Server { private TcpListener listener; private List clients; - public Client doctor; + private Client mDoctor; + public Client Doctor + { + get + { + return this.mDoctor; + } + set + { + this.mDoctor = value; + this.clients.ForEach((client) => + { + var dinges = DataParser.getNewConnectionJson(client.username); + Debug.WriteLine("foreach " + Encoding.ASCII.GetString(dinges)); + this.mDoctor.sendMessage(dinges); + }); + } + } public Communication(TcpListener listener) { this.listener = listener; @@ -34,7 +52,7 @@ namespace Server var tcpClient = listener.EndAcceptTcpClient(ar); Console.WriteLine($"Client connected from {tcpClient.Client.RemoteEndPoint}"); - clients.Add(new Client(this, tcpClient)); + new Client(this, tcpClient); listener.BeginAcceptTcpClient(new AsyncCallback(OnConnect), null); } @@ -45,15 +63,19 @@ namespace Server public void NewLogin(Client client) { - if (doctor == null) + clients.Add(client); + var dinges = DataParser.getNewConnectionJson(client.username); + Debug.WriteLine("new login" + Encoding.ASCII.GetString(dinges)); + Doctor?.sendMessage(dinges); + } + + public void LogOff(Client client) + { + if (this.Doctor == client) { - doctor = client; + this.Doctor = null; } - else - { - doctor.sendMessage(DataParser.getNewConnectionJson(client.username)); - } - + this.clients.Remove(client); } } } From 44abffd7e7638e4e80eff745318f589b2ebd0143 Mon Sep 17 00:00:00 2001 From: shinichi Date: Fri, 16 Oct 2020 12:18:46 +0200 Subject: [PATCH 2/3] closing windows works --- ClientApp/Utils/Client.cs | 1 + ClientApp/Utils/EngineConnection.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ClientApp/Utils/Client.cs b/ClientApp/Utils/Client.cs index e292e0e..2dd2d3f 100644 --- a/ClientApp/Utils/Client.cs +++ b/ClientApp/Utils/Client.cs @@ -299,6 +299,7 @@ namespace ClientApp.Utils this.stream.Dispose(); this.client.Dispose(); this.handler.stop(); + this.engineConnection.Stop(); } } } diff --git a/ClientApp/Utils/EngineConnection.cs b/ClientApp/Utils/EngineConnection.cs index ec3e5a5..c8ac28e 100644 --- a/ClientApp/Utils/EngineConnection.cs +++ b/ClientApp/Utils/EngineConnection.cs @@ -156,7 +156,7 @@ namespace ClientApp.Utils Console.WriteLine("set tunnel id to " + tunnelId); if (tunnelId == null) { - Write("could not find a valid tunnel id!"); + //Write("could not find a valid tunnel id!"); OnNoTunnelId?.Invoke(); Connected = false; FollowingRoute = false; From 540a640bc66bbbf829dba8a3d816b152c2626801 Mon Sep 17 00:00:00 2001 From: shinichi Date: Fri, 16 Oct 2020 12:49:06 +0200 Subject: [PATCH 3/3] removed debuggers --- Hashing/DataParser.cs | 2 -- Server/Client.cs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Hashing/DataParser.cs b/Hashing/DataParser.cs index 4c3e995..9a6bc3e 100644 --- a/Hashing/DataParser.cs +++ b/Hashing/DataParser.cs @@ -128,8 +128,6 @@ namespace Util } byte messageId = bytes[4]; - System.Diagnostics.Debug.WriteLine(Encoding.ASCII.GetString(bytes.Skip(5).ToArray())); - if (messageId == 0x01) { dynamic json = JsonConvert.DeserializeObject(Encoding.ASCII.GetString(bytes.Skip(5).ToArray())); diff --git a/Server/Client.cs b/Server/Client.cs index 6e3272a..ed8e0c0 100644 --- a/Server/Client.cs +++ b/Server/Client.cs @@ -137,7 +137,7 @@ namespace Server else if (DataParser.isRawData(message)) { // print the raw data - Console.WriteLine(BitConverter.ToString(payloadbytes)); + //Console.WriteLine(BitConverter.ToString(payloadbytes)); // TODO change, checking for length is not that safe if (payloadbytes.Length == 8) {