oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Simplify TOSERVER_INIT and TOCLIENT_HELLO

Browse source 
- Network compression support was never added.
- Client hasn't used the returned playername since at least 0.4-stable.
This commit is contained in:
red-001 2024-09-02 20:50:43 +01:00 • committed by GitHub
parent 2bc9dc54ff
commit d5d8fb629b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 13 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/network/clientpackethandler.cpp
View file

@ -78,11 +78,11 @@ void Client::handleCommand_Hello(NetworkPacket* pkt)
u8 serialization_ver;
u16 proto_ver;
u16 compression_mode;
u16 unused_compression_mode;
u32 auth_mechs;
std::string username_legacy; // for case insensitivity
*pkt >> serialization_ver >> compression_mode >> proto_ver
>> auth_mechs >> username_legacy;
std::string unused;
*pkt >> serialization_ver >> unused_compression_mode >> proto_ver
>> auth_mechs >> unused;
// Chose an auth method we support
AuthMechanism chosen_auth_mechanism = choseAuthMech(auth_mechs);
@ -91,7 +91,6 @@ void Client::handleCommand_Hello(NetworkPacket* pkt)
<< "serialization_ver=" << (u32)serialization_ver
<< ", auth_mechs=" << auth_mechs
<< ", proto_ver=" << proto_ver
<< ", compression_mode=" << compression_mode
<< ". Doing auth with mech " << chosen_auth_mechanism << std::endl;
if (!ser_ver_supported(serialization_ver)) {
@ -103,10 +102,6 @@ void Client::handleCommand_Hello(NetworkPacket* pkt)
m_server_ser_ver = serialization_ver;
m_proto_ver = proto_ver;
//TODO verify that username_legacy matches sent username, only
// differs in casing (make both uppercase and compare)
// This is only necessary though when we actually want to add casing support
if (m_chosen_auth_mech != AUTH_MECHANISM_NONE) {
// we received a TOCLIENT_HELLO while auth was already going on
errorstream << "Client: TOCLIENT_HELLO while auth was already going on"