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 newDoctor

Browse Source
This commit is contained in:
fabjuuuh
2020-10-16 15:04:16 +02:00
parent 173dbf2745 fd9b321292
commit 0427fa89aa
7 changed files with 55 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Server/Client.cs
View File

@@ -5,6 +5,7 @@ using System.Text;
using Newtonsoft.Json;
using System.Diagnostics;
using Util;
using System.Linq;
namespace Server
{
@@ -96,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:
@@ -135,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)
{
@@ -167,7 +169,6 @@ namespace Server
this.username = username;
sendMessage(DataParser.getLoginResponse("OK"));
//sendMessage(DataParser.getStartSessionJson());
communication.NewLogin(this);
return true;
}
else
@@ -184,6 +185,7 @@ namespace Server
public void sendMessage(byte[] message)
{
Debug.WriteLine("serverclient " + Encoding.ASCII.GetString(message.Skip(5).ToArray()));
stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
}