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

dynamic update of networkview from p3disc info. Disabled friend level for now.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-11-05 22:46:40 +00:00
parent 3fa3e2d6db
commit a32bcbb635
14 changed files with 194 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/retroshare/rsiface.h
View file

@ -199,6 +199,7 @@ class NotifyBase
/* one or more peers has changed the states */
virtual void notifyPeerStatusChangedSummary() {}
virtual void notifyChannelMsgReadSatusChanged(const std::string& /* channelId */, const std::string& /* msgId */, uint32_t /* status */) {}
virtual void notifyDiscInfoChanged() {}
virtual std::string askForPassword(const std::string& /* key_details */ ,bool /* prev_is_bad */ ) { return "" ;}
};

25
libretroshare/src/services/p3disc.cc
View file

@ -618,9 +618,15 @@ void p3disc::recvPeerDetails(RsDiscReply *item, const std::string &certGpgId)
return;
}
bool should_notify_discovery = false ;
for (std::list<RsPeerNetItem>::iterator pitem = item->rsPeerList.begin(); pitem != item->rsPeerList.end(); pitem++)
{
addDiscoveryData(item->PeerId(), pitem->pid, pitem->currentlocaladdr, pitem->currentremoteaddr, 0, time(NULL));
bool new_info ;
addDiscoveryData(item->PeerId(), pitem->pid, pitem->currentlocaladdr, pitem->currentremoteaddr, 0, time(NULL),new_info);
if(new_info)
should_notify_discovery = true ;
#ifdef P3DISC_DEBUG
std::cerr << "p3disc::recvPeerFriendMsg() Peer Config Item:" << std::endl;
@ -725,6 +731,9 @@ void p3disc::recvPeerDetails(RsDiscReply *item, const std::string &certGpgId)
rsicontrol->getNotify().notifyListChange(NOTIFY_LIST_NEIGHBOURS, NOTIFY_TYPE_MOD);
if(should_notify_discovery)
rsicontrol->getNotify().notifyDiscInfoChanged();
/* cleanup (handled by caller) */
}
@ -894,10 +903,12 @@ void p3disc::setGPGOperation(AuthGPGOperation *operation)
/*************************************************************************************/
/* Storing Network Graph */
/*************************************************************************************/
int p3disc::addDiscoveryData(std::string fromId, std::string aboutId, struct sockaddr_in laddr, struct sockaddr_in raddr, uint32_t flags, time_t ts)
int p3disc::addDiscoveryData(std::string fromId, std::string aboutId, struct sockaddr_in laddr, struct sockaddr_in raddr, uint32_t flags, time_t ts,bool& new_info)
{
RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/
new_info = false ;
std::cerr << "Adding discovery data " << fromId << " - " << aboutId << std::endl ;
/* Store Network information */
std::map<std::string, autoneighbour>::iterator it;
if (neighbours.end() == (it = neighbours.find(aboutId)))
@ -914,6 +925,7 @@ int p3disc::addDiscoveryData(std::string fromId, std::string aboutId, struct soc
neighbours[aboutId] = an;
it = neighbours.find(aboutId);
new_info = true ;
}
/* it always valid */
@ -943,7 +955,11 @@ int p3disc::addDiscoveryData(std::string fromId, std::string aboutId, struct soc
it->second.discFlags = as.discFlags;
}
(it->second).neighbour_of[fromId] = as;
if(it->second.neighbour_of.find(fromId) == it->second.neighbour_of.end())
{
(it->second).neighbour_of[fromId] = as;
new_info =true ;
}
/* do we update network address info??? */
return 1;
@ -959,6 +975,9 @@ bool p3disc::potentialproxies(std::string id, std::list<std::string> &proxyIds)
{
/* find id -> and extract the neighbour_of ids */
if(id == rsPeers->getOwnId()) // SSL id // This is treated appart, because otherwise we don't receive any disc info about us
return rsPeers->getFriendList(proxyIds) ;
RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/
std::map<std::string, autoneighbour>::iterator it;

2
libretroshare/src/services/p3disc.h
View file

@ -132,7 +132,7 @@ void removeFriend(std::string ssl_id); //keep tracks of removed friend so we're
/* handle network shape */
int addDiscoveryData(std::string fromId, std::string aboutId,
struct sockaddr_in laddr, struct sockaddr_in raddr,
uint32_t flags, time_t ts);
uint32_t flags, time_t ts,bool& new_info);
int idServers();