Changeset 3209 for code/branches/netp5/src/network/Connection.h

Timestamp:

Jun 23, 2009, 2:12:44 AM (15 years ago)

Author:

rgrieder

Message:

Cleanup in network plus a few dependency reductions (no enet-function inlines, using enum PacketFlag instead of the enet version)

File:

• code/branches/netp5/src/network/Connection.h (modified) (3 diffs)

code/branches/netp5/src/network/Connection.h

@@ -43 +43 @@
 #include "NetworkPrereqs.h"
 
-#include <string>
-#include <map>
-#include <enet/enet.h>
-
-#include "packet/Packet.h"
-
 namespace orxonox
 {
@@ -59 +53 @@
   class _NetworkExport Connection{
   public:
-    ~Connection();
+    virtual ~Connection();
     
     static bool addPacket(ENetPacket *packet, ENetPeer *peer);
@@ -69 +63 @@
     static Connection* getInstance(){ return Connection::instance_; }
     
-    int service(ENetEvent* event){ return enet_host_service( this->host_, event, NETWORK_WAIT_TIMEOUT ); }
-    void disconnectPeer(ENetPeer *peer){ enet_peer_disconnect(peer, 0); }
+    int service(ENetEvent* event);
+    void disconnectPeer(ENetPeer *peer);
     
     void processQueue();
     virtual void addClient(ENetEvent* event)=0;
     virtual void disconnectPeer(ENetEvent* event)=0;
-    virtual bool processPacket(ENetEvent* event){ packet::Packet *p = packet::Packet::createPacket(event->packet, event->peer); return p->process(); }
+    virtual bool processPacket(ENetEvent* event);
     
     ENetHost *host_;