Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 03:36:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merged Changes /branches/v0.5-peernet/libretroshare/:r4237-4358

Browse source 
Major changes are:
 * Improvements to tcponudp library to allow multiple UdpStacks / ports, with alternative recievers.
 * Resurrected the UdpStunner code, and improved it.
 * Added UdpRelay code.
 * Modified startup code and ssludp code to use the new tcponudp and add a stunner.
 * fixed buggy rs_inet_ntoa
 * fixed a bunch of apple gcc warnings. mainly for(;;); => for(;;) ;

These changes shouldn't affect libretroshare stability... those changes will follow!




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-06-29 18:02:44 +00:00
parent d58f838269
commit b683e663d6
19 changed files with 1679 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/services/p3gamelauncher.cc
View file

@ -611,7 +611,7 @@ bool p3GameLauncher::confirmPeer(std::string gameId, std::string peerId,
int32_t i = 0;
for(it = git->second.peerIds.begin(); (i < pos) &&
(it != git->second.peerIds.end()); it++, i++);
(it != git->second.peerIds.end()); it++, i++) ;
if ((pos < 0) || (it == git->second.peerIds.end()))
{

2
libretroshare/src/services/p3ranking.cc
View file

@ -829,7 +829,7 @@ bool p3Ranking::getRankings(uint32_t first, uint32_t count, std::list<std::st
uint32_t i = 0;
std::multimap<float, std::string>::reverse_iterator rit;
for(rit = mRankings.rbegin(); (i < first) && (rit != mRankings.rend()); rit++, i++);
for(rit = mRankings.rbegin(); (i < first) && (rit != mRankings.rend()); rit++, i++) ;
i = 0;
for(; (i < count) && (rit != mRankings.rend()); rit++, i++)