Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug in distant msg sending code causing crashes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-07 21:36:43 +00:00
parent 74bc8ad999
commit 8420d27a02
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libretroshare/src/grouter/p3grouter.cc
View File

@ -204,25 +204,27 @@ p3GRouter::p3GRouter(p3ServiceControl *sc,p3LinkMgr *lm)
{ {
addSerialType(new RsGRouterSerialiser()) ; addSerialType(new RsGRouterSerialiser()) ;
_last_autowash_time = 0 ;
_last_publish_campaign_time = 0 ;
_last_debug_output_time = 0 ;
_last_config_changed = 0 ;
_random_salt = RSRandom::random_u64() ;
_changed = false ; _changed = false ;
} }
int p3GRouter::tick() int p3GRouter::tick()
{ {
static time_t last_autowash_time = 0 ;
static time_t last_publish_campaign_time = 0 ;
static time_t last_debug_output_time = 0 ;
static time_t last_config_changed = 0 ;
time_t now = time(NULL) ; time_t now = time(NULL) ;
if(now > last_autowash_time + RS_GROUTER_AUTOWASH_PERIOD) if(now > _last_autowash_time + RS_GROUTER_AUTOWASH_PERIOD)
{ {
// route pending objects // route pending objects
// //
routePendingObjects() ; routePendingObjects() ;
last_autowash_time = now ; _last_autowash_time = now ;
autoWash() ; autoWash() ;
} }
// Handle incoming items // Handle incoming items
@ -231,9 +233,9 @@ int p3GRouter::tick()
// Advertise published keys // Advertise published keys
// //
if(now > last_publish_campaign_time + RS_GROUTER_PUBLISH_CAMPAIGN_PERIOD) if(now > _last_publish_campaign_time + RS_GROUTER_PUBLISH_CAMPAIGN_PERIOD)
{ {
last_publish_campaign_time = now ; _last_publish_campaign_time = now ;
//publishKeys() ; // we don't publish keys anymore. //publishKeys() ; // we don't publish keys anymore.
// //
@ -243,9 +245,9 @@ int p3GRouter::tick()
#ifdef GROUTER_DEBUG #ifdef GROUTER_DEBUG
// Debug dump everything // Debug dump everything
// //
if(now > last_debug_output_time + RS_GROUTER_DEBUG_OUTPUT_PERIOD) if(now > _last_debug_output_time + RS_GROUTER_DEBUG_OUTPUT_PERIOD)
{ {
last_debug_output_time = now ; _last_debug_output_time = now ;
debugDump() ; debugDump() ;
} }
#endif #endif
@ -253,14 +255,14 @@ int p3GRouter::tick()
// If content has changed, save config, at most every RS_GROUTER_MIN_CONFIG_SAVE_PERIOD seconds appart // If content has changed, save config, at most every RS_GROUTER_MIN_CONFIG_SAVE_PERIOD seconds appart
// Otherwise, always save at least every RS_GROUTER_MAX_CONFIG_SAVE_PERIOD seconds // Otherwise, always save at least every RS_GROUTER_MAX_CONFIG_SAVE_PERIOD seconds
// //
if(_changed && now > last_config_changed + RS_GROUTER_MIN_CONFIG_SAVE_PERIOD) if(_changed && now > _last_config_changed + RS_GROUTER_MIN_CONFIG_SAVE_PERIOD)
{ {
#ifdef GROUTER_DEBUG #ifdef GROUTER_DEBUG
std::cerr << "p3GRouter::tick(): triggering config save." << std::endl; std::cerr << "p3GRouter::tick(): triggering config save." << std::endl;
#endif #endif
_changed = false ; _changed = false ;
last_config_changed = now ; _last_config_changed = now ;
IndicateConfigChanged() ; IndicateConfigChanged() ;
} }
@ -431,13 +433,12 @@ uint32_t p3GRouter::computeRandomDistanceIncrement(const RsPeerId& pid,const GRo
// distances in the network, and makes statistics about multiple sending // distances in the network, and makes statistics about multiple sending
// attempts impossible. // attempts impossible.
// //
static uint64_t random_salt = RSRandom::random_u64() ; static const int total_size = RsPeerId::SIZE_IN_BYTES + GRouterKeyId::SIZE_IN_BYTES + sizeof(_random_salt) ;
static const int total_size = RsPeerId::SIZE_IN_BYTES + GRouterKeyId::SIZE_IN_BYTES + sizeof(random_salt) ;
unsigned char tmpmem[total_size] ; unsigned char tmpmem[total_size] ;
*(uint64_t*)&tmpmem[0] = random_salt ; *(uint64_t*)&tmpmem[0] = _random_salt ;
memcpy(&tmpmem[sizeof(random_salt)],pid.toByteArray(),RsPeerId::SIZE_IN_BYTES) ; memcpy(&tmpmem[sizeof(_random_salt)],pid.toByteArray(),RsPeerId::SIZE_IN_BYTES) ;
memcpy(&tmpmem[sizeof(random_salt) + RsPeerId::SIZE_IN_BYTES],destination_key.toByteArray(),GRouterKeyId::SIZE_IN_BYTES) ; memcpy(&tmpmem[sizeof(_random_salt) + RsPeerId::SIZE_IN_BYTES],destination_key.toByteArray(),GRouterKeyId::SIZE_IN_BYTES) ;
return RsDirUtil::sha1sum(tmpmem,total_size).toByteArray()[5] ; return RsDirUtil::sha1sum(tmpmem,total_size).toByteArray()[5] ;
} }
@ -455,7 +456,7 @@ uint32_t p3GRouter::computeBranchingFactor(const std::vector<RsPeerId>& friends,
// BF : 1 0.7 0.3 0.1 0.05 0.05 0.05 // BF : 1 0.7 0.3 0.1 0.05 0.05 0.05
static const uint32_t MAX_DIST_INDEX = 7 ; static const uint32_t MAX_DIST_INDEX = 7 ;
static float branching_factors[MAX_DIST_INDEX] = { 1,0.7,0.3,0.1,0.05,0.05,0.05 } ; static const float branching_factors[MAX_DIST_INDEX] = { 1,0.7,0.3,0.1,0.05,0.05,0.05 } ;
uint32_t dist_index = std::min( (uint32_t)(dist / (float)GROUTER_ITEM_DISTANCE_UNIT), MAX_DIST_INDEX-1) ; uint32_t dist_index = std::min( (uint32_t)(dist / (float)GROUTER_ITEM_DISTANCE_UNIT), MAX_DIST_INDEX-1) ;
@ -534,7 +535,7 @@ std::set<uint32_t> p3GRouter::computeRoutingFriends(const std::vector<RsPeerId>&
float total = 0.0f ; for(int j=0;j<p;++j) total += probas_with_peers[j].first ; // computes the partial sum of the array float total = 0.0f ; for(int j=0;j<p;++j) total += probas_with_peers[j].first ; // computes the partial sum of the array
float r = RSRandom::random_f32()*total ; float r = RSRandom::random_f32()*total ;
int k; total=0.0f ; for(k=0;total < r;++k) total += probas_with_peers[k].first ; --k ; int k; total=0.0f ; for(k=0;total < r;++k) total += probas_with_peers[k].first ;
std::cerr << " => Friend " << i << ", between 0 and " << p-1 << ": chose k=" << k << ", peer=" << probas_with_peers[k].second << std::endl; std::cerr << " => Friend " << i << ", between 0 and " << p-1 << ": chose k=" << k << ", peer=" << probas_with_peers[k].second << std::endl;
@ -1127,7 +1128,7 @@ void p3GRouter::debugDump()
std::cerr << " Data items: " << std::endl; std::cerr << " Data items: " << std::endl;
static std::string statusString[4] = { "Unkn","Pend","Sent","Ackn" }; static const std::string statusString[4] = { "Unkn","Pend","Sent","Ackn" };
for(std::map<GRouterMsgPropagationId, GRouterRoutingInfo>::iterator it(_pending_messages.begin());it!=_pending_messages.end();++it) for(std::map<GRouterMsgPropagationId, GRouterRoutingInfo>::iterator it(_pending_messages.begin());it!=_pending_messages.end();++it)
std::cerr << " Msg id: " << std::hex << it->first << std::dec std::cerr << " Msg id: " << std::hex << it->first << std::dec

10
libretroshare/src/grouter/p3grouter.h
View File

@ -157,7 +157,8 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
// //
static uint32_t computeBranchingFactor(const std::vector<RsPeerId>& friends,const std::vector<float>& probas,uint32_t dist) ; static uint32_t computeBranchingFactor(const std::vector<RsPeerId>& friends,const std::vector<float>& probas,uint32_t dist) ;
static std::set<uint32_t> computeRoutingFriends(const std::vector<RsPeerId>& friends,const std::vector<float>& probas,uint32_t N) ; static std::set<uint32_t> computeRoutingFriends(const std::vector<RsPeerId>& friends,const std::vector<float>& probas,uint32_t N) ;
static uint32_t computeRandomDistanceIncrement(const RsPeerId& pid,const GRouterKeyId& destination_id) ;
uint32_t computeRandomDistanceIncrement(const RsPeerId& pid,const GRouterKeyId& destination_id) ;
//===================================================// //===================================================//
// p3Config methods // // p3Config methods //
@ -235,6 +236,13 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
// config update/save variables // config update/save variables
bool _changed ; bool _changed ;
time_t _last_autowash_time ;
time_t _last_publish_campaign_time ;
time_t _last_debug_output_time ;
time_t _last_config_changed ;
uint64_t _random_salt ;
}; };