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

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.h (modified) (5 diffs)

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

@@ -5 +5 @@
 //
 //
-// Author:  <>, (C) 2007
+// Author:  Oliver Scheuss, (C) 2007
 //
 // Copyright: See COPYING file that comes with this distribution
@@ -13 +13 @@
 #define NETWORK_CONNECTIONMANAGER_H
 
-#include PacketBuffer.h
+#include <iostream>
+// enet library for networking support
+#include <enet/enet.h>
+// boost.thread library for multithreading support
+#include <boost/thread/thread.hpp>
+#include <boost/bind.hpp>
+// headerfile
+#include "network/ConnectionManager.h"
+#include "network/PacketBuffer.h"
 
 namespace network{
@@ -20 +28 @@
 #define NETWORK_MAX_CONNECTIONS 50
 #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
+// #define ENetEvent std::ENetEvent
+// #define ENetHost std::ENetHost
+// #define ENetAddress std::ENetAddress
+// #define ENetPeer std::ENetPeer
   
   struct ClientList{
-    ENetEvent event;
+    ENetEvent *event;
     int ID;
     ClientList *next;
@@ -35 +44 @@
     public:
     ConnectionManager();
-    ~ConnectionManager();
-    void loop(); // thread1
-    bool createListener();
-    bool quitServer();
-    bool sendEventAll(/*.....*/);
-    bool sendEvent(int clientID/*.....*/);
-    void test();
+    ConnectionManager(int port, int address);
+    ENetPacket *getPacket(); // thread1
+    // check wheter the packet queue is empty
+    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);
     private:
-    void peerLoop(int clientNumber); //thread2
-    bool clientDisconnect(ENetPeer peer);
-    bool processData(ENetEvent event);
-    bool addClient(ENetEvent event);
+    bool clientDisconnect(ENetPeer *peer);
+    bool processData(ENetEvent *event);
+    bool addClient(ENetEvent *event);
+    // implementation of the listener
+    void receiverThread(); //thread2
     //packetbuffer
     PacketBuffer buffer;
@@ -54 +72 @@
     // quit-variable (communication with threads)
     bool quit;
-    // thread group
-    boost::thread_group threads;
     // clientlist
     ClientList *client;
+//     thread group
+//     boost::thread_group threads;
   };