Changeset 9b5d30b in network-game for common

Timestamp:

Jul 14, 2013, 9:22:38 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

10f6fc2

Parents:

5a64bea

Message:

Moved server message sending/receiving into MessageProcessor

Location:

common

Files:

• Message.cpp (modified) (2 diffs)
• Message.h (modified) (1 diff)
• MessageProcessor.cpp (modified) (1 diff)
• MessageProcessor.h (modified) (2 diffs)

common/Message.cpp

@@ -15 +15 @@
 using namespace std;
 
+/*
 int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest)
 {
@@ -33 +34 @@
    return ret;
 }
+*/

common/Message.h

@@ -26 +26 @@
 } NETWORK_MSG;
 
-int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
+//int sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest);
 
-int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
+//int receiveMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *source);
 
 #endif

common/MessageProcessor.cpp

@@ -11 +11 @@
 
 int MessageProcessor::sendMessage(NETWORK_MSG *msg, int sock, struct sockaddr_in *dest) {
+   msg->id = ++lastUsedId;
    MessageContainer message(*msg, *dest);
-   message.id = ++lastUsedId;
-   sentMessages[message.id] = message;
+   sentMessages[msg->id] = message;
 
    int ret =  sendto(sock, (char*)msg, sizeof(NETWORK_MSG), 0, (struct sockaddr *)dest, sizeof(struct sockaddr_in));

common/MessageProcessor.h

@@ -59 +59 @@
 
       MessageContainer(const MessageContainer& mc) {
-         this->id = mc.id;
+         this->msg = mc.msg;
          this->clientAddr = mc.clientAddr;
-         this->msg = mc.msg;
-         this->ackReceived = mc.ackReceived;
       }
 
@@ -73 +71 @@
       }
 
-      int id;
+      NETWORK_MSG msg;
       struct sockaddr_in clientAddr;
-      NETWORK_MSG msg;
-      bool ackReceived;
    };