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

fix ext address peer detector

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-14 18:46:08 +00:00
parent 76d5072624
commit 6f0e7de534
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/pqi/p3connmgr.cc
View file

@ -1581,7 +1581,10 @@ bool p3ConnectMgr::connectResult(std::string id, bool success, uint32_t flags, s
it->second.lastcontact = time(NULL); /* time of connect */ it->second.lastcontact = time(NULL); /* time of connect */
it->second.connecttype = flags; it->second.connecttype = flags;
if (remote_peer_address.sin_addr.s_addr != 0) { if (remote_peer_address.sin_addr.s_addr != 0
&& !(remote_peer_address.sin_addr.s_addr == ownState.currentlocaladdr.sin_addr.s_addr)
&& (!isLoopbackNet(&remote_peer_address.sin_addr))
) {
IpAddressTimed ipLocalAddressTimed; IpAddressTimed ipLocalAddressTimed;
ipLocalAddressTimed.ipAddr = remote_peer_address; ipLocalAddressTimed.ipAddr = remote_peer_address;
ipLocalAddressTimed.seenTime = time(NULL); ipLocalAddressTimed.seenTime = time(NULL);
@ -2489,28 +2492,29 @@ bool p3ConnectMgr::setAddressList(std::string id, std::list<IpAddressTimed> I
{ {
/* check if it is our own ip */ /* check if it is our own ip */
if (id == getOwnId()) { if (id == getOwnId()) {
#ifdef CONN_DEBUG
std::cerr << "p3ConnectMgr::setAddressList() received own ip address list." << std::endl;
peerConnectState::printIpAddressList(IpAddressTimedList);
#endif
//extract first address that is not the same as local address //extract first address that is not the same as local address
//check if the ip list contains the current remote address of the connected peer //check if the ip list contains the current remote address of the connected peer
bool found = false; IpAddressTimed foundAddress;
std::list<IpAddressTimed>::iterator ipListIt; std::list<IpAddressTimed>::iterator ipListIt;
for (ipListIt = IpAddressTimedList.begin(); ipListIt!=(IpAddressTimedList.end()) && !found; ipListIt++) { for (ipListIt = IpAddressTimedList.begin(); ipListIt!=(IpAddressTimedList.end()); ++ipListIt) {
//assume address is valid if not same as local address, is not 0 and is not loopback //assume address is valid if not same as local address, is not 0 and is not loopback
if (!(ipListIt->ipAddr.sin_addr.s_addr == ownState.currentlocaladdr.sin_addr.s_addr) if (!(ipListIt->ipAddr.sin_addr.s_addr == ownState.currentlocaladdr.sin_addr.s_addr)
&& (ipListIt->ipAddr.sin_addr.s_addr != 0) && (ipListIt->ipAddr.sin_addr.s_addr != 0)
&& (!isLoopbackNet(&ipListIt->ipAddr.sin_addr)) && (!isLoopbackNet(&ipListIt->ipAddr.sin_addr))
) { ) {
found = true; //the pointer ipListIt is pointing to an external address
} #ifdef CONN_DEBUG
} std::cerr << "p3ConnectMgr::setAddressList() setting own ext adress from p3disc : ";
std::cerr << inet_ntoa(ipListIt->ipAddr.sin_addr) << ":" << ntohs(ipListIt->ipAddr.sin_port) << " seenTime : " << ipListIt->seenTime << std::endl;
#endif
if (found) { setExtAddress(getOwnId(), ipListIt->ipAddr);
//the pointer ipListIt is pointing to an external address break;
#ifdef CONN_DEBUG }
std::cerr << "p3ConnectMgr::setAddressList() setting own ext adress from p3disc : ";
std::cerr << inet_ntoa(ipListIt->ipAddr.sin_addr) << ":" << ntohs(ipListIt->ipAddr.sin_port) << " seenTime : " << ipListIt->seenTime << std::endl;
#endif
setExtAddress(getOwnId(), ipListIt->ipAddr);
} }