Changeset 8327 for code/trunk/src/libraries/network/packet/Packet.cc

Timestamp:

Apr 25, 2011, 8:22:36 PM (13 years ago)

Author:

scheusso

Message:

merging network6 into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/packet/Packet.cc (modified) (7 diffs)

code/trunk/src/libraries/network/packet/Packet.cc

@@ -47 +47 @@
 #include "Welcome.h"
 #include "network/Host.h"
-#include "network/ClientInformation.h"
+// #include "network/ClientInformation.h"
 
 namespace orxonox{
@@ -85 +85 @@
 
 
-Packet::Packet(const Packet &p){
+Packet::Packet(const Packet &p)
+{
   enetPacket_=p.enetPacket_;
   flags_=p.flags_;
@@ -104 +105 @@
     That also means destroying the ENetPacket if one exists. There
 */
-Packet::~Packet(){
+Packet::~Packet()
+{
   // Deallocate data_ memory if necessary.
-  if (this->bDataENetAllocated_){
+  if (this->bDataENetAllocated_)
+  {
     // In this case ENet allocated data_ and will destroy it.
   }
-  else if (this->data_) {
+  else if (this->data_)
+  {
     // This destructor was probably called as a consequence of ENet executing our callback.
     // It simply serves us to be able to deallocate the packet content (data_) ourselves since
@@ -119 +123 @@
   // Note: For the case ENet used the callback to destroy the packet, we have already set
   // enetPacket_ to NULL to avoid destroying it again.
-  if (this->enetPacket_){
+  if (this->enetPacket_)
+  {
     // enetPacket_->data gets destroyed too by ENet if it was allocated by it.
     enet_packet_destroy(enetPacket_);
@@ -125 +130 @@
 }
 
-bool Packet::send(orxonox::Host* host){
-  if(packetDirection_ != Direction::Outgoing && packetDirection_ != Direction::Bidirectional ){
+bool Packet::send(orxonox::Host* host)
+{
+  if(packetDirection_ != Direction::Outgoing && packetDirection_ != Direction::Bidirectional )
+  {
     assert(0);
     return false;
   }
-  if(!enetPacket_){
+  if(!enetPacket_)
+  {
     if(!data_){
       assert(0);
@@ -175 +183 @@
 }
 
-Packet *Packet::createPacket(ENetPacket *packet, ENetPeer *peer){
+Packet *Packet::createPacket(ENetPacket* packet, uint32_t peerID)
+{
   uint8_t *data = packet->data;
-  assert(ClientInformation::findClient(&peer->address)->getID() != static_cast<unsigned int>(-2) || !Host::isServer());
-  unsigned int peerID = ClientInformation::findClient(&peer->address)->getID();
+//   assert(ClientInformation::findClient(&peer->address)->getID() != static_cast<unsigned int>(-2) || !Host::isServer());
+//   unsigned int peerID = ClientInformation::findClient(&peer->address)->getID();
   // HACK
-  if( peerID==static_cast<unsigned int>(-2))
-    peerID = NETWORK_PEER_ID_SERVER;
+//   if( peerID==static_cast<unsigned int>(-2))
+//     peerID = NETWORK_PEER_ID_SERVER;
   Packet *p = 0;
 //   COUT(6) << "packet type: " << *(Type::Value *)&data[_PACKETID] << std::endl;
@@ -235 +244 @@
     data we allocated ourselves.
 */
-void Packet::deletePacket(ENetPacket *enetPacket){
+void Packet::deletePacket(ENetPacket *enetPacket)
+{
   // Get our Packet from a global map with all Packets created in the send() method of Packet.
   Packet::packetMapMutex_.lock();