Changeset 380 for code/branches/FICN/src/network/ConnectionManager.h

Timestamp:

Dec 4, 2007, 8:22:24 PM (16 years ago)

Author:

scheusso

Message:

problem in connectionmanager

File:

• code/branches/FICN/src/network/ConnectionManager.h (modified) (4 diffs)

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

@@ -15 +15 @@
 #include <iostream>
 #include <string>
+#include <map>
+#include <vector>
 // enet library for networking support
 #include <enet/enet.h>
@@ -20 +22 @@
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
-// headerfile
+// headerfiles
 #include "ConnectionManager.h"
 #include "PacketBuffer.h"
@@ -30 +32 @@
 #define NETWORK_WAIT_TIMEOUT 5000
 #define NETWORK_SEND_WAIT 5
-  //just some defines to make life easier ;)
-// #define ENetEvent std::ENetEvent
-// #define ENetHost std::ENetHost
-// #define ENetAddress std::ENetAddress
-// #define ENetPeer std::ENetPeer
 
   struct ClientList{
@@ -48 +45 @@
     ConnectionManager(int port, std::string address);
     ENetPacket *getPacket(ENetAddress &address); // thread1
-    // check wheter the packet queue is empty
+    ENetPacket *getPacket(int &clientID);
     bool queueEmpty();
-    // create a new listener thread
     void createListener();
     bool quitListener();
-    // add a packet to queue for a specific client peer
     bool addPacket(ENetPacket *packet, ENetPeer *peer);
-    // add ad packet to queue for a specific client ID
     bool addPacket(ENetPacket *packet, int ID);
-    // add a packet to queue for all clients
     bool addPacketAll(ENetPacket *packet);
-    // send out all queued packets
     bool sendPackets(ENetEvent *event);
     bool sendPackets();
     private:
     bool clientDisconnect(ENetPeer *peer);
+    bool clientDisconnect(ENetPeer peer);
     bool processData(ENetEvent *event);
     bool addClient(ENetEvent *event);
-    // implementation of the listener
-    void receiverThread(); //thread2
+    void receiverThread();
     void disconnectClients();
-    //packetbuffer
+    int getClientID(ENetPeer peer);
+    int getClientID(ENetAddress address);
+    ENetPeer getClientPeer(int clientID);
     PacketBuffer buffer;
-    // enet stuff
+    
     ENetHost *server;
     ENetAddress bindAddress;
-    // quit-variable (communication with threads)
-    bool quit;
-    // clientlist
-    ClientList *client;
-//     thread group
-//     boost::thread_group threads;
+    
+    bool quit; // quit-variable (communication with threads)
+    std::map<ENetAddress, int> clientMap;
+    std::map<ENetAddress, ENetPeer> peerMap;
+    std::vector<ENetAddress> clientVector;
   };