Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-05 09:35:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed unused mOthersList from PeerMgr

Browse Source
This commit is contained in:
csoler 2019-09-23 21:32:28 +02:00
parent d055887aa1
commit 24781a71f5
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 89 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
libretroshare/src/pqi/p3peermgr.cc
View File

@ -840,19 +840,6 @@ bool p3PeerMgrIMPL::getFriendNetStatus(const RsPeerId &id, peerState &state)
} }
bool p3PeerMgrIMPL::getOthersNetStatus(const RsPeerId &id, peerState &state)
{
RS_STACK_MUTEX(mPeerMtx);
/* check for existing */
std::map<RsPeerId, peerState>::iterator it;
it = mOthersList.find(id);
if (it == mOthersList.end()) return false;
state = it->second;
return true;
}
int p3PeerMgrIMPL::getConnectAddresses( int p3PeerMgrIMPL::getConnectAddresses(
const RsPeerId &id, sockaddr_storage &lAddr, sockaddr_storage &eAddr, const RsPeerId &id, sockaddr_storage &lAddr, sockaddr_storage &eAddr,
pqiIpAddrSet &histAddrs, std::string &dyndns ) pqiIpAddrSet &histAddrs, std::string &dyndns )
@ -978,6 +965,14 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
return true; /* (1) already exists */ return true; /* (1) already exists */
} }
// check that the PGP key is known
if(!AuthGPG::getAuthGPG()->isGPGId(gpg_id))
{
RsErr() << "Trying to add SSL id (" << id << ") to be validated with unknown PGP key (" << gpg_id << ". This is a bug!" << std::endl;
return false;
}
//Authentication is now tested at connection time, we don't store the ssl cert anymore //Authentication is now tested at connection time, we don't store the ssl cert anymore
// //
if (!AuthGPG::getAuthGPG()->isGPGAccepted(gpg_id) && gpg_id != AuthGPG::getAuthGPG()->getGPGOwnId()) if (!AuthGPG::getAuthGPG()->isGPGAccepted(gpg_id) && gpg_id != AuthGPG::getAuthGPG()->getGPGOwnId())
@ -992,42 +987,39 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
// after that, we know that we have the key, because AuthGPG wouldn't answer yes for a key it doesn't know. // after that, we know that we have the key, because AuthGPG wouldn't answer yes for a key it doesn't know.
/* check if it is in others */ /* check if it is in others */
if (mOthersList.end() != (it = mOthersList.find(id))) // if (mOthersList.end() != (it = mOthersList.find(id)))
{ // {
/* (2) in mOthersList -> move over */ // /* (2) in mOthersList -> move over */
#ifdef PEER_DEBUG //#ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::addFriend() Move from Others" << std::endl; // std::cerr << "p3PeerMgrIMPL::addFriend() Move from Others" << std::endl;
#endif //#endif
// if(!it->second.gpg_id.isNull() && it->second.gpg_id != input_gpg_id)// already exists as a friend with a different PGP id!!
// RsErr() << "Trying to add SSL id (" << id << ") that is already known (but not friend) with existing PGP key (" << it->second.gpg_id
// << ") but using a different PGP key (" << input_gpg_id << "). This looks like a bug! The friend will be added again with the new PGP key ID." << std::endl;
//
// mFriendList[id] = it->second;
// mOthersList.erase(it);
//
// it = mFriendList.find(id);
//
// /* setup connectivity parameters */
// it->second.vs_disc = vs_disc;
// it->second.vs_dht = vs_dht;
//
// it->second.netMode = netMode;
// it->second.lastcontact = lastContact;
//
// it->second.gpg_id = input_gpg_id;
// it->second.skip_pgp_signature_validation = false;
//
// mStatusChanged = true;
//
// notifyLinkMgr = true;
//
// IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
// }
// else
mFriendList[id] = it->second;
mOthersList.erase(it);
it = mFriendList.find(id);
/* setup connectivity parameters */
it->second.vs_disc = vs_disc;
it->second.vs_dht = vs_dht;
it->second.netMode = netMode;
it->second.lastcontact = lastContact;
if(!it->second.gpg_id.isNull() && it->second.gpg_id != input_gpg_id)// already exists as a friend with a different PGP id!!
{
RsErr() << "Trying to add SSL id (" << id << ") that is already known (but not friend) with existing PGP key (" << it->second.gpg_id << ") but using a different PGP key (" << input_gpg_id << "). This is a bug!" << std::endl;
return false;
}
it->second.gpg_id = input_gpg_id;
it->second.skip_pgp_signature_validation = false;
mStatusChanged = true;
notifyLinkMgr = true;
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
}
else
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::addFriend() Creating New Entry" << std::endl; std::cerr << "p3PeerMgrIMPL::addFriend() Creating New Entry" << std::endl;
#endif #endif
@ -1057,7 +1049,6 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
} }
}
if (notifyLinkMgr) if (notifyLinkMgr)
{ {
@ -1090,19 +1081,19 @@ bool p3PeerMgrIMPL::addSslOnlyFriend( const RsPeerId& sslId, const RsPgpId& pgp_
peerState pstate; peerState pstate;
{ // {
RS_STACK_MUTEX(mPeerMtx); // RS_STACK_MUTEX(mPeerMtx);
//
/* If in mOthersList -> move over */ // /* If in mOthersList -> move over */
auto it = mOthersList.find(sslId); // auto it = mOthersList.find(sslId);
if (it != mOthersList.end()) // if (it != mOthersList.end())
{ // {
pstate = it->second; // pstate = it->second;
mOthersList.erase(it); // mOthersList.erase(it);
} // }
//
//
} // RS_STACK_MUTEX(mPeerMtx); // } // RS_STACK_MUTEX(mPeerMtx);
if(!pstate.gpg_id.isNull() && AuthGPG::getAuthGPG()->isGPGAccepted(pstate.gpg_id)) if(!pstate.gpg_id.isNull() && AuthGPG::getAuthGPG()->isGPGAccepted(pstate.gpg_id))
{ {
@ -1196,7 +1187,7 @@ bool p3PeerMgrIMPL::removeFriend(const RsPgpId &id)
sslid_toRemove.push_back(it->second.id); sslid_toRemove.push_back(it->second.id);
mOthersList[it->second.id] = peer; //mOthersList[it->second.id] = peer;
mStatusChanged = true; mStatusChanged = true;
//success = true; //success = true;
@ -1271,7 +1262,7 @@ bool p3PeerMgrIMPL::removeFriend(const RsPeerId &id, bool removePgpId)
if(removePgpId) if(removePgpId)
pgpid_toRemove.push_back(it->second.gpg_id); pgpid_toRemove.push_back(it->second.gpg_id);
mOthersList[id] = peer; //mOthersList[id] = peer;
mStatusChanged = true; mStatusChanged = true;
//success = true; //success = true;
@ -1331,14 +1322,14 @@ void p3PeerMgrIMPL::printPeerLists(std::ostream &out)
out << std::endl; out << std::endl;
} }
out << "p3PeerMgrIMPL::printPeerLists() Others List"; // out << "p3PeerMgrIMPL::printPeerLists() Others List";
out << std::endl; // out << std::endl;
for(it = mOthersList.begin(); it != mOthersList.end(); ++it) // for(it = mOthersList.begin(); it != mOthersList.end(); ++it)
{ // {
out << "\t SSL ID: " << it->second.id; // out << "\t SSL ID: " << it->second.id;
out << "\t GPG ID: " << it->second.gpg_id; // out << "\t GPG ID: " << it->second.gpg_id;
out << std::endl; // out << std::endl;
} // }
} }
return; return;
@ -1520,17 +1511,11 @@ bool p3PeerMgrIMPL::addPeerLocator(const RsPeerId &sslId, const RsUrl& locator)
auto it = mFriendList.find(sslId); auto it = mFriendList.find(sslId);
if (it == mFriendList.end()) if (it == mFriendList.end())
{ {
it = mOthersList.find(sslId);
if (it == mOthersList.end())
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << __PRETTY_FUNCTION__ << "cannot add address " std::cerr << __PRETTY_FUNCTION__ << "cannot add address " << "info, peer id: " << sslId << " not found in list" << std::endl;
<< "info, peer id: " << sslId << " not found in list"
<< std::endl;
#endif #endif
return false; return false;
} }
}
changed = it->second.ipAddrs.updateLocalAddrs(ip); changed = it->second.ipAddrs.updateLocalAddrs(ip);
} }
@ -1577,16 +1562,11 @@ bool p3PeerMgrIMPL::setLocalAddress( const RsPeerId &id,
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{ {
if (mOthersList.end() == (it = mOthersList.find(id)))
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres " std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres " << "info : peer id not found in friend list id: " << id << std::endl;
<< "info : peer id not found in friend list id: "
<< id << std::endl;
#endif #endif
return false; return false;
} }
}
/* "it" points to peer */ /* "it" points to peer */
if (!sockaddr_storage_same(it->second.localaddr, addr)) if (!sockaddr_storage_same(it->second.localaddr, addr))
@ -1643,16 +1623,11 @@ bool p3PeerMgrIMPL::setExtAddress( const RsPeerId &id,
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{ {
if (mOthersList.end() == (it = mOthersList.find(id)))
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres " std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres " << "info : peer id not found in friend list id: " << id << std::endl;
<< "info : peer id not found in friend list id: " << id
<< std::endl;
#endif #endif
return false; return false;
} }
}
/* "it" points to peer */ /* "it" points to peer */
if (!sockaddr_storage_same(it->second.serveraddr, addr)) if (!sockaddr_storage_same(it->second.serveraddr, addr))
@ -1698,14 +1673,11 @@ bool p3PeerMgrIMPL::setDynDNS(const RsPeerId &id, const std::string &dyndns)
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{ {
if (mOthersList.end() == (it = mOthersList.find(id)))
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::setDynDNS() cannot add dyn dns info : peer id not found in friend list id: " << id << std::endl; std::cerr << "p3PeerMgrIMPL::setDynDNS() cannot add dyn dns info : peer id not found in friend list id: " << id << std::endl;
#endif #endif
return false; return false;
} }
}
/* "it" points to peer */ /* "it" points to peer */
if (it->second.dyndns.compare(dyndns) != 0) { if (it->second.dyndns.compare(dyndns) != 0) {
@ -1913,14 +1885,11 @@ bool p3PeerMgrIMPL::updateAddressList(const RsPeerId& id, const pqiIpAddrSet
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{ {
if (mOthersList.end() == (it = mOthersList.find(id)))
{
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres info : peer id not found in friend list. id: " << id << std::endl; std::cerr << "p3PeerMgrIMPL::setLocalAddress() cannot add addres info : peer id not found in friend list. id: " << id << std::endl;
#endif #endif
return false; return false;
} }
}
/* "it" points to peer */ /* "it" points to peer */
@ -1957,13 +1926,10 @@ bool p3PeerMgrIMPL::updateCurrentAddress(const RsPeerId& id, const pqiIpAddre
/* check if it is a friend */ /* check if it is a friend */
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{
if (mOthersList.end() == (it = mOthersList.find(id)))
{ {
std::cerr << "p3PeerMgrIMPL::updateCurrentAddress() ERROR peer id not found: " << id << std::endl; std::cerr << "p3PeerMgrIMPL::updateCurrentAddress() ERROR peer id not found: " << id << std::endl;
return false; return false;
} }
}
if (sockaddr_storage_isPrivateNet(addr.mAddr)) if (sockaddr_storage_isPrivateNet(addr.mAddr))
{ {
@ -2004,13 +1970,10 @@ bool p3PeerMgrIMPL::updateLastContact(const RsPeerId& id)
/* check if it is a friend */ /* check if it is a friend */
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{
if (mOthersList.end() == (it = mOthersList.find(id)))
{ {
std::cerr << "p3PeerMgrIMPL::updateLastContact() ERROR peer id not found: " << id << std::endl; std::cerr << "p3PeerMgrIMPL::updateLastContact() ERROR peer id not found: " << id << std::endl;
return false; return false;
} }
}
it->second.lastcontact = time(NULL); it->second.lastcontact = time(NULL);
@ -2030,12 +1993,9 @@ bool p3PeerMgrIMPL::setNetworkMode(const RsPeerId &id, uint32_t netMode)
/* check if it is a friend */ /* check if it is a friend */
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{
if (mOthersList.end() == (it = mOthersList.find(id)))
{ {
return false; return false;
} }
}
bool changed = false; bool changed = false;
@ -2100,12 +2060,9 @@ bool p3PeerMgrIMPL::setVisState(const RsPeerId &id, uint16_t vs_disc, uint16_
/* check if it is a friend */ /* check if it is a friend */
std::map<RsPeerId, peerState>::iterator it; std::map<RsPeerId, peerState>::iterator it;
if (mFriendList.end() == (it = mFriendList.find(id))) if (mFriendList.end() == (it = mFriendList.find(id)))
{
if (mOthersList.end() == (it = mOthersList.find(id)))
{ {
return false; return false;
} }
}
else else
{ {
isFriend = true; isFriend = true;

3
libretroshare/src/pqi/p3peermgr.h
View File

@ -208,7 +208,6 @@ virtual bool UpdateOwnAddress(const struct sockaddr_storage &local_addr, cons
virtual bool getOwnNetStatus(peerState &state) = 0; virtual bool getOwnNetStatus(peerState &state) = 0;
virtual bool getFriendNetStatus(const RsPeerId &id, peerState &state) = 0; virtual bool getFriendNetStatus(const RsPeerId &id, peerState &state) = 0;
virtual bool getOthersNetStatus(const RsPeerId &id, peerState &state) = 0;
virtual bool getPeerName(const RsPeerId &ssl_id, std::string &name) = 0; virtual bool getPeerName(const RsPeerId &ssl_id, std::string &name) = 0;
virtual bool getGpgId(const RsPeerId &sslId, RsPgpId &gpgId) = 0; virtual bool getGpgId(const RsPeerId &sslId, RsPgpId &gpgId) = 0;
@ -329,7 +328,6 @@ public:
virtual bool getOwnNetStatus(peerState &state); virtual bool getOwnNetStatus(peerState &state);
virtual bool getFriendNetStatus(const RsPeerId &id, peerState &state); virtual bool getFriendNetStatus(const RsPeerId &id, peerState &state);
virtual bool getOthersNetStatus(const RsPeerId &id, peerState &state);
virtual bool getPeerName(const RsPeerId& ssl_id, std::string& name); virtual bool getPeerName(const RsPeerId& ssl_id, std::string& name);
virtual bool getGpgId(const RsPeerId& sslId, RsPgpId& gpgId); virtual bool getGpgId(const RsPeerId& sslId, RsPgpId& gpgId);
@ -417,7 +415,6 @@ private:
peerState mOwnState; peerState mOwnState;
std::map<RsPeerId, peerState> mFriendList; // <SSLid , peerState> std::map<RsPeerId, peerState> mFriendList; // <SSLid , peerState>
std::map<RsPeerId, peerState> mOthersList;
std::map<RsPeerId,sockaddr_storage> mReportedOwnAddresses ; std::map<RsPeerId,sockaddr_storage> mReportedOwnAddresses ;

3
libretroshare/src/rsserver/p3peers.cc
View File

@ -713,9 +713,8 @@ RsPgpId p3Peers::getGPGId(const RsPeerId& sslid)
return AuthGPG::getAuthGPG()->getGPGOwnId(); return AuthGPG::getAuthGPG()->getGPGOwnId();
} }
peerState pcs; peerState pcs;
if (mPeerMgr->getFriendNetStatus(sslid, pcs) || mPeerMgr->getOthersNetStatus(sslid, pcs)) { if (mPeerMgr->getFriendNetStatus(sslid, pcs))
return pcs.gpg_id; return pcs.gpg_id;
}
return RsPgpId(); return RsPgpId();
} }