Changeset 1711 for code/branches/network/src/network/Server.cc

Timestamp:

Sep 5, 2008, 11:32:42 PM (16 years ago)

Author:

scheusso

Message:

we use enetcallback for destroying packets now (unfortunately there are still some problems)

File:

• code/branches/network/src/network/Server.cc (modified) (6 diffs)

code/branches/network/src/network/Server.cc

@@ -115 +115 @@
   bool Server::processChat(packet::Chat *message, unsigned int clientID){
     ClientInformation *temp = ClientInformation::getBegin();
-    packet::Packet *pkt;
     while(temp){
-      pkt = new packet::Packet(message);
-      pkt->setClientID(temp->getID());
-      if(!pkt->send())
+      message->setClientID(temp->getID());
+      if(!message->send())
         COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
-      delete pkt;
+      temp = temp->next();
     }
     return message->process();
@@ -134 +132 @@
     //TODO: change this (no informations about who wrote a message)
     ClientInformation *temp = ClientInformation::getBegin();
-    packet::Packet *pkt;
     while(temp){
-      pkt = new packet::Packet(chat);
-      pkt->setClientID(temp->getID());
-      if(!pkt->send())
+      chat->setClientID(temp->getID());
+      if(!chat->send())
         COUT(3) << "could not send Chat message to client ID: " << temp->getID() << std::endl;
     }
@@ -230 +226 @@
 
   bool Server::processPacket( ENetPacket *packet, ENetPeer *peer ){
-    packet::Packet p = packet::Packet(packet, peer);
-    return p.getPacketContent()->process();
+    packet::Packet *p = packet::Packet::createPacket(packet, peer);
+    return p->process();
   }
   
@@ -261 +257 @@
       }
       //std::cout << "adding gamestate" << std::endl;
-      packet::Packet packet(gs);
-      packet.setClientID(cid);
-      if ( !packet.send() ){
+      gs->setClientID(cid);
+      if ( !gs->send() ){
         COUT(3) << "Server: packet with client id (cid): " << cid << " not sended: " << temp->getFailures() << std::endl; 
         temp->addFailure();
@@ -270 +265 @@
       added=true;
       temp=temp->next();
-      delete gs;
+      // gs gets automatically deleted by enet callback
     }
     /*if(added) {
@@ -324 +319 @@
     COUT(3) << "sending welcome" << std::endl;
     packet::Welcome *w = new packet::Welcome(temp->getID(), temp->getShipID());
-    packet::Packet packet(w);
-    assert(packet.send());
+    w->setClientID(temp->getID());
+    assert(w->send());
     delete w;
     return true;