diff --git a/code/server/Server.sln b/code/server/Server.sln index d97c22f..17bf734 100644 --- a/code/server/Server.sln +++ b/code/server/Server.sln @@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{12A97D16-3 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientConsole", "ClientConsole\ClientConsole.csproj", "{33F7C629-F92B-459C-BCC5-6A4601D6D9EA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{CA1465F2-A006-4AF6-8231-59DB00963BD0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,6 +49,10 @@ Global {33F7C629-F92B-459C-BCC5-6A4601D6D9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {33F7C629-F92B-459C-BCC5-6A4601D6D9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {33F7C629-F92B-459C-BCC5-6A4601D6D9EA}.Release|Any CPU.Build.0 = Release|Any CPU + {CA1465F2-A006-4AF6-8231-59DB00963BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CA1465F2-A006-4AF6-8231-59DB00963BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA1465F2-A006-4AF6-8231-59DB00963BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CA1465F2-A006-4AF6-8231-59DB00963BD0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/code/server/Server/Program.cs b/code/server/Server/Program.cs index ccd8ca2..91fe13e 100644 --- a/code/server/Server/Program.cs +++ b/code/server/Server/Program.cs @@ -4,6 +4,9 @@ using System.Net; using System.Net.Sockets; using System.Text; using System.Threading; +using DataBase.Entity; +using Shared.DTO; +using System.Text.Json; class Program { @@ -26,9 +29,11 @@ class Program { IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Any, 0); byte[] receivedData = serverSocket.Receive(ref remoteEndPoint); - string message = Encoding.ASCII.GetString(receivedData); + string fileJson = Encoding.UTF8.GetString(receivedData); + ObjectTransfert data = JsonSerializer.Deserialize>(fileJson); - if (message == "Connect") + + if (data.Informations.Action == Shared.DTO.Action.Connect) { Console.WriteLine("New connection from " + remoteEndPoint.ToString()); diff --git a/code/server/Server/Room.cs b/code/server/Server/Room.cs new file mode 100644 index 0000000..b5b2a60 --- /dev/null +++ b/code/server/Server/Room.cs @@ -0,0 +1,15 @@ +using DataBase.Entity; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Server +{ + public class Room + { + public ICollection MaxPlayers { get; set; } + public int Port { get; set; } + } +} diff --git a/code/server/Server/Server.csproj b/code/server/Server/Server.csproj index 40c60dd..059c005 100644 --- a/code/server/Server/Server.csproj +++ b/code/server/Server/Server.csproj @@ -7,4 +7,9 @@ enable + + + + + diff --git a/code/server/Shared/DTO/Action.cs b/code/server/Shared/DTO/Action.cs new file mode 100644 index 0000000..6e208e9 --- /dev/null +++ b/code/server/Shared/DTO/Action.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTO +{ + public enum Action + { + Start, + Connect, + End + } +} diff --git a/code/server/Shared/DTO/Informations.cs b/code/server/Shared/DTO/Informations.cs new file mode 100644 index 0000000..1b44596 --- /dev/null +++ b/code/server/Shared/DTO/Informations.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTO +{ + public class Informations + { + public Action Action { get; set; } + } +} diff --git a/code/server/Shared/DTO/ObjectTransfert.cs b/code/server/Shared/DTO/ObjectTransfert.cs new file mode 100644 index 0000000..5acfca2 --- /dev/null +++ b/code/server/Shared/DTO/ObjectTransfert.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Shared.DTO +{ + public class ObjectTransfert + { + public Informations Informations { get; set; } + public T Data { get; set; } + } +} diff --git a/code/server/Shared/Shared.csproj b/code/server/Shared/Shared.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/code/server/Shared/Shared.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + +