Changeset 1233

Timestamp:

May 5, 2008, 11:14:45 AM (16 years ago)

Author:

scheusso

Message:

took out some mallocs and replaced them with new

Location:

code/branches/network3/src/network

Files:

• Client.cc (modified) (1 diff)
• ConnectionManager.cc (modified) (1 diff)
• GameStateManager.cc (modified) (1 diff)
• PacketDecoder.cc (modified) (2 diffs)

code/branches/network3/src/network/Client.cc

@@ -116 +116 @@
     Synchronisable::setClient(true);
     isConnected=client_connection.createConnection();
-    /*if(isConnected){
-      COUT(2) << "sending connectrequest" << std::endl;
+    if(isConnected){
+      COUT(4) << "sending connectrequest" << std::endl;
       client_connection.addPacket(pck_gen.generateConnectRequest());
       client_connection.sendPackets();
     }else
-      COUT(2) << "could not create connection" << std::endl;*/
+      COUT(1) << "could not create connection" << std::endl;
     return isConnected;
   }

code/branches/network3/src/network/ConnectionManager.cc

@@ -184 +184 @@
           addClient(&event);
           //this is a workaround to ensure thread safety
-          if(!addFakeConnectRequest(&event))
-            COUT(3) << "Problem pushing fakeconnectRequest to queue" << std::endl;
+          /*if(!addFakeConnectRequest(&event))
+            COUT(3) << "Problem pushing fakeconnectRequest to queue" << std::endl;*/
           COUT(5) << "Con.Man: connection event has occured" << std::endl;
           break;

code/branches/network3/src/network/GameStateManager.cc

@@ -101 +101 @@
     //Server::sendGameState?
     int gID = head_->findClient(clientID)->getGamestateID();
-    COUT(4) << "G.St.Man: popgamestate: sending gstate_id: " << id_ << " diffed from: " << gID << " (not diffed yet)" << std::endl;
+    COUT(4) << "G.St.Man: popgamestate: sending gstate_id: " << id_ << " diffed from: " << gID << std::endl;
 //     COUT(3) << "gamestatemap: " << &gameStateMap << std::endl;
     //chose wheather the next gamestate is the first or not

code/branches/network3/src/network/PacketDecoder.cc

@@ -181 +181 @@
     if(currentState->compsize==0)
       COUT(2) << "PacketDecoder: compsize is 0" << std::endl;
-    currentState->data = (unsigned char*)(malloc( currentState->compsize ));
+//     currentState->data = (unsigned char*)(malloc( currentState->compsize ));
+    currentState->data = new unsigned char[currentState->compsize];
     if(currentState->data==NULL)
       COUT(2) << "PacketDecoder: Gamestatepacket-decoder: memory leak" << std::endl;
@@ -198 +199 @@
     cid->id = ((classid *)(packet->data))->id;
     cid->clid = ((classid *)(packet->data))->clid;
-    cid->message = (const char *)malloc(cid->length);
+//     cid->message = (const char *)malloc(cid->length);
+    cid->message = new char[cid->length];
     void *data  = (void *)cid->message;
     memcpy(data, (const void*)(packet->data+3*sizeof(int)), cid->length);