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

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.cc (modified) (3 diffs)

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

@@ -29 +29 @@
 #include "Connection.h"
 
-#include <iostream>
 #include <cassert>
+#include <enet/enet.h>
 #include <OgreTimer.h>
-
-#include "util/Debug.h"
-#include "util/Math.h"
-#include "util/Sleep.h"
-#include "ClientInformation.h"
-#include "synchronisable/Synchronisable.h"
-#include "packet/ClassID.h"
+#include "packet/Packet.h"
 
 namespace orxonox
@@ -55 +49 @@
   Connection::~Connection(){
     Connection::instance_=0;
+  }
+
+  int Connection::service(ENetEvent* event) {
+    return enet_host_service( this->host_, event, NETWORK_WAIT_TIMEOUT );
+  }
+
+  void Connection::disconnectPeer(ENetPeer *peer) {
+    enet_peer_disconnect(peer, 0);
   }
 
@@ -96 +98 @@
   }
 
+  bool Connection::processPacket(ENetEvent* event) {
+    packet::Packet *p = packet::Packet::createPacket(event->packet, event->peer);
+    return p->process();
+  }
+
 }