Changeset 1378

Timestamp:

May 22, 2008, 4:24:32 PM (17 years ago)

Author:

scheusso

Message:

various enhancements with enet handling (serverside in
connectionmanager)

Location:

code/branches/network/src/network

Files:

• ClientInformation.cc (modified) (4 diffs)
• ConnectionManager.cc (modified) (3 diffs)
• ConnectionManager.h (modified) (1 diff)

code/branches/network/src/network/ClientInformation.cc

@@ -85 +85 @@
   ClientInformation::~ClientInformation() {
     boost::recursive_mutex::scoped_lock lock(mutex_);
-    if(preve!=0)
-      preve->setNext(this->nexte);
-    if(nexte!=0)
-      nexte->setPrev(this->preve);
+    if(next()!=0)
+      prev()->setNext(this->next());
+    if(next()!=0)
+      next()->setPrev(this->prev());
   }
 
@@ -123 +123 @@
   ClientInformation *ClientInformation::insertAfter(ClientInformation *ins) {
     boost::recursive_mutex::scoped_lock lock(mutex_);
-    this->nexte->setPrev(ins);
-    ins->setNext(this->nexte);
+    this->next()->setPrev(ins);
+    ins->setNext(this->next());
     ins->setPrev(this);
     this->nexte = ins;
@@ -135 +135 @@
       return NULL;
     this->prev()->setNext(ins);
-    ins->setPrev(this->preve);
+    ins->setPrev(this->prev());
     this->preve=ins;
     ins->setNext(this);
@@ -142 +142 @@
 
   void ClientInformation::setID(int clientID){
+    if(!this)
+      return;
     boost::recursive_mutex::scoped_lock lock(mutex_);
     clientID_ = clientID;

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

@@ -151 +151 @@
   }
 
-  bool ConnectionManager::sendPackets(ENetEvent *event) {
+  /*bool ConnectionManager::sendPackets(ENetEvent *event) {
     if(server==NULL)
       return false;
@@ -158 +158 @@
     else
       return false;
-  }
+  }*/
 
   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;
+    enet_host_flush(server);
+    return true;
   }
 
@@ -208 +205 @@
           break;
         case ENET_EVENT_TYPE_NONE:
-          receiverThread_->yield();
+          //receiverThread_->yield();
           break;
       }
 //       usleep(100);
-      receiverThread_->yield(); //TODO: find apropriate
+      //receiverThread_->yield(); //TODO: find apropriate
     }
     disconnectClients();

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

@@ -84 +84 @@
     bool addPacket(ENetPacket *packet, int ID);
     bool addPacketAll(ENetPacket *packet);
-    bool sendPackets(ENetEvent *event);
+  //  bool sendPackets(ENetEvent *event);
     bool sendPackets();
     bool createClient(int clientID);