Changeset 204

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

Location:

code/branches/network/src/network

Files:

• ConnectionManager.cc (modified) (3 diffs)
• ConnectionManager.h (modified) (1 diff)
• Makefile (modified) (2 diffs)
• PacketBuffer.cc (modified) (5 diffs)
• PacketBuffer.h (modified) (2 diffs)
• dummyclient.cc (modified) (3 diffs)
• dummyserver.cc (modified) (3 diffs)

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

@@ -35 +35 @@
   
   
-  ENetPacket *ConnectionManager::getPacket(){
+  ENetPacket *ConnectionManager::getPacket(ENetAddress &address){
     if(!buffer.isEmpty())
-      return buffer.pop();
+      return buffer.pop(address);
     else
         return NULL;
@@ -127 +127 @@
         break;
       case ENET_EVENT_TYPE_RECEIVE:
-        std::cout << event.packet->data << std::endl;
         processData(&event);
         break;
@@ -143 +142 @@
     // just add packet to the buffer
     // this can be extended with some preprocessing
-    return buffer.push(event->packet);
+    return buffer.push(event);
   }
   

code/branches/network/src/network/ConnectionManager.h

@@ -45 +45 @@
     ConnectionManager();
     ConnectionManager(int port, int address);
-    ENetPacket *getPacket(); // thread1
+    ENetPacket *getPacket(ENetAddress &address); // thread1
     // check wheter the packet queue is empty
     bool queueEmpty();

code/branches/network/src/network/Makefile

@@ -2 +2 @@
 
 # Link command:
-server: clean PacketBuffer.o ConnectionManager.o dummyserver.o
-        g++ ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
+server: clean PacketBuffer.o ConnectionManager.o dummyserver.o PacketDecoder.o PacketGenerator.o
+        g++ PacketDecoder.o PacketGenerator.o ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
 
 dummyserver.o:
@@ -13 +13 @@
 PacketBuffer.o: 
         g++ -c PacketBuffer.cc -o PacketBuffer.o -g
+PacketGenerator.o:
+        g++ -c PacketGenerator.cc -o PacketGenerator.o -g
+PacketDecoder.o:
+        g++ -c PacketDecoder.cc -o PacketDecoder.o -g
+
 
 clean:
         rm -rf *.o
 
-client:
-        g++ dummyclient.cc -o client -lenet
+client: PacketGenerator.o
+        g++ dummyclient.cc PacketGenerator.o -o client -lenet -g

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;
   }

code/branches/network/src/network/PacketBuffer.h

@@ -31 +31 @@
 struct QueueItem{
   ENetPacket *packet;
+  ENetAddress address;
   QueueItem *next;
 };
@@ -43 +44 @@
   // pops a packet from the queue
   ENetPacket *pop();
+  ENetPacket *pop(ENetAddress &address);
   // pushs a packet to the queue
-  bool push(ENetPacket *pck);
+  bool push(ENetEvent *ev);
   
 private:

code/branches/network/src/network/dummyclient.cc

@@ -6 +6 @@
 #include <iostream>
 #include <enet/enet.h>
+#include "network/PacketManager.h"
 
 using namespace std;
@@ -14 +15 @@
   ENetEvent event;
   ENetPeer *peer;
+  network::PacketGenerator pck;
 
   enet_initialize();
@@ -44 +46 @@
   for(int i=0; i<10; i++){
         // weihnachtsmann bringt packete
-    ENetPacket *packet = enet_packet_create ("packet1234", strlen("packet1234") + 1, ENET_PACKET_FLAG_RELIABLE);
+    //ENetPacket *packet = enet_packet_create ("packet1234", strlen("packet1234") + 1, ENET_PACKET_FLAG_RELIABLE);
         // extend the packet and append the string foo to it
         // send packet to peer on channel id 0
-    enet_peer_send(peer, 1, packet);
+    enet_peer_send(peer, 1, pck.chatMessage("test"));
         // keep the timeout very small for low delay
     if(enet_host_service(client, &event, 1)==0){

code/branches/network/src/network/dummyserver.cc

@@ -8 +8 @@
 #include "enet/enet.h"
 #include "network/ConnectionManager.h"
+#include "network/PacketManager.h"
 
 using namespace network;
@@ -15 +16 @@
   bool quit=false;
   ENetPacket *packet;
+  ENetEvent event;
   server.createListener();
+  
+  PacketDecoder dec;
+  
   while(!quit){
     if(server.queueEmpty())
       usleep(100);
     else{
-      packet=server.getPacket();
+      ENetAddress addr;
+      packet=server.getPacket(addr);
       if(packet==NULL){
         // there was some error
@@ -26 +32 @@
         quit=true;
       }
-      else
-        std::cout << "We received: " << packet->data << std::endl;
+      else{
+        //std::cout << "We received: " << packet->data << std::endl;
+        dec.elaborate(packet, 1);
+      }
     }
   }