Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-29 11:01:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ported branch commits:

Browse source 
3148: modified the update system for address lists, so that the list is totally
      replaced (and not merged) when it comes from the peer itself. This helps
      cleaning wrong addresses

	  libretroshare/src/pqi/authssl.cc
	  libretroshare/src/pqi/p3connmgr.cc
	  libretroshare/src/pqi/p3connmgr.h
	  libretroshare/src/services/p3disc.cc

3149: removed uninitialized memory read
      
	  libretroshare/src/pqi/authgpg.cc

3151: corrected missed update of peer info when connected. Disabled setting
	  peer connexion IP from p3disc info (does not make sense, and leads to
	  errors)

      libretroshare/src/services/p3disc.cc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-06-16 20:18:46 +00:00
parent e9fabc34e9
commit 347c80fb1e
5 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/pqi/authssl.cc
View file

@ -2075,7 +2075,7 @@ int AuthSSL::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx)
if (mConnMgr->getFriendNetStatus(peer_id_in_context, detail)) {
//transfer ips only if the two peers got the same gpg key
if (detail.gpg_id == getX509CNString(X509_STORE_CTX_get_current_cert(ctx)->cert_info->issuer)) {
mConnMgr->setAddressList(certId, detail.getIpAddressList());
mConnMgr->updateAddressList(certId, detail.getIpAddressList());
}
}
} else {