Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix some issues with ClientDisconnect #5625

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix some issues with ClientDisconnect #5625

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8159db7
fix
MilonPL Jan 21, 2025
09158e0
actually fix for real this time
MilonPL Jan 22, 2025
69e7ac5
just use HappyEyeballsHttp :godo:
MilonPL Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Robust.Client/BaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ public void ConnectToServer(DnsEndPoint endPoint)
/// <inheritdoc />
public void DisconnectFromServer(string reason)
{
DebugTools.Assert(RunLevel > ClientRunLevel.Initialize);
DebugTools.Assert(_net.IsConnected);
// run level changed in OnNetDisconnect()
// are both of these *really* needed?
_net.ClientDisconnect(reason);
}

Expand Down
15 changes: 11 additions & 4 deletions Robust.Shared/Network/NetManager.ClientConnect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,11 +320,18 @@ async Task<string> AwaitNonInitStatusChange(NetConnection connection, Cancellati
NetConnectionStatus status;
string reason;

do
try
{
reason = await AwaitStatusChange(connection, cancellationToken);
status = connection.Status;
} while (status == NetConnectionStatus.InitiatedConnect);
do
{
reason = await AwaitStatusChange(connection, cancellationToken);
status = connection.Status;
} while (status == NetConnectionStatus.InitiatedConnect);
}
catch (OperationCanceledException)
{
reason = "Connection attempt cancelled";
}

return reason;
}
Expand Down
8 changes: 8 additions & 0 deletions Robust.Shared/Network/NetManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,14 @@ public void ProcessPackets()
public void ClientDisconnect(string reason)
{
DebugTools.Assert(IsClient, "Should never be called on the server.");

// First handle any in-progress connection attempt
if (ClientConnectState != ClientConnectionState.NotConnecting)
{
_cancelConnectTokenSource?.Cancel();
}

// Then handle existing connection if any
if (ServerChannel != null)
{
Disconnect?.Invoke(this, new NetDisconnectedArgs(ServerChannel, reason));
Expand Down
Loading