Changeset 1098 for code/branches/network2/src/network/PacketBuffer.cc

Timestamp:

Apr 17, 2008, 2:35:51 PM (16 years ago)

Author:

rgrieder

Message:

merged network branch into new network2 branch (from trunk)

File:

• code/branches/network2/src/network/PacketBuffer.cc (modified) (2 diffs)

code/branches/network2/src/network/PacketBuffer.cc

@@ -61 +61 @@
       last=first;
       last->next=NULL;
-      // change this!!!!!!!
+      // change this!!!!!!! 
       last->packet = ev->packet;
-      last->address = ev->peer->address;
+      //last->address = ev->peer->address;
     } else {
       //insert a new element at the bottom
@@ -72 +72 @@
       // save the packet to the new element
       last->packet = ev->packet;
-      last->address = ev->peer->address;
+      //last->address = ev->peer->address;
     }
-    return true;
+    // pseudo bugfix: added a return false statement for error handling
+    if ( last->packet == ev->packet ) return true;
+    return false;
   }
 
+  //returns the first element in the list without deleting it but
+  //moving first pointer to next element
   ENetPacket *PacketBuffer::pop() {
     boost::mutex::scoped_lock lock(networkPacketBufferMutex);