From 636635a8b85803ee53779095f5eea42af37d8f6c Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 30 Jun 2015 08:12:51 +0000 Subject: [PATCH] disable update of group messages for IdService since it is unused and takes some bandwidth git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8572 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsgxsnetservice.cc | 7 +++++-- libretroshare/src/gxs/rsgxsnetservice.h | 13 +++++++------ libretroshare/src/rsserver/rsinit.cc | 3 ++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc index ed37b8745..ff70fe89e 100644 --- a/libretroshare/src/gxs/rsgxsnetservice.cc +++ b/libretroshare/src/gxs/rsgxsnetservice.cc @@ -61,13 +61,13 @@ RsGxsNetService::RsGxsNetService(uint16_t servType, RsGeneralDataService *gds, RsNxsNetMgr *netMgr, RsNxsObserver *nxsObs, const RsServiceInfo serviceInfo, RsGixsReputation* reputations, RsGcxs* circles, - PgpAuxUtils *pgpUtils, bool grpAutoSync) + PgpAuxUtils *pgpUtils, bool grpAutoSync,bool msgAutoSync) : p3ThreadedService(), p3Config(), mTransactionN(0), mObserver(nxsObs), mDataStore(gds), mServType(servType), mTransactionTimeOut(TRANSAC_TIMEOUT), mNetMgr(netMgr), mNxsMutex("RsGxsNetService"), mSyncTs(0), mLastKeyPublishTs(0), mSYNC_PERIOD(SYNC_PERIOD), mCircles(circles), mReputations(reputations), mPgpUtils(pgpUtils), - mGrpAutoSync(grpAutoSync), mGrpServerUpdateItem(NULL), + mGrpAutoSync(grpAutoSync),mAllowMsgSync(msgAutoSync), mGrpServerUpdateItem(NULL), mServiceInfo(serviceInfo) { @@ -264,6 +264,9 @@ void RsGxsNetService::syncWithPeers() sendItem(grp); } + if(!mAllowMsgSync) + return ; + #ifndef GXS_DISABLE_SYNC_MSGS typedef std::map GrpMetaMap; diff --git a/libretroshare/src/gxs/rsgxsnetservice.h b/libretroshare/src/gxs/rsgxsnetservice.h index 4d6173aeb..30df2a8ff 100644 --- a/libretroshare/src/gxs/rsgxsnetservice.h +++ b/libretroshare/src/gxs/rsgxsnetservice.h @@ -87,12 +87,12 @@ public: * arrive */ RsGxsNetService(uint16_t servType, RsGeneralDataService *gds, - RsNxsNetMgr *netMgr, - RsNxsObserver *nxsObs, // used to be = NULL. - const RsServiceInfo serviceInfo, - RsGixsReputation* reputations = NULL, RsGcxs* circles = NULL, - PgpAuxUtils *pgpUtils = NULL, - bool grpAutoSync = true); + RsNxsNetMgr *netMgr, + RsNxsObserver *nxsObs, // used to be = NULL. + const RsServiceInfo serviceInfo, + RsGixsReputation* reputations = NULL, RsGcxs* circles = NULL, + PgpAuxUtils *pgpUtils = NULL, + bool grpAutoSync = true, bool msgAutoSync = true); virtual ~RsGxsNetService(); @@ -483,6 +483,7 @@ private: RsGixsReputation* mReputations; PgpAuxUtils *mPgpUtils; bool mGrpAutoSync; + bool mAllowMsgSync; // need to be verfied std::vector mPendingResp; diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index 735732668..23f9ab317 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -1325,7 +1325,8 @@ int RsServer::StartupRetroShare() mGxsIdService, mGxsIdService->getServiceInfo(), mGxsIdService, mGxsCircles, pgpAuxUtils, - false); // don't synchronise group automatic (need explicit group request) + false,false); // don't synchronise group automatic (need explicit group request) + // don't sync messages at all. mGxsIdService->setNes(gxsid_ns); /**** GxsCircle service ****/