Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

finished updateServicePermissions.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-03-25 12:13:43 +00:00
parent 5440aec17b
commit 0fac6fecf9
3 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
libretroshare/src/pqi/p3servicecontrol.cc
View File

@ -30,8 +30,9 @@
RsServiceControl *rsServiceControl = NULL; RsServiceControl *rsServiceControl = NULL;
p3ServiceControl::p3ServiceControl(uint32_t configId) p3ServiceControl::p3ServiceControl(p3LinkMgr *linkMgr, uint32_t configId)
:RsServiceControl(), /* p3Config(configId), pqiMonitor(), */ :RsServiceControl(), /* p3Config(configId), pqiMonitor(), */
mLinkMgr(linkMgr),
mCtrlMtx("p3ServiceControl"), mMonitorMtx("P3ServiceControl::Monitor") mCtrlMtx("p3ServiceControl"), mMonitorMtx("P3ServiceControl::Monitor")
{ {
} }
@ -269,17 +270,18 @@ bool p3ServiceControl::updateServicePermissions(uint32_t serviceId, const RsServ
std::map<uint32_t, RsServicePermissions>::iterator it; std::map<uint32_t, RsServicePermissions>::iterator it;
it = mServicePermissionMap.find(serviceId); it = mServicePermissionMap.find(serviceId);
if (it == mServicePermissionMap.end())
{
std::cerr << "p3ServiceControl::updateServicePermissions()";
std::cerr << " ERROR missing previous permissions";
std::cerr << std::endl;
// ERROR.
return false;
}
std::list<RsPeerId> onlinePeers;
/* here we have to check which peers - permissions have changed for, mLinkMgr->getOnlineList(onlinePeers);
* and flag for updates. std::list<RsPeerId>::const_iterator pit;
*
* This is far more complex.
* need to check if versions are compatible and peers are providing service.
*/
#if 0
std::list<std::string> onlinePeers;
std::list<std::string>::const_iterator pit;
if (it != mServicePermissionMap.end()) if (it != mServicePermissionMap.end())
{ {
for(pit = onlinePeers.begin(); pit != onlinePeers.end(); pit++) for(pit = onlinePeers.begin(); pit != onlinePeers.end(); pit++)
@ -291,19 +293,12 @@ bool p3ServiceControl::updateServicePermissions(uint32_t serviceId, const RsServ
} }
} }
} }
else
{
// ERROR!
it = mServicePermissionMap.find[serviceId];
for(pit = onlinePeers.begin(); pit != onlinePeers.end(); pit++)
{
mUpdatedSet.insert(*pit);
}
}
#endif
it->second = permissions; it->second = permissions;
it->second.mServiceId = serviceId; // just to make sure! it->second.mServiceId = serviceId; // just to make sure!
// This is overkill - but will update everything.
updateAllFilters_locked();
return true; return true;
} }
@ -455,6 +450,15 @@ bool p3ServiceControl::updateAllFilters()
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/ RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
return updateAllFilters_locked();
}
bool p3ServiceControl::updateAllFilters_locked()
{
std::cerr << "p3ServiceControl::updateAllFilters_locked()";
std::cerr << std::endl;
// Create a peerSet from ServicesProvided + PeerFilters. // Create a peerSet from ServicesProvided + PeerFilters.
// This will completely refresh the Filters. // This will completely refresh the Filters.
std::set<RsPeerId> peerSet; std::set<RsPeerId> peerSet;
@ -466,7 +470,7 @@ bool p3ServiceControl::updateAllFilters()
peerSet.insert(it->first); peerSet.insert(it->first);
} }
std::map<RsPeerId, ServicePeerFilter>::const_iterator fit; std::map<RsPeerId, ServicePeerFilter>::const_iterator fit;
for(fit = mPeerFilterMap.begin(); fit != mPeerFilterMap.end(); fit++) for(fit = mPeerFilterMap.begin(); fit != mPeerFilterMap.end(); fit++)
{ {
peerSet.insert(fit->first); peerSet.insert(fit->first);
@ -489,7 +493,7 @@ bool p3ServiceControl::updateFilterByPeer_locked(const RsPeerId &peerId)
ServicePeerFilter originalFilter; ServicePeerFilter originalFilter;
ServicePeerFilter peerFilter; ServicePeerFilter peerFilter;
std::map<RsPeerId, ServicePeerFilter>::iterator fit; std::map<RsPeerId, ServicePeerFilter>::iterator fit;
fit = mPeerFilterMap.find(peerId); fit = mPeerFilterMap.find(peerId);
if (fit != mPeerFilterMap.end()) if (fit != mPeerFilterMap.end())
{ {
@ -764,21 +768,21 @@ bool p3ServiceControl::loadList(std::list<RsItem *>& loadList)
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
// pqiMonitor. // pqiMonitor.
void p3ServiceControl::statusChange(const std::list<pqipeer> &plist) void p3ServiceControl::statusChange(const std::list<pqipeer> &plist)
{ {
std::cerr << "p3ServiceControl::statusChange()"; std::cerr << "p3ServiceControl::statusChange()";
std::cerr << std::endl; std::cerr << std::endl;
std::list<pqipeer>::const_iterator pit; std::list<pqipeer>::const_iterator pit;
for(pit = plist.begin(); pit != plist.end(); pit++) for(pit = plist.begin(); pit != plist.end(); pit++)
{ {
std::cerr << "p3ServiceControl::statusChange() for peer: "; std::cerr << "p3ServiceControl::statusChange() for peer: ";
std::cerr << " peer: " << (pit->id).toStdString(); std::cerr << " peer: " << (pit->id).toStdString();
std::cerr << " state: " << pit->state; std::cerr << " state: " << pit->state;
std::cerr << " actions: " << pit->actions; std::cerr << " actions: " << pit->actions;
std::cerr << std::endl; std::cerr << std::endl;
if (pit->state & RS_PEER_S_FRIEND) if (pit->state & RS_PEER_S_FRIEND)
{ {
// Connected / Disconnected. (interal actions). // Connected / Disconnected. (interal actions).
if (pit->actions & RS_PEER_CONNECTED) if (pit->actions & RS_PEER_CONNECTED)
@ -802,7 +806,7 @@ void p3ServiceControl::statusChange(const std::list<pqipeer> &plist)
{ {
updatePeerRemoved(pit->id); updatePeerRemoved(pit->id);
} }
} }
} }
return; return;
} }
@ -877,7 +881,7 @@ void p3ServiceControl::notifyAboutFriends()
{ {
RsStackMutex stack(mMonitorMtx); /***** LOCK STACK MUTEX ****/ RsStackMutex stack(mMonitorMtx); /***** LOCK STACK MUTEX ****/
std::multimap<uint32_t, pqiServiceMonitor *>::const_iterator sit; std::multimap<uint32_t, pqiServiceMonitor *>::const_iterator sit;
for(sit = mMonitors.begin(); sit != mMonitors.end(); sit++) for(sit = mMonitors.begin(); sit != mMonitors.end(); sit++)
{ {
sit->second->statusChange(friendNotifications); sit->second->statusChange(friendNotifications);
@ -888,7 +892,7 @@ void p3ServiceControl::notifyAboutFriends()
void p3ServiceControl::notifyServices() void p3ServiceControl::notifyServices()
{ {
std::map<uint32_t, ServiceNotifications> notifications; std::map<uint32_t, ServiceNotifications> notifications;
{ {
RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/ RsStackMutex stack(mCtrlMtx); /***** LOCK STACK MUTEX ****/
@ -906,8 +910,8 @@ void p3ServiceControl::notifyServices()
{ {
RsStackMutex stack(mMonitorMtx); /***** LOCK STACK MUTEX ****/ RsStackMutex stack(mMonitorMtx); /***** LOCK STACK MUTEX ****/
std::map<uint32_t, ServiceNotifications>::const_iterator it; std::map<uint32_t, ServiceNotifications>::const_iterator it;
std::multimap<uint32_t, pqiServiceMonitor *>::const_iterator sit, eit; std::multimap<uint32_t, pqiServiceMonitor *>::const_iterator sit, eit;
for(it = notifications.begin(); it != notifications.end(); it++) for(it = notifications.begin(); it != notifications.end(); it++)
{ {
std::cerr << "p3ServiceControl::notifyServices(): Notifications for Service: " << it->first; std::cerr << "p3ServiceControl::notifyServices(): Notifications for Service: " << it->first;
@ -993,12 +997,12 @@ bool RsServicePermissions::peerHasPermission(const RsPeerId &peerId) const
} }
RsServiceInfo::RsServiceInfo( RsServiceInfo::RsServiceInfo(
const uint16_t service_type, const uint16_t service_type,
const std::string service_name, const std::string service_name,
const uint16_t version_major, const uint16_t version_major,
const uint16_t version_minor, const uint16_t version_minor,
const uint16_t min_version_major, const uint16_t min_version_major,
const uint16_t min_version_minor) const uint16_t min_version_minor)
:mServiceName(service_name), :mServiceName(service_name),
mServiceType((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) service_type) << 8)), mServiceType((((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + (((uint32_t) service_type) << 8)),
mVersionMajor(version_major), mVersionMajor(version_major),
@ -1025,7 +1029,7 @@ std::ostream &operator<<(std::ostream &out, const RsPeerServiceInfo &info)
{ {
out << "RsPeerServiceInfo(" << info.mPeerId << ")"; out << "RsPeerServiceInfo(" << info.mPeerId << ")";
out << std::endl; out << std::endl;
std::map<uint32_t, RsServiceInfo>::const_iterator it; std::map<uint32_t, RsServiceInfo>::const_iterator it;
for(it = info.mServiceList.begin(); it != info.mServiceList.end(); it++) for(it = info.mServiceList.begin(); it != info.mServiceList.end(); it++)
{ {
out << "\t Service:" << it->first << " : "; out << "\t Service:" << it->first << " : ";
@ -1046,13 +1050,13 @@ std::ostream &operator<<(std::ostream &out, const RsServiceInfo &info)
std::ostream &operator<<(std::ostream &out, const ServicePeerFilter &filter) std::ostream &operator<<(std::ostream &out, const ServicePeerFilter &filter)
{ {
out << "ServicePeerFilter DenyAll: " << filter.mDenyAll; out << "ServicePeerFilter DenyAll: " << filter.mDenyAll;
out << " AllowAll: " << filter.mAllowAll; out << " AllowAll: " << filter.mAllowAll;
out << " Matched Services: "; out << " Matched Services: ";
std::set<uint32_t>::const_iterator it; std::set<uint32_t>::const_iterator it;
for(it = filter.mAllowedServices.begin(); it != filter.mAllowedServices.end(); it++) for(it = filter.mAllowedServices.begin(); it != filter.mAllowedServices.end(); it++)
{ {
out << *it << " "; out << *it << " ";
} }
out << std::endl; out << std::endl;
return out; return out;

5
libretroshare/src/pqi/p3servicecontrol.h
View File

@ -34,6 +34,7 @@
#include "pqi/p3cfgmgr.h" #include "pqi/p3cfgmgr.h"
#include "pqi/pqimonitor.h" #include "pqi/pqimonitor.h"
#include "pqi/pqiservicemonitor.h" #include "pqi/pqiservicemonitor.h"
#include "pqi/p3linkmgr.h"
class ServiceNotifications class ServiceNotifications
{ {
@ -61,7 +62,7 @@ public:
/** /**
*/ */
p3ServiceControl(uint32_t configId); p3ServiceControl(p3LinkMgr *linkMgr, uint32_t configId);
/** /**
* checks and update all added configurations * checks and update all added configurations
@ -129,6 +130,7 @@ void notifyAboutFriends();
bool createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn); bool createDefaultPermissions_locked(uint32_t serviceId, std::string serviceName, bool defaultOn);
bool updateAllFilters(); bool updateAllFilters();
bool updateAllFilters_locked();
bool updateFilterByPeer(const RsPeerId &peerId); bool updateFilterByPeer(const RsPeerId &peerId);
bool updateFilterByPeer_locked(const RsPeerId &peerId); bool updateFilterByPeer_locked(const RsPeerId &peerId);
@ -145,6 +147,7 @@ void updatePeerRemoved(const RsPeerId &peerId);
bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t serviceId); bool peerHasPermissionForService_locked(const RsPeerId &peerId, uint32_t serviceId);
p3LinkMgr *mLinkMgr;
RsMutex mCtrlMtx; /* below is protected */ RsMutex mCtrlMtx; /* below is protected */

2
libretroshare/src/rsserver/rsinit.cc
View File

@ -1222,7 +1222,7 @@ int RsServer::StartupRetroShare()
/**************************** BITDHT ***********************************/ /**************************** BITDHT ***********************************/
p3ServiceControl *serviceCtrl = new p3ServiceControl(0); p3ServiceControl *serviceCtrl = new p3ServiceControl(mLinkMgr, 0);
rsServiceControl = serviceCtrl; rsServiceControl = serviceCtrl;
SecurityPolicy *none = secpolicy_create(); SecurityPolicy *none = secpolicy_create();