Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-17 21:40:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Found cause of OSX network resets / lost connections: inet_ntoa is not thread-safe.

Browse source 
* Added thread-safe rs_inet_ntoa function (util/rsnet.cc)
 * Switched all calls to this function (most of the changes)
 * Modified getLocalInterfaces() and getPreferredInterface() to avoid string conversions.
   - NB: Modified windows functions too, but unable to test (hope it compiles!)

Also:
 * Added  EVP_CIPHER_CTX_rand_key() replacement function for old versions of SSL (pre 0.9.8)  (for OSX 10.5)
   - NB: This code should be reworked to remove these calls anyway.
 * Updated tests/pqi to handle above changes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3281 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-07-10 20:34:03 +00:00
parent 0b298f6ca1
commit 648e15bcf7
34 changed files with 360 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/services/p3disc.cc
View file

@ -878,10 +878,10 @@ int p3disc::idServers()
out << "Neighbour: " << (nit->second).id;
out << std::endl;
out << "-> LocalAddr: ";
out << inet_ntoa(nit->second.localAddr.sin_addr);
out << rs_inet_ntoa(nit->second.localAddr.sin_addr);
out << ":" << ntohs(nit->second.localAddr.sin_port) << std::endl;
out << "-> RemoteAddr: ";
out << inet_ntoa(nit->second.remoteAddr.sin_addr);
out << rs_inet_ntoa(nit->second.remoteAddr.sin_addr);
out << ":" << ntohs(nit->second.remoteAddr.sin_port) << std::endl;
out << " Last Contact: ";
out << cts - (nit->second.ts) << " sec ago";
@ -896,11 +896,11 @@ int p3disc::idServers()
out << "\tConnected via: " << (sit->first);
out << std::endl;
out << "\t\tLocalAddr: ";
out << inet_ntoa(sit->second.localAddr.sin_addr);
out << rs_inet_ntoa(sit->second.localAddr.sin_addr);
out <<":"<< ntohs(sit->second.localAddr.sin_port);
out << std::endl;
out << "\t\tRemoteAddr: ";
out << inet_ntoa(sit->second.remoteAddr.sin_addr);
out << rs_inet_ntoa(sit->second.remoteAddr.sin_addr);
out <<":"<< ntohs(sit->second.remoteAddr.sin_port);
out << std::endl;

1
libretroshare/src/services/p3distrib.cc
View file

@ -40,6 +40,7 @@
#include "util/rsdir.h"
#include "pqi/pqinotify.h"
#include "pqi/pqibin.h"
#include "pqi/sslfns.h"
#include "pqi/authssl.h"
#include "pqi/authgpg.h"