TEMPORARY(TESTING): add static_assert tests and debug functions for packet size verification

Author: bobtista

GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h

@@ -105,6 +105,11 @@ class NetPacket : public MemoryPoolObject
 	static UnsignedInt GetDisconnectScreenOffCommandSize(NetCommandMsg *msg);
 	static UnsignedInt GetFrameResendRequestCommandSize(NetCommandMsg *msg);
 
+#ifdef _DEBUG
+	// Testing function - remove before merging to main
+	static void TestPacketSizes();
+#endif
+
 	static void FillBufferWithGameCommand(UnsignedByte *buffer, NetCommandRef *msg);
 	static void FillBufferWithAckCommand(UnsignedByte *buffer, NetCommandRef *msg);
 	static void FillBufferWithFrameCommand(UnsignedByte *buffer, NetCommandRef *msg);

GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacketStructs.h

@@ -397,3 +397,85 @@ struct NetPacketFrameResendRequestCommand {
 // Restore normal struct packing
 #pragma pack(pop)
 
+////////////////////////////////////////////////////////////////////////////////
+// Static Assert Tests - Verify struct sizes match original manual calculations
+// These tests ensure the refactor maintains exact compatibility
+////////////////////////////////////////////////////////////////////////////////
+
+// Test function for Frame Resend Request Command
+constexpr UnsignedInt GetFrameResendRequestCommandSize()
+{
+	UnsignedInt msglen = 0;
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::CommandType and command type
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::PlayerId and player ID
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::Relay and relay
+
+	++msglen; // NetPacketFieldTypes::Data
+	msglen += sizeof(UnsignedInt); // frame to resend
+
+	return msglen;
+}
+
+// Test function for ACK Command
+constexpr UnsignedInt GetAckCommandSize()
+{
+	UnsignedInt msglen = 0;
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::CommandType and command type
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::PlayerId and player ID
+	++msglen; // NetPacketFieldTypes::Data
+	msglen += sizeof(UnsignedShort); // command ID being acknowledged
+	msglen += sizeof(UnsignedByte);  // original player ID
+
+	return msglen;
+}
+
+// Test function for Frame Command
+constexpr UnsignedInt GetFrameCommandSize()
+{
+	UnsignedInt msglen = 0;
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::CommandType and command type
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::Relay and relay
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedInt);	// NetPacketFieldTypes::Frame and frame
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::PlayerId and player ID
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID
+	++msglen; // NetPacketFieldTypes::Data
+	msglen += sizeof(UnsignedShort); // command count
+
+	return msglen;
+}
+
+// Test function for Player Leave Command
+constexpr UnsignedInt GetPlayerLeaveCommandSize()
+{
+	UnsignedInt msglen = 0;
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::CommandType and command type
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::Relay and relay
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedInt);	// NetPacketFieldTypes::Frame and frame
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::PlayerId and player ID
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedShort); // NetPacketFieldTypes::CommandId and command ID
+	++msglen; // NetPacketFieldTypes::Data
+	msglen += sizeof(UnsignedByte); // leaving player ID
+
+	return msglen;
+}
+
+// Test function for Keep Alive Command
+constexpr UnsignedInt GetKeepAliveCommandSize()
+{
+	UnsignedInt msglen = 0;
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::CommandType and command type
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::Relay and relay
+	msglen += sizeof(UnsignedByte) + sizeof(UnsignedByte);	// NetPacketFieldTypes::PlayerId and player ID
+	++msglen; // NetPacketFieldTypes::Data
+
+	return msglen;
+}
+
+// Static assertions to verify sizes match
+static_assert(GetFrameResendRequestCommandSize() == sizeof(NetPacketFrameResendRequestCommand), "FrameResendRequestCommand size mismatch");
+static_assert(GetAckCommandSize() == sizeof(NetPacketAckCommand), "AckCommand size mismatch");
+static_assert(GetFrameCommandSize() == sizeof(NetPacketFrameCommand), "FrameCommand size mismatch");
+static_assert(GetPlayerLeaveCommandSize() == sizeof(NetPacketPlayerLeaveCommand), "PlayerLeaveCommand size mismatch");
+static_assert(GetKeepAliveCommandSize() == sizeof(NetPacketKeepAliveCommand), "KeepAliveCommand size mismatch");
+

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetPacket.cpp

@@ -509,6 +509,30 @@ UnsignedInt NetPacket::GetFrameResendRequestCommandSize(NetCommandMsg *msg) {
 	return sizeof(NetPacketFrameResendRequestCommand);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// TESTING FUNCTIONS - Remove these before merging to main
+// These functions help verify packet serialization works correctly
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef _DEBUG
+// Test function to verify packet struct sizes match expectations
+void NetPacket::TestPacketSizes() {
+	// This function will be called during debug builds to verify sizes
+	// Set a breakpoint here to inspect the values
+	
+	UnsignedInt frameResendSize = sizeof(NetPacketFrameResendRequestCommand);
+	UnsignedInt ackSize = sizeof(NetPacketAckCommand);
+	UnsignedInt frameSize = sizeof(NetPacketFrameCommand);
+	UnsignedInt playerLeaveSize = sizeof(NetPacketPlayerLeaveCommand);
+	UnsignedInt keepAliveSize = sizeof(NetPacketKeepAliveCommand);
+	
+	// These should match the original manual calculations
+	// Set breakpoints here to verify the values are correct
+	DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("TestPacketSizes: FrameResend=%d, Ack=%d, Frame=%d, PlayerLeave=%d, KeepAlive=%d", 
+		frameResendSize, ackSize, frameSize, playerLeaveSize, keepAliveSize));
+}
+#endif
+
 // this function assumes that buffer is already the correct size.
 void NetPacket::FillBufferWithCommand(UnsignedByte *buffer, NetCommandRef *ref) {
 	NetCommandMsg *msg = ref->getCommand();