Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-16 03:14:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

small change in p3disc logs

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-26 23:43:10 +00:00
parent 8f315a52cc
commit 6f651c4a3c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/serialiser/rsconfigitems.cc
View File

@ -773,6 +773,13 @@ std::ostream &RsPeerNetItem::print(std::ostream &out, uint16_t indent)
out << "currentremoteaddr: " << inet_ntoa(currentremoteaddr.sin_addr); out << "currentremoteaddr: " << inet_ntoa(currentremoteaddr.sin_addr);
out << ":" << htons(currentremoteaddr.sin_port) << std::endl; out << ":" << htons(currentremoteaddr.sin_port) << std::endl;
printIndent(out, int_Indent);
out << "ipAdressList: size : " << ipAddressList.size() << ", adresses : " << std::endl;
for (std::list<IpAddressTimed>::iterator ipListIt = ipAddressList.begin(); ipListIt!=(ipAddressList.end()); ipListIt++) {
printIndent(out, int_Indent);
out << inet_ntoa(ipListIt->ipAddr.sin_addr) << ":" << ntohs(ipListIt->ipAddr.sin_port) << " seenTime : " << ipListIt->seenTime << std::endl;
}
printRsItemEnd(out, "RsPeerNetItem", indent); printRsItemEnd(out, "RsPeerNetItem", indent);
return out; return out;
} }

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

@ -352,7 +352,6 @@ void p3disc::sendPeerDetails(std::string to, std::string about) {
rsPeerNetItem->ipAddressList = detail.getIpAddressList(); rsPeerNetItem->ipAddressList = detail.getIpAddressList();
di->rsPeerList.push_back(*rsPeerNetItem); di->rsPeerList.push_back(*rsPeerNetItem);
} }
//send own details //send own details
@ -524,7 +523,7 @@ void p3disc::recvPeerDetails(RsDiscReply *item)
addDiscoveryData(item->PeerId(), pitem->pid, pitem->currentlocaladdr, pitem->currentremoteaddr, 0, time(NULL)); addDiscoveryData(item->PeerId(), pitem->pid, pitem->currentlocaladdr, pitem->currentremoteaddr, 0, time(NULL));
#ifdef P3DISC_DEBUG #ifdef P3DISC_DEBUG
std::cerr << "pp3disc::recvPeerFriendMsg() Peer Config Item:" << std::endl; std::cerr << "p3disc::recvPeerFriendMsg() Peer Config Item:" << std::endl;
pitem->print(std::cerr, 10); pitem->print(std::cerr, 10);
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
@ -534,7 +533,7 @@ void p3disc::recvPeerDetails(RsDiscReply *item)
//|| { //|| {
mConnMgr->addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, RS_VIS_STATE_NODISC, 0); //add with no disc by default. If friend already exist, it will do nothing mConnMgr->addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, RS_VIS_STATE_NODISC, 0); //add with no disc by default. If friend already exist, it will do nothing
} else if (pitem->lastContact > ((uint32_t)deletedSSLFriendsIds[pitem->pid] + 3600*24)) { // the friend was seen up and running 24 hours after we deleted it, we will readd it } else if (pitem->lastContact > ((uint32_t)deletedSSLFriendsIds[pitem->pid] + 3600*24)) { // the friend was seen up and running 24 hours after we deleted it, we will readd it
mConnMgr->addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, RS_VIS_STATE_NODISC, 0); //add with no disc bay default. If friend already exist, it will do nothing mConnMgr->addFriend(pitem->pid, pitem->gpg_id, pitem->netMode, RS_VIS_STATE_NODISC, 0); //add with no disc by default. If friend already exist, it will do nothing
} }
RsPeerDetails storedDetails; RsPeerDetails storedDetails;
if (rsPeers->getPeerDetails(pitem->pid, storedDetails) //update only if we got a detail if (rsPeers->getPeerDetails(pitem->pid, storedDetails) //update only if we got a detail