Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9365 in orxonox.OLD for branches/proxy/src


Ignore:
Timestamp:
Jul 20, 2006, 6:20:20 PM (18 years ago)
Author:
patrick
Message:

ip synchronization now seems to work smoothly on my system here. but not on the laptop

Location:
branches/proxy/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/handshake.cc

    r9364 r9365  
    4848  registerVar( new SynchronizeableString( &localState.preferedNickName, &remoteState.preferedNickName, "preferedNickName", PERMISSION_ALL ) );
    4949  // now synchronize only two of the available proxy server addresses
    50 //   registerVar( new SynchronizeableIP( &this->proxy1, &this->proxy1, "proxy server 1", PERMISSION_ALL ) );
    51 //   registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_ALL ) );
    52   registerVar( new SynchronizeableInt( this->proxy1.hostRef(), this->proxy1.hostRef(), "proxy server 1", PERMISSION_ALL));
    53   registerVar( new SynchronizeableInt( this->proxy1.portRef(), this->proxy1.portRef(), "proxy server 1", PERMISSION_ALL));
    54   registerVar( new SynchronizeableInt( this->proxy2.hostRef(), this->proxy2.hostRef(), "proxy server 2", PERMISSION_ALL));
    55   registerVar( new SynchronizeableInt( this->proxy2.portRef(), this->proxy2.portRef(), "proxy server 2", PERMISSION_ALL));
     50  registerVar( new SynchronizeableIP( &this->proxy1, &this->proxy1, "proxy server 1", PERMISSION_MASTER_SERVER ) );
     51  registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_MASTER_SERVER ) );
     52
    5653
    5754  // init the local state
     
    147144      PRINTF(0)("handshake finished candel changed\n");
    148145    }
    149 
    150 //     // the first proxy server synched
    151 //     if( *it == this->proxy1Handler)
    152 //     {
    153 //       this->proxyAddressesSynched++;
    154 //       PRINTF(0)("got proxy1: %i, %i\n", this->proxy1.host(), this->proxy1.port());
    155 //     }
    156 //
    157 //     // the last proxy server synched
    158 //     if( *it == this->proxy2Handler)
    159 //     {
    160 //       this->proxyAddressesSynched++;
    161 //       PRINTF(0)("got proxy2: %i, %i\n", this->proxy2.host(), this->proxy2.port());
    162 //     }
    163 
    164146  }
    165147
  • branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

    r9363 r9365  
    9292  this->setHasChanged( *this->vPtrOut != oldVal);
    9393
    94 //   assert( n == 2 * INTSIZE);
     94  assert( n == 2 * INTSIZE);
    9595
    9696  return n;
  • branches/proxy/src/world_entities/spawning_point.cc

    r9347 r9365  
    203203void SpawningPoint::sendRespawnMessage( int uniqueId )
    204204{
     205#warning this bye array is not been deleted according to valginrd
    205206  byte * buf = new byte[2*INTSIZE];
    206207
Note: See TracChangeset for help on using the changeset viewer.