Changeset 7780 for code/branches

Timestamp:

Dec 19, 2010, 9:41:57 PM (14 years ago)

Author:

scheusso

Message:

some fixes
reactivating acking and gamestate diffing

Location:

code/branches/network5/src

Files:

• libraries/network/Client.h (modified) (1 diff)
• libraries/network/Connection.cc (modified) (3 diffs)
• libraries/network/GamestateManager.cc (modified) (5 diffs)
• libraries/network/GamestateManager.h (modified) (2 diffs)
• libraries/network/Server.cc (modified) (1 diff)
• libraries/network/Server.h (modified) (1 diff)
• libraries/network/packet/FunctionCalls.cc (modified) (1 diff)
• libraries/network/packet/Packet.cc (modified) (1 diff)
• orxonox/gametypes/Gametype.cc (modified) (2 diffs)

code/branches/network5/src/libraries/network/Client.h

@@ -80 +80 @@
     bool closeConnection();
     void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID);
+    virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
     bool processChat(const std::string& message, unsigned int playerID);
     virtual bool chat(const std::string& message);

code/branches/network5/src/libraries/network/Connection.cc

@@ -82 +82 @@
   void Connection::disconnectPeer(ENetPeer *peer)
   {
+    assert(peer);
     outgoingEvent outEvent = { peer, outgoingEventType::disconnectPeer, (ENetPacket*)10, 15 };
     
@@ -91 +92 @@
   void Connection::addPacket(ENetPacket *packet, ENetPeer *peer, uint8_t channelID)
   {
+    assert(peer);
     outgoingEvent outEvent = { peer, outgoingEventType::sendPacket, packet, channelID };
     
@@ -100 +102 @@
   void Connection::broadcastPacket(ENetPacket* packet, uint8_t channelID)
   {
-    outgoingEvent outEvent = { 0, outgoingEventType::broadcastPacket, packet, channelID };
+    outgoingEvent outEvent = { (ENetPeer*)15, outgoingEventType::broadcastPacket, packet, channelID };
     
     this->outgoingEventsMutex_->lock();

code/branches/network5/src/libraries/network/GamestateManager.cc

@@ -110 +110 @@
       bool b = processGamestate(it->second);
       assert(b);
+      sendAck( it->second->getID(), it->second->getPeerID() );
       delete it->second;
     }
@@ -117 +118 @@
     NetworkCallbackManager::callCallbacks();
     return true;
+  }
+  
+  bool GamestateManager::sendAck(unsigned int gamestateID, uint32_t peerID)
+  {
+    packet::Acknowledgement *ack = new packet::Acknowledgement(gamestateID, peerID);
+    if( !this->sendPacket(ack))
+    {
+      COUT(3) << "could not ack gamestate: " << gamestateID << std::endl;
+      return false;
+    }
+    else
+    {
+      COUT(5) << "acked a gamestate: " << gamestateID << std::endl;
+      return true;
+    }
   }
 
@@ -173 +189 @@
       peerGamestates.push_back(0);  // insert an empty gamestate* to change
       finishGamestate( peerID, peerGamestates.back(), baseGamestate, currentGamestate_ );
+      if( peerGamestates.back()==0 )
+        // nothing to send to remove pointer from vector
+        peerGamestates.pop_back();
       //FunctorMember<GamestateManager>* functor =
 //       ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate, this) );
@@ -236 +255 @@
 
 
-  bool GamestateManager::ackGamestate(unsigned int gamestateID, unsigned int peerID) {
+  bool GamestateManager::ackGamestate(unsigned int gamestateID, unsigned int peerID)
+  {
 //     ClientInformation *temp = ClientInformation::findClient(peerID);
 //     assert(temp);
@@ -255 +275 @@
     }
 
-    assert(curid==GAMESTATEID_INITIAL || curid<gamestateID);
+    assert(curid==GAMESTATEID_INITIAL || curid<=gamestateID);
     COUT(5) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << std::endl;
     std::map<uint32_t, packet::Gamestate*>::iterator it2;

code/branches/network5/src/libraries/network/GamestateManager.h

@@ -90 +90 @@
     
     bool processGamestates();
+    bool sendAck(unsigned int gamestateID, uint32_t peerID);
     bool update();
     std::vector<packet::Gamestate*> getGamestates();
@@ -101 +102 @@
     void removePeer( uint32_t peerID );
 //     void removeClient(ClientInformation *client);
+  protected:
+    virtual bool sendPacket( packet::Packet* packet ) = 0;
   private:
     bool processGamestate(packet::Gamestate *gs);

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

@@ -360 +360 @@
     else
     {
+      GamestateManager::removePeer(client->getID());
       //ServerConnection::disconnectClient( client );
       //ClientConnectionListener::broadcastClientDisconnected( client->getID() ); //this is done in ClientInformation now

code/branches/network5/src/libraries/network/Server.h

@@ -67 +67 @@
     bool processChat(const std::string& message, unsigned int playerID);
     void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID);
+    virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
     void update(const Clock& time);
     unsigned int getRTT(unsigned int clientID);

code/branches/network5/src/libraries/network/packet/FunctionCalls.cc

@@ -71 +71 @@
     FunctionCall fctCall;
     fctCall.loadData(temp);
-    if( this->minGamestateID_ > host->getLastProcessedGamestateID(this->getPeerID()) || !fctCall.execute() )
+    if( !fctCall.execute() )
     {
       FunctionCallManager::bufferIncomingFunctionCall( fctCall, minGamestateID_, this->getPeerID() );

code/branches/network5/src/libraries/network/packet/Packet.cc

@@ -179 +179 @@
   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;
   Packet *p = 0;
 //   COUT(6) << "packet type: " << *(Type::Value *)&data[_PACKETID] << std::endl;

code/branches/network5/src/orxonox/gametypes/Gametype.cc

@@ -171 +171 @@
     void Gametype::playerEntered(PlayerInfo* player)
     {
-      COUT(0) << "Gametype: playerentered" << endl;
         this->players_[player].state_ = PlayerState::Joined;
     }
@@ -412 +411 @@
     void Gametype::spawnPlayer(PlayerInfo* player)
     {
-      COUT(0) << "Gametype: spawnPlayer" << endl;
         SpawnPoint* spawnpoint = this->getBestSpawnPoint(player);
         if (spawnpoint)