public
/
LobbyServer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: public:2d82d60f9e7b2a3b34db2447b03a843be00bade3
Branches Tags
public:main
..
compare: public:b7f44b52156cc3e908dc5beaad1aba4c161ecc97
Branches Tags
public:main

No commits in common. "2d82d60f9e7b2a3b34db2447b03a843be00bade3" and "b7f44b52156cc3e908dc5beaad1aba4c161ecc97" have entirely different histories.
2d82d60f9e ... b7f44b5215

4 changed files with 13 additions and 40 deletions
Show Stats Expand all files Collapse all files

2
Assets/NetworkLobbyClient/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.incobyte.lobbyclient",
"version": "1.0.3",
"version": "1.0.2",
"displayName": "Game Lobby Client",
"description": "Provides a client for the game lobvy server to list and join lobbies",
"unity": "2022.3",

4
LobbyClient/LobbyClient.cs
View File

@ -358,12 +358,12 @@ namespace Lobbies
var queryExternalPortAndIp = new QueryExternalPortAndIp() { LobbyClientId = connectionId };
var len = queryExternalPortAndIp.Serialize(messageData);
var ip = GetIPsByName(host!, true, false).First();
var tries = 0;
do
{
sendUdpCallback(new IPEndPoint(ip, port), messageData, len);
}
while (!waitForExternalIp.WaitOne(100) && tries++ < 100);
while (!waitForExternalIp.WaitOne(100));
}
catch
{

23
LobbyServer/Program.cs
View File

@ -17,35 +17,14 @@ BufferRental bufferRental = new BufferRental(4096);
udpServer.QueryIpAndPort += (clientId, ip, port) =>
{
Console.WriteLine($"{DateTime.Now}: [TcpServer] sending QueryExternalPortAndIp result for lobby client id {clientId} with {ip}:{port}");
byte[]? messageData = null;
try
{
messageData = bufferRental.Rent();
var messageData = bufferRental.Rent();
var seenExternalIpAndPort = new SeenExternalIpAndPort() { Ip = ip, Port = port };
var messageDataLength = seenExternalIpAndPort.Serialize(messageData);
_ = Task.Run(async () =>
{
try
{
await tcpServer.Send(clientId, messageData, 0, messageDataLength);
}
catch(Exception ex)
{
Console.WriteLine($"{DateTime.Now}: [TcpServer] error in QueryExternalPortAndIp result for lobby client id {clientId} with {ip}:{port}: {ex.ToString()}");
}
bufferRental.Return(messageData);
messageData = null;
});
}
catch (Exception ex)
{
Console.WriteLine($"{DateTime.Now}: [TcpServer] error in QueryExternalPortAndIp result for lobby client id {clientId} with {ip}:{port}: {ex.ToString()}");
if (messageData != null)
bufferRental.Return(messageData);
}
};
tcpServer.DataReceived += (clientId, dataLength, data) =>

8
LobbyServer/UdpCandidateServer.cs
View File

@ -36,19 +36,13 @@ namespace LobbyServer
var receiveResult = await serverSocket.ReceiveAsync(cancellationTokenSource.Token);
if(receiveResult.Buffer.Length > 0)
{
Console.WriteLine($"{DateTime.Now}: [UdpCandidateServer] received packet");
Memory<byte> receivedData = new Memory<byte>(receiveResult.Buffer);
var identifier = LobbyMessageIdentifier.ReadLobbyMessageIdentifier(receivedData.Span);
switch (identifier)
switch (LobbyMessageIdentifier.ReadLobbyMessageIdentifier(receivedData.Span))
{
case QueryExternalPortAndIp.TypeId:
var queryExternalPortAndIp = QueryExternalPortAndIp.Deserialize(receivedData.Span);
Console.WriteLine($"{DateTime.Now}: [UdpCandidateServer] received QueryExternalPortAndIp for lobby client id {queryExternalPortAndIp.LobbyClientId} from {receiveResult.RemoteEndPoint.Address.ToString()}:{receiveResult.RemoteEndPoint.Port}");
QueryIpAndPort?.Invoke(queryExternalPortAndIp.LobbyClientId, receiveResult.RemoteEndPoint.Address.ToString(), receiveResult.RemoteEndPoint.Port);
break;
default:
Console.WriteLine($"{DateTime.Now}: [UdpCandidateServer] received unkown identifier {identifier}");
break;
}
}
}