From 64adb3e3d7414f8c958a5a1962d87375ceeb52ca Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 5 Oct 2025 10:04:18 +0500 Subject: [PATCH] engine: rename MS_SCAN_REQUEST to A2M_SCAN_REQUEST --- engine/common/masterlist.c | 8 ++++---- engine/common/netchan.h | 2 -- engine/common/protocol.h | 6 ++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/common/masterlist.c b/engine/common/masterlist.c index e9fd51cc..d11fa803 100644 --- a/engine/common/masterlist.c +++ b/engine/common/masterlist.c @@ -46,10 +46,10 @@ static size_t NET_BuildMasterServerScanRequest( char *buf, size_t size, uint32_t char *info, temp[32]; // TODO: pagination and region - Q_strncpy( buf, MS_SCAN_REQUEST, size ); + Q_strncpy( buf, A2M_SCAN_REQUEST, size ); - info = buf + sizeof( MS_SCAN_REQUEST ) - 1; - remaining = size - sizeof( MS_SCAN_REQUEST ); + info = buf + sizeof( A2M_SCAN_REQUEST ) - 1; + remaining = size - sizeof( A2M_SCAN_REQUEST ); Q_strncpy( info, filter, remaining ); @@ -74,7 +74,7 @@ static size_t NET_BuildMasterServerScanRequest( char *buf, size_t size, uint32_t Info_SetValueForKey( info, "key", temp, remaining ); } - return sizeof( MS_SCAN_REQUEST ) + Q_strlen( info ); + return sizeof( A2M_SCAN_REQUEST ) + Q_strlen( info ); } /* diff --git a/engine/common/netchan.h b/engine/common/netchan.h index cf0325fc..2f7cd75e 100644 --- a/engine/common/netchan.h +++ b/engine/common/netchan.h @@ -69,8 +69,6 @@ GNU General Public License for more details. // bytes will be stripped by the networking channel layer #define NET_MAX_MESSAGE PAD_NUMBER(( NET_MAX_PAYLOAD + HEADER_BYTES ), 16 ) -#define MS_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0" - #define PORT_MASTER 27010 #define PORT_SERVER 27015 diff --git a/engine/common/protocol.h b/engine/common/protocol.h index 431119ee..17c2a379 100644 --- a/engine/common/protocol.h +++ b/engine/common/protocol.h @@ -317,7 +317,6 @@ extern const char *const svc_goldsrc_strings[svc_lastmsg+1]; | ENGINE_COMPUTE_STUDIO_LERP ) // Master Server protocol -#define MS_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0" // TODO: implement IP filter // GoldSrc protocol definitions #define PROTOCOL_GOLDSRC_VERSION 48 @@ -397,7 +396,10 @@ extern const char *const svc_goldsrc_strings[svc_lastmsg+1]; #define A2C_PRINT "print" #define A2C_GOLDSRC_PRINT 'l' -// from master to client +// from any to master +#define A2M_SCAN_REQUEST "1\xFF" "0.0.0.0:0\0" // TODO: implement IP filter + +// from master to any #define M2A_SERVERSLIST "f" #endif//NET_PROTOCOL_H