Merge branch 'develop' into dokter

This commit is contained in:
fabjuuuh
2020-10-09 10:56:48 +02:00
33 changed files with 1732 additions and 88 deletions

View File

@@ -1,11 +1,9 @@
using System;
using System.IO;
using System.Linq;
using System.Net.Sockets;
using System.Text;
using Client;
using Newtonsoft.Json;
using System.Security.Cryptography;
using ClientApp.Utils;
namespace Server
{
@@ -77,7 +75,7 @@ namespace Server
/// <summary>
/// TODO
/// handles all incoming data from the client
/// </summary>
/// <param name="message">including message length and messageId (can be changed)</param>
private void HandleData(byte[] message)
@@ -143,7 +141,9 @@ namespace Server
}
else if (DataParser.isRawData(message))
{
// print the raw data
Console.WriteLine(BitConverter.ToString(payloadbytes));
// TODO change, checking for length is not that safe
if (payloadbytes.Length == 8)
{
saveData?.WriteDataRAWBike(payloadbytes);
@@ -168,7 +168,6 @@ namespace Server
private bool verifyLogin(string username, string password)
{
Console.WriteLine("got hashes " + username + "\n" + password);
if (!File.Exists(fileName))
@@ -217,10 +216,6 @@ namespace Server
}
}
public static string ByteArrayToString(byte[] ba)
{
StringBuilder hex = new StringBuilder(ba.Length * 2);