sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
shinichi
2020-10-14 16:28:41 +02:00
parent dc2b2f06ae 30c5d5a2a3
commit 94be6fd22d
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Server/Client.cs
View File

@@ -115,6 +115,9 @@ namespace Server
Console.WriteLine($"set resistance worked is " + worked); Console.WriteLine($"set resistance worked is " + worked);
//set resistance on doctor GUI //set resistance on doctor GUI
break; break;
case DataParser.MESSAGE:
//TODO send message to clients
break;
default: default:
Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}"); Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
break; break;

9
Server/Communication.cs
View File

@@ -35,15 +35,6 @@ namespace Server
var tcpClient = listener.EndAcceptTcpClient(ar); var tcpClient = listener.EndAcceptTcpClient(ar);
Console.WriteLine($"Client connected from {tcpClient.Client.RemoteEndPoint}"); Console.WriteLine($"Client connected from {tcpClient.Client.RemoteEndPoint}");
clients.Add(new Client(this, tcpClient)); clients.Add(new Client(this, tcpClient));
/*if (doctor == null)
{
doctor = clients.ElementAt(0);
}
else
{
doctor.sendMessage(DataParser.getNewConnectionJson("jan"));
}*/
listener.BeginAcceptTcpClient(new AsyncCallback(OnConnect), null); listener.BeginAcceptTcpClient(new AsyncCallback(OnConnect), null);
} }