From 05e3e9e0c44b792d9aeaaf253788c87754852f79 Mon Sep 17 00:00:00 2001 From: Patrick Hellebrand Date: Wed, 22 Sep 2021 15:14:25 +0200 Subject: [PATCH] Added our default ip address, added ip as param to onMessage --- PolyChat/Controller.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PolyChat/Controller.cs b/PolyChat/Controller.cs index 6f432f3..24687ae 100644 --- a/PolyChat/Controller.cs +++ b/PolyChat/Controller.cs @@ -28,12 +28,16 @@ namespace PolyChat UIController = uiController; OwnIP = getIP(); Serve(); + + //Connect("10.1.211.26"); // Marc + //Connect("10.1.218.90"); // Felix + //Connect("10.4.141.77"); // Pat } public void Connect(string ip) { Debug.WriteLine("--- Controller.Connect ---"); - Connections.Add(ip, new Connection(ip, PORT, Data => OnMessage(Data))); + Connections.Add(ip, new Connection(ip, PORT, Data => OnMessage(ip, Data))); } private void Serve() @@ -55,7 +59,7 @@ namespace PolyChat Debug.WriteLine("--- initial packet received ---"); string ForeignIp = data.ToString(); //Todo deserialize inital packet and extract ip address - Connections.Add(ForeignIp, new Connection(socket, Data => OnMessage(Data))); + Connections.Add(ForeignIp, new Connection(socket, Data => OnMessage(ForeignIp, Data))); UIController.OnIncomingConnection(ForeignIp); }); }); @@ -70,13 +74,14 @@ namespace PolyChat Connections[ip].SendMessage(json); } - private void OnMessage(JToken[] data) + private void OnMessage(string ip, JToken[] data) { Debug.WriteLine("--- Controller.OnMessage ---"); if (data != null && data.Length > 0 && data[0] != null) { Debug.WriteLine("Message: " + data[0]); - Debug.WriteLine($"DATA: {data[0].ToString()}"); + Debug.WriteLine($"RAW: {data[0].ToString()}"); + UIController.OnIncomingMessage(ip, data[0].ToString()); } else Debug.WriteLine("Undefined: " + data); }