Changeset 198cf2d in network-game

Timestamp:

Jul 15, 2013, 12:14:43 AM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

3de664d

Parents:

10f6fc2

Message:

MessageProcessor handles receiving multiple ACKs for the same message

Files:

• common/MessageProcessor.cpp (modified) (3 diffs)
• common/MessageProcessor.h (modified) (1 diff)
• server/server.cpp (modified) (2 diffs)

common/MessageProcessor.cpp

@@ -2 +2 @@
 
 #include <iostream>
+
+#include "Common.h"
 
 MessageProcessor::MessageProcessor() {
@@ -30 +32 @@
    // add id to the NETWORK_MSG struct
    if (msg->type == MSG_TYPE_ACK) {
-      sentMessages.erase(msg->id);
+      if (!sentMessages[msg->id].isAcked) {
+         sentMessages[msg->id].isAcked = true;
+         sentMessages[msg->id].timeAcked = getCurrentMillis();
+      }
+
+      return -1; // don't do any further processing
    }else {
       NETWORK_MSG ack;
@@ -50 +57 @@
 
 void MessageProcessor::cleanAckedMessages() {
-   // shouldn't be needed since I can just remove messages when I get their ACKs
+   map<int, MessageContainer>::iterator it;
+
+   for(it = sentMessages.begin(); it != sentMessages.end(); it++) {
+      if (it->second.isAcked && (getCurrentMillis() - it->second.timeAcked) > 1000)
+         sentMessages.erase(it);
+   }
 }

common/MessageProcessor.h

@@ -73 +73 @@
       NETWORK_MSG msg;
       struct sockaddr_in clientAddr;
+      bool isAcked;
+      unsigned long long timeAcked;
    };
 

server/server.cpp

@@ -149 +149 @@
          timeLastUpdated = curTime;
 
+         msgProcessor.cleanAckedMessages();
          msgProcessor.resendUnackedMessages(sock);
 
@@ -487 +488 @@
 
       if (n >= 0) {
-         broadcastResponse = processMessage(clientMsg, from, mapPlayers, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed);
+         broadcastResponse = processMessage(clientMsg, from, msgProcessor, mapPlayers, gameMap, unusedPlayerId, serverMsg, sock, scoreBlue, scoreRed);
 
          if (broadcastResponse)