Changeset 68d94de in network-game for common

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

Location:

common

Files:

• MessageProcessor.cpp (modified) (5 diffs)
• MessageProcessor.h (modified) (2 diffs)

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();