Changeset 68d94de in network-game

Timestamp:

Dec 24, 2013, 3:02:22 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

8554263

Parents:

e1af80c

Message:

MessageProcessor now takes a socket and optional output log file as constructor arguments instead of accepting them as parameters in each method

Files:

• client/Client/main.cpp (modified) (17 diffs)
• common/MessageProcessor.cpp (modified) (5 diffs)
• common/MessageProcessor.h (modified) (2 diffs)

client/Client/main.cpp

@@ -130 +130 @@
 
 MessageProcessor msgProcessor;
-ofstream outputLog;
 
 int main(int argc, char **argv)
@@ -141 +140 @@
    map<unsigned int, Projectile> mapProjectiles;
    unsigned int curPlayerId = -1;
+   ofstream outputLog;
+
    int scoreBlue, scoreRed;
 
@@ -341 +342 @@
    memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length);
    server.sin_port = htons(atoi(argv[2]));
+
+   msgProcessor = MessageProcessor(sock, &outputLog);
 
    al_start_timer(timer);
@@ -370 +373 @@
                   msgTo.type = MSG_TYPE_PICKUP_FLAG;
                   memcpy(msgTo.buffer, &curPlayerId, 4);
-                  msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+                  msgProcessor.sendMessage(&msgTo, &server);
                }
                break;
@@ -391 +394 @@
                         msgTo.type = MSG_TYPE_DROP_FLAG;
                         memcpy(msgTo.buffer, &curPlayerId, 4);
-                        msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+                        msgProcessor.sendMessage(&msgTo, &server);
                      }
                   }
@@ -414 +417 @@
                   memcpy(msgTo.buffer+8, &pos.y, 4);
 
-                  msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+                  msgProcessor.sendMessage(&msgTo, &server);
                }
                else
@@ -449 +452 @@
                      memcpy(msgTo.buffer+4, &target->id, 4);
 
-                     msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+                     msgProcessor.sendMessage(&msgTo, &server);
                   }
                }
@@ -456 +459 @@
       }
 
-      if (msgProcessor.receiveMessage(&msgFrom, sock, &from, &outputLog) >= 0)
+      if (msgProcessor.receiveMessage(&msgFrom, &from) >= 0)
          processMessage(msgFrom, state, chatConsole, gameMap, mapPlayers, mapProjectiles, curPlayerId, scoreBlue, scoreRed);
 
@@ -463 +466 @@
          redraw = false;
 
-         msgProcessor.resendUnackedMessages(sock, &outputLog);
-         //msgProcessor.cleanAckedMessages(&outputLog);
+         msgProcessor.resendUnackedMessages();
 
          if (debugging && wndCurrent == wndGame)
@@ -981 +983 @@
                strcpy(msgTo.buffer, gameName.c_str());
 
-               msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+               msgProcessor.sendMessage(&msgTo, &server);
 
                break;
@@ -1362 +1364 @@
    memcpy(msgTo.buffer+username.size()+password.size()+2, &playerClass, 4);
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1379 +1381 @@
    strcpy(msgTo.buffer+username.size()+1, strPassword.c_str());
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 
    state = STATE_LOBBY;
@@ -1404 +1406 @@
    strcpy(msgTo.buffer, username.c_str());
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1420 +1422 @@
    strcpy(msgTo.buffer, msg.c_str());
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1438 +1440 @@
    strcpy(msgTo.buffer, msg.c_str());
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1453 +1455 @@
    strcpy(msgTo.buffer, msg.c_str());
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 
@@ -1467 +1469 @@
    msgTo.type = MSG_TYPE_LEAVE_GAME;
 
-   msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+   msgProcessor.sendMessage(&msgTo, &server);
 }
 

common/MessageProcessor.cpp

@@ -13 +13 @@
 
 MessageProcessor::MessageProcessor() {
+   this->sock = 0;
+   this->outputLog = NULL;
+   lastUsedId = 0;
+}
+
+MessageProcessor::MessageProcessor(int sock, ofstream* outputLog) {
+   this->sock = sock;
+   this->outputLog = outputLog;
    lastUsedId = 0;
 }
@@ -19 +27 @@
 }
 
-int MessageProcessor::sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog) {
+int MessageProcessor::sendMessage(NETWORK_MSG *msg, struct sockaddr_in *dest) {
    cout << "Sending message of type " << msg->type << endl;
 
@@ -35 +43 @@
 }
 
-int MessageProcessor::receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source, ofstream* outputLog) {
+int MessageProcessor::receiveMessage(NETWORK_MSG *msg, struct sockaddr_in *source) {
    socklen_t socklen = sizeof(struct sockaddr_in);
 
@@ -84 +92 @@
 }
 
-void MessageProcessor::resendUnackedMessages(int sock, ofstream* outputLog) {
+void MessageProcessor::resendUnackedMessages() {
    map<unsigned int, map<unsigned long, MessageContainer> >::iterator it;
    map<unsigned long, MessageContainer>::iterator it2;
@@ -99 +107 @@
 }
 
-void MessageProcessor::cleanAckedMessages(ofstream* outputLog) {
+void MessageProcessor::cleanAckedMessages() {
    map<unsigned int, map<unsigned long, MessageContainer> >::iterator it = sentMessages.begin();
    map<unsigned long, MessageContainer>::iterator it2;

common/MessageProcessor.h

@@ -10 +10 @@
 class MessageProcessor {
 private:
+   int sock;
+   ofstream* outputLog;
    int lastUsedId;
 
@@ -18 +20 @@
    map<unsigned long, map<unsigned int, unsigned long long> > ackedMessages;
 
-   unsigned long pid;
+   //unsigned long pid;
 
 public:
    MessageProcessor();
+   MessageProcessor(int sock, ofstream* outputLog = NULL);
    ~MessageProcessor();
 
-   int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog = NULL);
-   int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest, ofstream* outputLog = NULL);
-   void resendUnackedMessages(int sock, ofstream* outputLog = NULL);
-   void cleanAckedMessages(ofstream* outputLog = NULL);
+   int sendMessage(NETWORK_MSG *msg, struct sockaddr_in *dest);
+   int receiveMessage(NETWORK_MSG *msg, struct sockaddr_in *source);
+   void resendUnackedMessages();
+   void cleanAckedMessages();
 
    map<unsigned int, map<unsigned long, MessageContainer> >& getSentMessages();