Added support for sending a ping by setting the flag (isPing) in the …

…MessageHeader
novusengine · Aug 4, 2024 · 7445998 · 7445998
1 parent 4aac0cb
commit 7445998
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/Source/Gameplay/Gameplay/Network/GameMessageRouter.cpp b/Source/Gameplay/Gameplay/Network/GameMessageRouter.cpp
@@ -18,10 +18,13 @@ namespace Network
             return false;
 
         GameOpcode opcode = static_cast<GameOpcode>(header.opcode);
+        if (header.flags.isPing)
+            opcode = GameOpcode::Shared_Ping;
+
         if (opcode == GameOpcode::Invalid || opcode >= GameOpcode::Count)
             return false;
 
-        const GameMessageHandler& opcodeHandler = _handlers[static_cast<u16>(header.opcode)];
+        const GameMessageHandler& opcodeHandler = _handlers[static_cast<u16>(opcode)];
         bool isSmallerThanMinSize = header.size < opcodeHandler.minSize;
         bool isLargerThanMaxSize = header.size > opcodeHandler.maxSize && opcodeHandler.maxSize != -1;
 

diff --git a/Source/Gameplay/Gameplay/Network/Opcode.h b/Source/Gameplay/Gameplay/Network/Opcode.h
@@ -10,8 +10,8 @@ namespace Network
         Client_Connect,
         Server_Connected,
 
-        Client_Ping,
-        Server_Pong,
+        Shared_Ping,
+        Server_UpdateStats,
 
         Client_SendCheatCommand,
         Server_SendCheatCommandResult,

diff --git a/Source/Network/Network/Define.h b/Source/Network/Network/Define.h
@@ -19,9 +19,16 @@ namespace Network
 
     struct MessageHeader
     {
+    public:
+        struct Flags
+        {
+            u8 isPing : 1;
+        };
+
     public:
         OpcodeType opcode = 0;
         u16 size = 0;
+        Flags flags = { 0 };
     };
 
     struct Message

diff --git a/Source/Network/Network/Server.cpp b/Source/Network/Network/Server.cpp
@@ -283,6 +283,17 @@ namespace Network
 
                         buffer->SkipRead(sizeof(MessageHeader));
 
+                        if (header->flags.isPing)
+                        {
+                            MessageHeader pongHeader;
+                            pongHeader.flags.isPing = 1;
+
+                            std::shared_ptr<Bytebuffer> pongBuffer = Bytebuffer::Borrow<PacketHeaderSize>();
+                            pongBuffer->Put(pongHeader);
+
+                            SendPacket(socketID, pongBuffer);
+                        }
+
                         std::shared_ptr<Bytebuffer> messageBuffer = Bytebuffer::Borrow<DEFAULT_BUFFER_SIZE>();
                         {
                             // Payload