nizar/server-master
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Login flow tuning: packet format, diagnostics, and compose defaults

Browse source
This commit is contained in:
nizar 2026-02-24 08:56:04 +01:00
parent f439be2386
commit 7f4473e52d
5 changed files with 39 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker-compose.yml
View file

@ -118,7 +118,11 @@ services:
environment: environment:
SERVER_PORT: 4000 SERVER_PORT: 4000
DEV_LOGIN_BYPASS: "true" DEV_LOGIN_BYPASS: "true"
LOGIN_PACKET_TRACE: "true" LOGIN_PACKET_TRACE: "false"
LOGIN_CHANNEL_OLD_FORMAT: "true"
LOGIN_CHANNEL_MINIMAL: "false"
LOGIN_CHANNEL_SEND_BOTH: "false"
LOGIN_PLAINTEXT_SEND: "false"
MASTER_IP: master MASTER_IP: master
MASTER_PORT: 20500 MASTER_PORT: 20500
DB_SERVER_IP: database DB_SERVER_IP: database

9
srcs/LoginServer/Handlers/LoginPacketsExtensions.cs
View file

@ -2,7 +2,9 @@
// //
// Developed by NosWings Team // Developed by NosWings Team
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using LoginServer.Network; using LoginServer.Network;
using PhoenixLib.Logging; using PhoenixLib.Logging;
@ -22,12 +24,9 @@ namespace LoginServer.Handlers
string lastGroup = string.Empty; string lastGroup = string.Empty;
int worldGroupCount = 0; int worldGroupCount = 0;
var packetBuilder = new StringBuilder(); var packetBuilder = new StringBuilder();
packetBuilder.AppendFormat($"NsTeST {(byte)region} {sessionId} 2 ");
packetBuilder.Append( string serverlist = string.Join(" ", Enumerable.Range(0, 60).Select(_ => "-99 0"));
isOldLogin packetBuilder.AppendFormat($"NsTeST {(byte)region} {sessionId} {serverlist} {encryptionKey} ");
? $"-99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 {encryptionKey} "
: $"-99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 -99 0 {encryptionKey} ");
foreach (SerializableGameServer world in worldServers) foreach (SerializableGameServer world in worldServers)
{ {

12
srcs/LoginServer/Handlers/TypedCredentialsLogin0577PacketHandler.cs
View file

@ -149,8 +149,7 @@ namespace LoginServer.Handlers
break; break;
default: default:
// Temporary: do not block logins by maintenance flag while local setup is being validated. if (_maintenanceManager.IsMaintenanceActive && loadedAccount.Authority < AuthorityType.GameMaster)
if (false && _maintenanceManager.IsMaintenanceActive && loadedAccount.Authority < AuthorityType.GameMaster)
{ {
session.SendPacket(session.GenerateFailcPacket(LoginFailType.Maintenance)); session.SendPacket(session.GenerateFailcPacket(LoginFailType.Maintenance));
return; return;
@ -187,7 +186,14 @@ namespace LoginServer.Handlers
return; return;
} }
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, true); bool oldFormat = !string.Equals(Environment.GetEnvironmentVariable("LOGIN_CHANNEL_OLD_FORMAT"), "false", StringComparison.OrdinalIgnoreCase);
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, oldFormat);
bool sendBoth = string.Equals(Environment.GetEnvironmentVariable("LOGIN_CHANNEL_SEND_BOTH"), "true", StringComparison.OrdinalIgnoreCase);
if (sendBoth)
{
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, !oldFormat);
}
session.Disconnect(); session.Disconnect();
break; break;
} }

12
srcs/LoginServer/Handlers/TypedCredentialsLoginPacketHandler.cs
View file

@ -140,8 +140,7 @@ namespace LoginServer.Handlers
break; break;
default: default:
// Temporary: do not block logins by maintenance flag while local setup is being validated. if (_maintenanceManager.IsMaintenanceActive && loadedAccount.Authority < AuthorityType.GameMaster)
if (false && _maintenanceManager.IsMaintenanceActive && loadedAccount.Authority < AuthorityType.GameMaster)
{ {
session.SendPacket(session.GenerateFailcPacket(LoginFailType.Maintenance)); session.SendPacket(session.GenerateFailcPacket(LoginFailType.Maintenance));
return; return;
@ -178,7 +177,14 @@ namespace LoginServer.Handlers
return; return;
} }
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, true); bool oldFormat = !string.Equals(Environment.GetEnvironmentVariable("LOGIN_CHANNEL_OLD_FORMAT"), "false", StringComparison.OrdinalIgnoreCase);
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, oldFormat);
bool sendBoth = string.Equals(Environment.GetEnvironmentVariable("LOGIN_CHANNEL_SEND_BOTH"), "true", StringComparison.OrdinalIgnoreCase);
if (sendBoth)
{
session.SendChannelPacketList(connectedSession.EncryptionKey, loadedAccount.Name, RegionLanguageType.EN, worldServersResponse.WorldServers, !oldFormat);
}
session.Disconnect(); session.Disconnect();
break; break;
} }

13
srcs/LoginServer/Network/LoginClientSession.cs
View file

@ -28,7 +28,18 @@ namespace LoginServer.Network
public string IpAddress { get; private set; } public string IpAddress { get; private set; }
public void SendPacket(string packet) => Send(NostaleLoginEncrypter.Encode(packet, Encoding.Default).ToArray()); public void SendPacket(string packet)
{
bool plainSend = string.Equals(Environment.GetEnvironmentVariable("LOGIN_PLAINTEXT_SEND"), "true", StringComparison.OrdinalIgnoreCase);
if (plainSend)
{
// Debug compatibility mode: send plain text packet with LF terminator.
Send(Encoding.Default.GetBytes(packet + "\n"));
return;
}
Send(NostaleLoginEncrypter.Encode(packet, Encoding.Default).ToArray());
}
protected override void OnConnected() protected override void OnConnected()
{ {