felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Added our default ip address, added ip as param to onMessage

Browse Source
This commit is contained in:
Patrick Hellebrand
2021-09-22 15:14:25 +02:00
committed by Felix Hartmann (PEA3-Fe-FI)
parent e6e5bee4ef
commit 05e3e9e0c4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PolyChat/Controller.cs
View File

@@ -28,12 +28,16 @@ namespace PolyChat
UIController = uiController; UIController = uiController;
OwnIP = getIP(); OwnIP = getIP();
Serve(); Serve();
//Connect("10.1.211.26"); // Marc
//Connect("10.1.218.90"); // Felix
//Connect("10.4.141.77"); // Pat
} }
public void Connect(string ip) public void Connect(string ip)
{ {
Debug.WriteLine("--- Controller.Connect ---"); 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() private void Serve()
@@ -55,7 +59,7 @@ namespace PolyChat
Debug.WriteLine("--- initial packet received ---"); Debug.WriteLine("--- initial packet received ---");
string ForeignIp = data.ToString(); string ForeignIp = data.ToString();
//Todo deserialize inital packet and extract ip address //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); UIController.OnIncomingConnection(ForeignIp);
}); });
}); });
@@ -70,13 +74,14 @@ namespace PolyChat
Connections[ip].SendMessage(json); Connections[ip].SendMessage(json);
} }
private void OnMessage(JToken[] data) private void OnMessage(string ip, JToken[] data)
{ {
Debug.WriteLine("--- Controller.OnMessage ---"); Debug.WriteLine("--- Controller.OnMessage ---");
if (data != null && data.Length > 0 && data[0] != null) if (data != null && data.Length > 0 && data[0] != null)
{ {
Debug.WriteLine("Message: " + data[0]); 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); else Debug.WriteLine("Undefined: " + data);
} }