From 500ca545507709d0c6fba81a0b5ca87918ef291c Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Wed, 18 Jan 2023 19:21:51 +0300
Subject: [PATCH] Revert "engine: get rid of MSG_BigShort, use htons instead,
 since network headers are always included"

This reverts commit a6475f530baac26456f5be7143661586d521b04a.
---
 engine/client/cl_game.c    | 2 +-
 engine/client/cl_main.c    | 8 ++++----
 engine/common/net_buffer.c | 5 +++++
 engine/common/net_buffer.h | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/engine/client/cl_game.c b/engine/client/cl_game.c
index 18080e72..0a85cf21 100644
--- a/engine/client/cl_game.c
+++ b/engine/client/cl_game.c
@@ -3377,7 +3377,7 @@ void GAME_EXPORT NetAPI_SendRequest( int context, int request, int flags, double
 
 		// make sure that port is specified
 		if( !nr->resp.remote_address.port )
-			nr->resp.remote_address.port = htons( PORT_MASTER );
+			nr->resp.remote_address.port = MSG_BigShort( PORT_MASTER );
 
 		// grab the list from the master server
 		Q_strcpy( &fullquery[22], GI->gamefolder );
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 1ffce5ef..710988cf 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -1006,7 +1006,7 @@ void CL_SendConnectPacket( void )
 		return;
 	}
 
-	if( adr.port == 0 ) adr.port = htons( PORT_SERVER );
+	if( adr.port == 0 ) adr.port = MSG_BigShort( PORT_SERVER );
 	qport = Cvar_VariableString( "net_qport" );
 	key = ID_GetMD5();
 
@@ -1134,7 +1134,7 @@ void CL_CheckForResend( void )
 		return;
 	}
 
-	if( adr.port == 0 ) adr.port = htons( PORT_SERVER );
+	if( adr.port == 0 ) adr.port = MSG_BigShort( PORT_SERVER );
 
 	if( cls.connect_retry == CL_TEST_RETRIES_NORESPONCE )
 	{
@@ -1321,7 +1321,7 @@ void CL_Rcon_f( void )
 		}
 
 		NET_StringToAdr( rcon_address->string, &to );
-		if( to.port == 0 ) to.port = htons( PORT_SERVER );
+		if( to.port == 0 ) to.port = MSG_BigShort( PORT_SERVER );
 	}
 
 	NET_SendPacket( NS_CLIENT, Q_strlen( message ) + 1, message, to );
@@ -1563,7 +1563,7 @@ void CL_LocalServers_f( void )
 
 	// send a broadcast packet
 	adr.type = NA_BROADCAST;
-	adr.port = htons( PORT_SERVER );
+	adr.port = MSG_BigShort( PORT_SERVER );
 	Netchan_OutOfBandPrint( NS_CLIENT, adr, "info %i", PROTOCOL_VERSION );
 
 	adr.type = NA_MULTICAST_IP6;
diff --git a/engine/common/net_buffer.c b/engine/common/net_buffer.c
index 567047f2..34483ab9 100644
--- a/engine/common/net_buffer.c
+++ b/engine/common/net_buffer.c
@@ -89,6 +89,11 @@ const char *svc_strings[svc_lastmsg+1] =
 	"svc_exec",
 };
 
+unsigned short MSG_BigShort( unsigned short swap )
+{
+	return (swap >> 8)|(swap << 8);
+}
+
 void MSG_InitMasks( void )
 {
 	uint	startbit, endbit;
diff --git a/engine/common/net_buffer.h b/engine/common/net_buffer.h
index b76c3011..50cb7361 100644
--- a/engine/common/net_buffer.h
+++ b/engine/common/net_buffer.h
@@ -63,6 +63,7 @@ void MSG_ExciseBits( sizebuf_t *sb, int startbit, int bitstoremove );
 _inline int MSG_TellBit( sizebuf_t *sb ) { return sb->iCurBit; }
 _inline const char *MSG_GetName( sizebuf_t *sb ) { return sb->pDebugName; }
 qboolean MSG_CheckOverflow( sizebuf_t *sb );
+unsigned short MSG_BigShort( unsigned short swap );
 
 // init writing
 void MSG_StartWriting( sizebuf_t *sb, void *pData, int nBytes, int iStartBit, int nBits );