Changeset 196 for code/branches/network/src/network/ConnectionManager.cc

Timestamp:

Nov 11, 2007, 5:11:36 PM (16 years ago)

Author:

scheusso

Message:

created a dummyserver and dummyclient in order to test ConnectionManager and PacketBuffer with enet and boost_thread\n Makefile is used to build server and client

File:

• code/branches/network/src/network/ConnectionManager.cc (modified) (9 diffs)

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

@@ -7 +7 @@
 //
 //
-// Author:  Dumeni, Oli
+// Author:  Oliver Scheuss
 //
 
-// enet library for networking support
-#include enet/enet.h
-// boost.thread library for multithreading support
-#include boost/thread/thread.hpp
-// headerfile
 #include "network/ConnectionManager.h"
 
 namespace network{
+  
+  boost::thread_group network_threads;
+  
+  void test(){
+    return;
+  }
+  
   ConnectionManager::ConnectionManager(){
     quit=false;
     client=NULL;
-    bindAddress.host = std::ENET_HOST_ANY;
+    bindAddress.host = ENET_HOST_ANY;
     bindAddress.port = NETWORK_PORT;
   }
@@ -32 +34 @@
   }
   
-  void ConnectionManager::loop(){
-    if(!quit && !buffer.isEmpty()){
-      // to be implemented =================
-      
-    }
-  }
-  
-  bool ConnectionManager::createListener(){
-    threads.create_thread(&peerLoop);
-    return true;
-  }
-  
-  bool ConnectionManager::quitServer(){
+  
+  ENetPacket *ConnectionManager::getPacket(){
+    if(!buffer.isEmpty())
+      return buffer.pop();
+    else
+        return NULL;
+  }
+  
+  bool ConnectionManager::queueEmpty(){
+    return buffer.isEmpty();
+  }
+  
+  void ConnectionManager::createListener(){
+    network_threads.create_thread(boost::bind(boost::mem_fn(&ConnectionManager::receiverThread), this));
+//     boost::thread thr(boost::bind(boost::mem_fn(&ConnectionManager::receiverThread), this));
+    return;
+  }
+  
+  bool ConnectionManager::quitListener(){
     quit=true;
-    threads.join_all();
-    return true;
-  }
-  
-  bool ConnectionManager::peerLoop(){
+    network_threads.join_all();
+    return true;
+  }
+  
+  bool ConnectionManager::addPacket(ENetPacket *packet, ENetPeer *peer){
+    if(client=NULL)
+      return false;
+    ClientList *temp=client;
+    while(peer->host != temp->event->peer->host){
+      temp=temp->next;
+      if(temp==NULL)
+        return false;
+    }
+    if(enet_peer_send(temp->event->peer, temp->ID, packet)!=0)
+      return false;
+    return true;
+  }
+  
+  bool ConnectionManager::addPacket(ENetPacket *packet, int ID){
+    if(client=NULL)
+      return false;
+    ClientList *temp=client;
+    while(ID != temp->ID){
+      temp=temp->next;
+      if(temp==NULL)
+        return false;
+    }
+    if(enet_peer_send(temp->event->peer, temp->ID, packet)!=0)
+      return false;
+    else
+      return true;
+  }
+  
+  bool ConnectionManager::addPacketAll(ENetPacket *packet){
+    ClientList *temp=client;
+    while(temp!=NULL){
+      if(enet_peer_send(temp->event->peer, temp->ID, packet)!=0)
+         return false;
+    }
+    return true;
+  }
+  
+  bool ConnectionManager::sendPackets(ENetEvent *event){
+    if(server==NULL)
+      return false;
+    if(enet_host_service(server, event, NETWORK_SEND_WAIT)>=0)
+      return true;
+    else 
+      return false;
+  }
+  
+  void ConnectionManager::receiverThread(){
+    // what about some error-handling here ?
+    enet_initialize();
+    atexit(enet_deinitialize);
     ENetEvent event;
     server = enet_host_create(&bindAddress, NETWORK_MAX_CONNECTIONS, 0, 0);
@@ -65 +123 @@
       switch(event.type){
         // log handling ================
-      case std::EVENT_TYPE_CONNECT:
-        addClient(event);
+        case ENET_EVENT_TYPE_CONNECT:
+        addClient(&event);
         break;
-      case std::EVENT_TYPE_RECEIVE:
-        processData(event);
+      case ENET_EVENT_TYPE_RECEIVE:
+        std::cout << event.packet->data << std::endl;
+        processData(&event);
         break;
-      case std::EVENT_TYPE_DISCONNECT:
+      case ENET_EVENT_TYPE_DISCONNECT:
         // add some error/log handling here
         clientDisconnect(event.peer);
@@ -81 +140 @@
   }
   
-  ConnectionManager::processData(ENetEvent event){
-//     insert packetdecode and buffer stuff here
-    
-  }
-  
-  bool ConnectionManager::clientDisconnect(ENetPeer peer){
-    ClientList *temp=client;
-    if(temp->event.peer==peer){
+  bool ConnectionManager::processData(ENetEvent *event){
+    // just add packet to the buffer
+    // this can be extended with some preprocessing
+    return buffer.push(event->packet);
+  }
+  
+  bool ConnectionManager::clientDisconnect(ENetPeer *peer){
+    ClientList *temp=client;
+    // do we have to remove the first item ?
+    if(temp->event->peer->host==peer->host){
       if(temp->next==NULL){
         client=NULL;
@@ -98 +159 @@
     } else {
       while(temp->next!=NULL){
-        if(temp->next->event.peer==peer){
+        if(temp->next->event->peer->host==peer->host){
+          // do a correct relink and delete the disconnected client
           ClientList *temp2=temp->next;
           temp->next=temp2->next;
@@ -104 +166 @@
           return true;
         } else
+          //otherwise keep on searching ;)
           temp=temp->next;
       }
@@ -110 +173 @@
   }
   
-  bool ConnectionManager::addClient(ENetEvent event){
+  bool ConnectionManager::addClient(ENetEvent *event){
+    
+    // first client?
     if(client==NULL){
       client =new ClientList;
@@ -117 +182 @@
       client->event = event;
     } else {
-      ClienList *temp = client;
+      // otherwise add a new element to clientlist
+      ClientList *temp = client;
       int i=1;
       while(temp->next != NULL){
@@ -132 +198 @@
   }
   
-  void ConnectionManager::test(){
-    while(!quit)
-    
-    
-  }
+  
 }