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

finally got the address list bug : you've got to duplicate the list in order to send the message

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-18 23:35:40 +00:00
parent cc6b480156
commit c90714c5bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,7 +366,8 @@ void p3disc::sendOwnDetails(std::string to)
std::cerr << "p3disc::sendOwnDetails() detail.currentlocaladdr.sin_addr : " << inet_ntoa(detail.currentlocaladdr.sin_addr) << ":" << ntohs(detail.currentlocaladdr.sin_port) << std::endl; std::cerr << "p3disc::sendOwnDetails() detail.currentlocaladdr.sin_addr : " << inet_ntoa(detail.currentlocaladdr.sin_addr) << ":" << ntohs(detail.currentlocaladdr.sin_port) << std::endl;
std::cerr << "p3disc::sendOwnDetails() detail.currentserveraddr.sin_addr : " << inet_ntoa(detail.currentserveraddr.sin_addr) << ":" << ntohs(detail.currentlocaladdr.sin_port) << std::endl; std::cerr << "p3disc::sendOwnDetails() detail.currentserveraddr.sin_addr : " << inet_ntoa(detail.currentserveraddr.sin_addr) << ":" << ntohs(detail.currentlocaladdr.sin_port) << std::endl;
#endif #endif
di -> ipAddressList = detail.getIpAddressList();
di -> ipAddressList = std::list<IpAddressTimed> (detail.getIpAddressList()); //duplicate the list to build the item
di -> contact_tf = 0; di -> contact_tf = 0;
/* construct disc flags */ /* construct disc flags */
@ -442,7 +443,7 @@ void p3disc::sendPeerDetails(std::string to, std::string about)
di -> aboutId = about; di -> aboutId = about;
// set the ip addresses. // set the ip addresses.
di -> ipAddressList = detail.getIpAddressList(); di -> ipAddressList = std::list<IpAddressTimed> (detail.getIpAddressList()); //duplicate the list to build the item
di -> currentladdr = detail.currentlocaladdr; di -> currentladdr = detail.currentlocaladdr;
di -> currentsaddr = detail.currentserveraddr; di -> currentsaddr = detail.currentserveraddr;
@ -644,8 +645,7 @@ void p3disc::recvPeerOwnMsg(RsDiscOwnItem *item)
flags |= RS_NET_FLAGS_STABLE_UDP; flags |= RS_NET_FLAGS_STABLE_UDP;
} }
std::list<IpAddressTimed> emptyAddressList; //no address list for own disc message mConnMgr->peerStatus(item->PeerId(), item->laddr, item->saddr, item->ipAddressList,
mConnMgr->peerStatus(item->PeerId(), item->laddr, item->saddr, emptyAddressList,
type, flags, RS_CB_PERSON); type, flags, RS_CB_PERSON);
/* also add as potential stun buddy */ /* also add as potential stun buddy */