Merge remote-tracking branch 'origin/develop' into opdrachten
This commit is contained in:
@@ -37,7 +37,7 @@ namespace RH_Engine
|
||||
|
||||
stream.Write(res);
|
||||
|
||||
Console.WriteLine("sent message " + message);
|
||||
//Console.WriteLine("sent message " + message);
|
||||
}
|
||||
|
||||
public static string ReadPrefMessage(NetworkStream stream)
|
||||
@@ -48,7 +48,7 @@ namespace RH_Engine
|
||||
|
||||
int length = BitConverter.ToInt32(lengthBytes);
|
||||
|
||||
Console.WriteLine("length is: " + length);
|
||||
//Console.WriteLine("length is: " + length);
|
||||
|
||||
byte[] buffer = new byte[length];
|
||||
int totalRead = 0;
|
||||
@@ -58,7 +58,7 @@ namespace RH_Engine
|
||||
{
|
||||
int read = stream.Read(buffer, totalRead, buffer.Length - totalRead);
|
||||
totalRead += read;
|
||||
Console.WriteLine("ReadMessage: " + read);
|
||||
//Console.WriteLine("ReadMessage: " + read);
|
||||
} while (totalRead < length);
|
||||
|
||||
return Encoding.UTF8.GetString(buffer, 0, totalRead);
|
||||
@@ -66,17 +66,28 @@ namespace RH_Engine
|
||||
|
||||
private static void CreateConnection(NetworkStream stream)
|
||||
{
|
||||
//WriteTextMessage(stream, "{\r\n\"id\" : \"session/list\"\r\n}");
|
||||
//string msg = ReadPrefMessage(stream);
|
||||
//Console.WriteLine(msg);
|
||||
//string id = JSONParser.GetSessionID(msg, PCs);
|
||||
|
||||
//Console.WriteLine(id);
|
||||
WriteTextMessage(stream, "{\r\n\"id\" : \"session/list\"\r\n}");
|
||||
string result = ReadPrefMessage(stream);
|
||||
Console.WriteLine(result);
|
||||
//JSONParser.Parse(result);
|
||||
string id = JSONParser.GetSessionID(ReadPrefMessage(stream), PCs);
|
||||
|
||||
string tunnelCreate = "{\"id\" : \"tunnel/create\", \"data\" : {\"session\" : \"" + id + "\"}}";
|
||||
|
||||
WriteTextMessage(stream, tunnelCreate);
|
||||
|
||||
string tunnelResponse = ReadPrefMessage(stream);
|
||||
|
||||
Console.WriteLine(tunnelResponse);
|
||||
|
||||
string tunnelID = JSONParser.GetTunnelID(tunnelResponse);
|
||||
Console.WriteLine("tunnelID is: " + tunnelID);
|
||||
|
||||
string sceneReset = "{\"id\" : \"tunnel/send\", \"data\" : {\"dest\" : \"" + tunnelID + "\",\"data\" :{\"id\" : \"scene/reset\",\"data\" : { }}}}}";
|
||||
//string sceneReset = "{\"id\" : \"scene/reset\"}";
|
||||
|
||||
WriteTextMessage(stream, sceneReset);
|
||||
|
||||
Console.WriteLine(ReadPrefMessage(stream));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -89,5 +100,10 @@ namespace RH_Engine
|
||||
}
|
||||
public string host { get; }
|
||||
public string user { get; }
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return "PC - host:" + host + " - user:" + user;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user