Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

still trying to fix this list serial ip address

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-20 13:26:23 +00:00
parent d485c71126
commit a83345e394
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -366,9 +366,15 @@ 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.currentserveraddr.sin_addr : " << inet_ntoa(detail.currentserveraddr.sin_addr) << ":" << ntohs(detail.currentlocaladdr.sin_port) << std::endl;
#endif
di -> ipAddressList.clear();
for ( std::list<IpAddressTimed>::iterator ipListIt = detail.getIpAddressList().begin(); ipListIt!= detail.getIpAddressList().end(); ipListIt++) {
IpAddressTimed ipAddress;
ipAddress.ipAddr = ipListIt->ipAddr;
ipAddress.seenTime = ipListIt->seenTime;
di -> ipAddressList.push_back(ipAddress);
}
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 */
di -> discFlags = 0;
@ -442,9 +448,15 @@ void p3disc::sendPeerDetails(std::string to, std::string about)
di -> PeerId(to);
di -> aboutId = about;
// set the ip addresses.
di -> ipAddressList = std::list<IpAddressTimed> (detail.getIpAddressList()); //duplicate the list to build the item
di -> currentladdr = detail.currentlocaladdr;
// set the ip addresse list.
di -> ipAddressList.clear();
for ( std::list<IpAddressTimed>::iterator ipListIt = detail.getIpAddressList().begin(); ipListIt!= detail.getIpAddressList().end(); ipListIt++) {
IpAddressTimed ipAddress;
ipAddress.ipAddr = ipListIt->ipAddr;
ipAddress.seenTime = ipListIt->seenTime;
di -> ipAddressList.push_back(ipAddress);
}
di -> currentladdr = detail.currentlocaladdr;
di -> currentsaddr = detail.currentserveraddr;
if (detail.state & RS_PEER_S_CONNECTED)