Changeset 188 for code/branches/network/src/network/PacketBuffer.cc

Timestamp:

Nov 7, 2007, 8:38:47 PM (16 years ago)

Author:

scheusso

Message:

adapted PacketBuffer to work with ENetPacket *

File:

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

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

@@ -13 +13 @@
 }
 
-bool PacketBuffer::push(PacketEnvelope pck){
+bool PacketBuffer::push(ENetPacket *pck){
   boost::mutex::scoped_lock lock(networkPacketBufferMutex);
+//   if(closed)
+//     return false;
   // also works if fifo is null (queue empty)
   // just to be sure last is really the last element
-  while(last!=NULL && last->next!=NULL)
-    last=last->next;
+  /*if(last!=NULL)
+    while(last->next!=NULL)
+      last=last->next;*/
   // first element?
   if(first==NULL){
@@ -25 +28 @@
     last->next=NULL;
     // change this!!!!!!!
-    last->packet = new PacketEnvelope;
-    last->packet->data = pck.data;
-    last->packet->length = pck.length;
-  } else {
+    last->packet = pck;
+    } else {
     //insert a new element at the bottom
     last->next = new QueueItem;
@@ -35 +36 @@
     last->next=NULL;
     // save the packet to the new element
-    // change this!!!!!!!!
-    last->packet = new PacketEnvelope;
-    last->packet->data = pck.data;
-    last->packet->length = pck.length;
+    last->packet = pck;
   }
   return true;
 }
 
-PacketEnvelope PacketBuffer::pop(){
+ENetPacket *PacketBuffer::pop(){
   boost::mutex::scoped_lock lock(networkPacketBufferMutex);
-  if(first!=NULL){
+  if(first!=NULL /*&& !closed*/){
     QueueItem *temp = first;
     // get packet
-    PacketEnvelope *p = first->packet;
+    ENetPacket *pck=first->packet;
     // remove first element
     first = first->next;
     delete temp;
-    return *p;
+    return pck;
   } else{
-    PacketEnvelope p = {0,0};
-    return p;
+    return NULL;
   }
 }