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

Write

Browse Source
This commit is contained in:
fabjuuuh
2020-09-23 15:33:50 +02:00
parent d67c8448ad
commit 5db3f28deb
3 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Client/DataParser.cs
View File

@@ -9,7 +9,7 @@ using System.Text;
namespace Client namespace Client
{ {
class DataParser public class DataParser
{ {
public static byte[] GetLoginJson(string mUsername, string mPassword) public static byte[] GetLoginJson(string mUsername, string mPassword)
{ {

91
Server/Client.cs
View File

@@ -30,51 +30,50 @@ namespace Server
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null); stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
} }
//private void OnRead(IAsyncResult ar) /*private void OnRead(IAsyncResult ar)
//{ {
// try try
// { {
// int receivedBytes = stream.EndRead(ar); int receivedBytes = stream.EndRead(ar);
// } }
// catch (IOException) catch (IOException)
// { {
// communication.Disconnect(this); communication.Disconnect(this);
// return; return;
// } }
// int counter = 0; int counter = 0;
// while (buffer.Length > counter) while (buffer.Length > counter)
// { {
// //Console.WriteLine(buffer.Length); //Console.WriteLine(buffer.Length);
// byte[] lenghtBytes = new byte[4]; byte[] lenghtBytes = new byte[4];
// Array.Copy(buffer, counter, lenghtBytes, 0, 4); Array.Copy(buffer, counter, lenghtBytes, 0, 4);
// int length = BitConverter.ToInt32(lenghtBytes); int length = BitConverter.ToInt32(lenghtBytes);
// Console.WriteLine(buffer[5]); Console.WriteLine(buffer[5]);
// if (length == 0) if (length == 0)
// { {
// break; break;
// } }
// else if(buffer[counter+4]==0x02) else if (buffer[counter + 4] == 0x02)
// { {
}
else if (buffer[counter + 4] == 0x01)
{
byte[] packet = new byte[length];
Console.WriteLine(Encoding.ASCII.GetString(buffer) + " " + length);
Array.Copy(buffer, counter + 5, packet, 0, length);
Console.WriteLine(Encoding.ASCII.GetString(packet));
HandleData(Encoding.ASCII.GetString(packet));
}
// } counter += length;
// else if(buffer[counter+4]==0x01) }
// {
// byte[] packet = new byte[length];
// Console.WriteLine(Encoding.ASCII.GetString(buffer)+" "+length);
// Array.Copy(buffer, counter+5, packet, 0, length);
// Console.WriteLine(Encoding.ASCII.GetString(packet));
// HandleData(Encoding.ASCII.GetString(packet));
// }
// counter += length; Console.WriteLine("Done");
// }
// Console.WriteLine("Done"); stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
}*/
// stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
//}
private void OnRead(IAsyncResult ar) private void OnRead(IAsyncResult ar)
{ {
@@ -107,13 +106,13 @@ namespace Server
} }
else if (buffer[4] == 0x02) else if (buffer[4] == 0x02)
{ {
Console.WriteLine($"received raw data {BitConverter.ToString(buffer.Skip(5).ToArray(), 16)}"); Console.WriteLine($"received raw data {BitConverter.ToString(buffer.Skip(6).ToArray(), 16)}");
} }
else if (buffer[4] == 0x01) else if (buffer[4] == 0x01)
{ {
byte[] packet = new byte[expectedMessageLength]; byte[] packet = new byte[expectedMessageLength];
Console.WriteLine(Encoding.ASCII.GetString(buffer) + " " + expectedMessageLength); Console.WriteLine(Encoding.ASCII.GetString(buffer) + " " + expectedMessageLength);
Array.Copy(buffer, 5, packet, 0, expectedMessageLength - 5); Array.Copy(buffer, 6, packet, 0, expectedMessageLength - 6);
Console.WriteLine(Encoding.ASCII.GetString(packet)); Console.WriteLine(Encoding.ASCII.GetString(packet));
HandleData(Encoding.ASCII.GetString(packet)); HandleData(Encoding.ASCII.GetString(packet));
} }
@@ -124,7 +123,13 @@ namespace Server
private void HandleData(string packet) private void HandleData(string packet)
{ {
Console.WriteLine("Data " + packet); Console.WriteLine("Data " + packet);
JsonConvert.DeserializeObject(packet); dynamic json = JsonConvert.DeserializeObject(packet);
//json.
}
private void Write(string data)
{
} }
} }
} }

6
Server/Server.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -9,4 +9,8 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Client\Client.csproj" />
</ItemGroup>
</Project> </Project>