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

Changes to libretroshare to get it to compile (still missing fns - so won't link yet!)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-10 00:41:39 +00:00
parent 6eb27c9a1a
commit bbd11e69c1
17 changed files with 924 additions and 4726 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,7 +152,7 @@ void p3PeerMgr::setOwnNetworkMode(uint32_t netMode)
}
// Pass on Flags to NetMgr.
mNetMgr->setOwnNetworkMode((netMode & RS_NET_MODE_ACTUAL));
mNetMgr->setNetworkMode((netMode & RS_NET_MODE_ACTUAL));
}
void p3PeerMgr::setOwnVisState(uint32_t visState)
@ -173,7 +173,7 @@ void p3PeerMgr::setOwnVisState(uint32_t visState)
}
// Pass on Flags to NetMgr.
mNetMgr->setOwnVisState(visState);
mNetMgr->setVisState(visState);
}
@ -296,6 +296,32 @@ void p3PeerMgr::getOthersList(std::list<std::string> &peers)
int p3PeerMgr::getConnectAddresses(const std::string &id,
struct sockaddr_in &lAddr, struct sockaddr_in &eAddr,
pqiIpAddrSet &histAddrs, std::string &dyndns)
{
RsStackMutex stack(mPeerMtx); /****** STACK LOCK MUTEX *******/
/* check for existing */
std::map<std::string, peerState>::iterator it;
it = mFriendList.find(id);
if (it == mFriendList.end())
{
/* ERROR */
std::cerr << "p3PeerMgr::getConnectAddresses() ERROR unknown Peer";
std::cerr << std::endl;
return 0;
}
lAddr = it->second.localaddr;
eAddr = it->second.serveraddr;
histAddrs = it->second.ipAddrs;
dyndns = it->second.dyndns;
return 1;
}
/****************************
* Update state,
* trigger retry if necessary,
@ -414,7 +440,7 @@ bool p3PeerMgr::addFriend(const std::string &id, const std::string &gpg_id, uint
if (notifyLinkMgr)
{
mLinkMgr->addFriend(id, gpg_id, netMode, visState, lastContact);
mLinkMgr->addFriend(id, !(visState & RS_VIS_STATE_NODHT));
}
return true;