Changeset 8329 for code/trunk

Timestamp:

Apr 26, 2011, 12:31:32 AM (14 years ago)

Author:

scheusso

Message:

preparing countermeasures against clients sending unwanted data

Location:

code/trunk/src

Files:

• libraries/network/synchronisable/Synchronisable.cc (modified) (6 diffs)
• libraries/network/synchronisable/Synchronisable.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

@@ -236 +236 @@
       mode=state_;
     //if this tick is we dont synchronise, then abort now
-    if(!doSync(id, mode))
+    if(!doSync(/*id,*/ mode))
       return 0;
     uint32_t tempsize = 0;
@@ -302 +302 @@
     if(mode==0x0)
       mode=state_;
+    
     if(syncList_.empty())
     {
@@ -313 +314 @@
     SynchronisableHeaderLight syncHeaderLight(mem);
     assert(syncHeaderLight.getObjectID()==this->getObjectID());
+    
+    if( !this->doReceive(mode) )
+    {
+      uint32_t headerSize;
+      if( syncHeaderLight.isDiffed() )
+        headerSize = SynchronisableHeaderLight::getSize();
+      else
+        headerSize = SynchronisableHeader::getSize();
+      mem += syncHeaderLight.getDataSize() + headerSize;
+      return true;
+    }
 
     //COUT(5) << "Synchronisable: objectID_ " << syncHeader.getObjectID() << ", classID_ " << syncHeader.getClassID() << " size: " << syncHeader.getDataSize() << " synchronising data" << std::endl;
@@ -357 +369 @@
     if (mode==0x0)
       mode=state_;
-    if (!doSync(id, mode))
+    if (!doSync(/*id, */mode))
       return 0;
     assert( mode==state_ );
@@ -375 +387 @@
    * @return true/false
    */
-  bool Synchronisable::doSync(int32_t id, uint8_t mode)
+  bool Synchronisable::doSync(/*int32_t id,*/ uint8_t mode)
   {
 //     if(mode==0x0)
@@ -381 +393 @@
     assert(mode!=0x0);
     return ( (this->objectMode_ & mode)!=0 && (!syncList_.empty() ) );
+  }
+  
+  /**
+   * This function determines, wheter the object should accept data from the bytestream (according to its syncmode/direction)
+   * @param id gamestate id
+   * @param mode Synchronisation mode (toclient, toserver or bidirectional)
+   * @return true/false
+   */
+  bool Synchronisable::doReceive( uint8_t mode)
+  {
+    //return mode != this->objectMode_ || this->objectMode_ == ObjectDirection::Bidirectional;
+    return true;
   }
 

code/trunk/src/libraries/network/synchronisable/Synchronisable.h

@@ -180 +180 @@
     uint32_t getSize(int32_t id, uint8_t mode=0x0);
     bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);
-    bool doSync(int32_t id, uint8_t mode=0x0);
+    bool doSync(/*int32_t id,*/ uint8_t mode=0x0);
+    bool doReceive( uint8_t mode );
 
     inline void setObjectID(uint32_t id){ this->objectID_ = id; objectMap_[this->objectID_] = this; }

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -89 +89 @@
 
         this->isHumanShip_ = this->hasLocalController();
+        
+        this->setSyncMode(ObjectDirection::Bidirectional); // needed to synchronise e.g. aimposition
     }