Changeset 381

Timestamp:

Dec 4, 2007, 10:00:43 PM (16 years ago)

Author:

scheusso

Message:

using stl-map and stl-vector in ConnectionManaget should now work

Location:

code/branches/FICN/src/network

Files:

• ConnectionManager.cc (modified) (1 diff)
• ConnectionManager.h (modified) (2 diffs)
• Makefile.test (added)
• Server.cc (modified) (1 diff)

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

@@ -12 +12 @@
 #include "ConnectionManager.h"
 
+namespace std{
+  bool operator< (ENetAddress a, ENetAddress b){
+    if(a.host <= b.host)
+      return true;
+    else
+      return false;
+  }
+}
+
 namespace network{
 
   boost::thread_group network_threads;
-
+  
   ConnectionManager::ConnectionManager(){
     quit=false;

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

@@ -26 +26 @@
 #include "PacketBuffer.h"
 
+namespace std{
+  bool operator<(ENetAddress a, ENetAddress b);
+}
+
 namespace network{
   //
@@ -38 +42 @@
     ClientList *next;
   };
-
+  
   class ConnectionManager{
     public:

code/branches/FICN/src/network/Server.cc

@@ -100 +100 @@
   void Server::processQueue(){
     ENetPacket *packet;
+    int clientID=-1;
     while(!connection.queueEmpty()){
-      packet = connection.getPacket()
+      packet = connection.getPacket(clientID);
     }
   }