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

Timestamp:

Nov 14, 2007, 2:58:23 PM (16 years ago)

Author:

scheusso

Message:

changed packetbuffer and conenctionmanager to remember the client id/adjustet dummyserver/client

File:

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

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

@@ -21 +21 @@
   
 
-bool PacketBuffer::push(ENetPacket *pck){
+bool PacketBuffer::push(ENetEvent *ev){
   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
-  /*if(last!=NULL)
-    while(last->next!=NULL)
-      last=last->next;*/
   // first element?
   if(first==NULL){
@@ -36 +31 @@
     last->next=NULL;
     // change this!!!!!!!
-    last->packet = pck;
+    last->packet = ev->packet;
+    last->address = ev->peer->address;
     } else {
     //insert a new element at the bottom
@@ -44 +40 @@
     last->next=NULL;
     // save the packet to the new element
-    last->packet = pck;
+    last->packet = ev->packet;
+    last->address = ev->peer->address;
   }
   return true;
@@ -64 +61 @@
 }
 
+ENetPacket *PacketBuffer::pop(ENetAddress &address){
+  boost::mutex::scoped_lock lock(networkPacketBufferMutex);
+  if(first!=NULL /*&& !closed*/){
+    QueueItem *temp = first;
+    // get packet
+    ENetPacket *pck=first->packet;
+    address = first->address;
+    // remove first element
+    first = first->next;
+    delete temp;
+    return pck;
+  } else{
+    return NULL;
+  }
+}
+
 bool PacketBuffer::isEmpty(){
   return (first==NULL);
@@ -71 +84 @@
   QueueItem *temp=first;
   while(temp!=NULL){
-    std::cout << temp->packet->data << std::endl;
+//    std::cout << temp->packet->data << std::endl;
     temp=temp->next;
   }