Compare commits
No commits in common. "2d82d60f9e7b2a3b34db2447b03a843be00bade3" and "b7f44b52156cc3e908dc5beaad1aba4c161ecc97" have entirely different histories.
2d82d60f9e
...
b7f44b5215
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "com.incobyte.lobbyclient",
|
"name": "com.incobyte.lobbyclient",
|
||||||
"version": "1.0.3",
|
"version": "1.0.2",
|
||||||
"displayName": "Game Lobby Client",
|
"displayName": "Game Lobby Client",
|
||||||
"description": "Provides a client for the game lobvy server to list and join lobbies",
|
"description": "Provides a client for the game lobvy server to list and join lobbies",
|
||||||
"unity": "2022.3",
|
"unity": "2022.3",
|
||||||
|
|
|
||||||
|
|
@ -358,12 +358,12 @@ namespace Lobbies
|
||||||
var queryExternalPortAndIp = new QueryExternalPortAndIp() { LobbyClientId = connectionId };
|
var queryExternalPortAndIp = new QueryExternalPortAndIp() { LobbyClientId = connectionId };
|
||||||
var len = queryExternalPortAndIp.Serialize(messageData);
|
var len = queryExternalPortAndIp.Serialize(messageData);
|
||||||
var ip = GetIPsByName(host!, true, false).First();
|
var ip = GetIPsByName(host!, true, false).First();
|
||||||
var tries = 0;
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
sendUdpCallback(new IPEndPoint(ip, port), messageData, len);
|
sendUdpCallback(new IPEndPoint(ip, port), messageData, len);
|
||||||
}
|
}
|
||||||
while (!waitForExternalIp.WaitOne(100) && tries++ < 100);
|
while (!waitForExternalIp.WaitOne(100));
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -17,35 +17,14 @@ BufferRental bufferRental = new BufferRental(4096);
|
||||||
|
|
||||||
udpServer.QueryIpAndPort += (clientId, ip, port) =>
|
udpServer.QueryIpAndPort += (clientId, ip, port) =>
|
||||||
{
|
{
|
||||||
Console.WriteLine($"{DateTime.Now}: [TcpServer] sending QueryExternalPortAndIp result for lobby client id {clientId} with {ip}:{port}");
|
var messageData = bufferRental.Rent();
|
||||||
byte[]? messageData = null;
|
var seenExternalIpAndPort = new SeenExternalIpAndPort() { Ip = ip, Port = port };
|
||||||
|
var messageDataLength = seenExternalIpAndPort.Serialize(messageData);
|
||||||
try
|
_ = Task.Run(async () =>
|
||||||
{
|
{
|
||||||
messageData = bufferRental.Rent();
|
await tcpServer.Send(clientId, messageData, 0, messageDataLength);
|
||||||
var seenExternalIpAndPort = new SeenExternalIpAndPort() { Ip = ip, Port = port };
|
bufferRental.Return(messageData);
|
||||||
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) =>
|
tcpServer.DataReceived += (clientId, dataLength, data) =>
|
||||||
|
|
|
||||||
|
|
@ -36,19 +36,13 @@ namespace LobbyServer
|
||||||
var receiveResult = await serverSocket.ReceiveAsync(cancellationTokenSource.Token);
|
var receiveResult = await serverSocket.ReceiveAsync(cancellationTokenSource.Token);
|
||||||
if(receiveResult.Buffer.Length > 0)
|
if(receiveResult.Buffer.Length > 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"{DateTime.Now}: [UdpCandidateServer] received packet");
|
|
||||||
Memory<byte> receivedData = new Memory<byte>(receiveResult.Buffer);
|
Memory<byte> receivedData = new Memory<byte>(receiveResult.Buffer);
|
||||||
var identifier = LobbyMessageIdentifier.ReadLobbyMessageIdentifier(receivedData.Span);
|
switch (LobbyMessageIdentifier.ReadLobbyMessageIdentifier(receivedData.Span))
|
||||||
switch (identifier)
|
|
||||||
{
|
{
|
||||||
case QueryExternalPortAndIp.TypeId:
|
case QueryExternalPortAndIp.TypeId:
|
||||||
var queryExternalPortAndIp = QueryExternalPortAndIp.Deserialize(receivedData.Span);
|
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);
|
QueryIpAndPort?.Invoke(queryExternalPortAndIp.LobbyClientId, receiveResult.RemoteEndPoint.Address.ToString(), receiveResult.RemoteEndPoint.Port);
|
||||||
break;
|
break;
|
||||||
default:
|
|
||||||
Console.WriteLine($"{DateTime.Now}: [UdpCandidateServer] received unkown identifier {identifier}");
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue