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

Refactored GXS interface to remove exposure to RS internals (i.e. only reference types, declaration in retroshare folder)

Browse Source 
To achieve this I created second interface RsGxsIface which RsGxsGenExchange derives from, and RsGxsIfaceImpl (renamed RsGxsIfaceHelper) now takes an instance of this instead so these interfaces don't exposed the RsGenExchange and its underlying types. 

The other stuff is simply definitions and type aliases required for the front-ends to work (RsGroupMeta, RsGroupId, etc) and I've moved gxs flags also. 

This is a good idea as it seem much more clear what's available to a GXS service (apart from RsGenExchange public methods).  


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2013-02-28 21:58:38 +00:00
parent 5ccfed1cf4
commit 50c75de73c
46 changed files with 573 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libretroshare/src/gxs/gxscoreserver.cc
View File

@ -1,77 +0,0 @@
/*
* libretroshare/src/gxs: gxscoreserver.cc
*
* General Data service, interface for RetroShare.
*
* Copyright 2011-2011 by Evi-Parker Christopher
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include <unistd.h>
#include "gxscoreserver.h"
GxsCoreServer::GxsCoreServer()
: mGxsMutex("GxsCoreServer")
{
}
GxsCoreServer::~GxsCoreServer()
{
std::set<RsGxsService*>::iterator sit;
for(sit = mGxsServices.begin(); sit != mGxsServices.end(); sit++)
delete *sit;
}
void GxsCoreServer::run()
{
std::set<RsGxsService*>::iterator sit;
double timeDelta = 0.02;
while(isRunning())
{
for(sit = mGxsServices.begin(); sit != mGxsServices.end(); sit++)
(*sit)->tick();
#ifndef WINDOWS_SYS
usleep((int) (timeDelta * 1000000));
#else
Sleep((int) (timeDelta * 1000));
#endif
}
}
void GxsCoreServer::addService(RsGxsService* service)
{
mGxsServices.insert(service);
}
bool GxsCoreServer::removeService(RsGxsService* service)
{
return (mGxsServices.erase(service) > 0);
}

50
libretroshare/src/gxs/gxscoreserver.h
View File

@ -1,50 +0,0 @@
#ifndef GXSCORESERVER_H_
#define GXSCORESERVER_H_
/*
* libretroshare/src/gxs: gxscoreserver.h
*
* General Data service, interface for RetroShare.
*
* Copyright 2011-2011 by Evi-Parker Christopher
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "util/rsthreads.h"
#include "gxs/rsgxs.h"
class GxsCoreServer : public RsThread
{
public:
GxsCoreServer();
~GxsCoreServer();
void run();
void addService(RsGxsService* service);
bool removeService(RsGxsService* service);
private:
std::set<RsGxsService*> mGxsServices;
RsMutex mGxsMutex;
};
#endif /* GXSCORESERVER_H_ */

94
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -35,7 +35,7 @@
#include "rsgenexchange.h"
#include "gxssecurity.h"
#include "util/contentvalue.h"
#include "rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "rsgixs.h"
@ -676,6 +676,96 @@ bool RsGenExchange::checkMsgAuthenFlag(const PrivacyBitPos& pos, const uint8_t&
}
}
void RsGenExchange::receiveChanges(std::vector<RsGxsNotify*>& changes)
{
RsStackMutex stack(mGenMtx);
std::vector<RsGxsNotify*>::iterator vit = changes.begin();
for(; vit != changes.end(); vit++)
{
RsGxsNotify* n = *vit;
RsGxsGroupChange* gc;
RsGxsMsgChange* mc;
if((mc = dynamic_cast<RsGxsMsgChange*>(n)) != NULL)
{
mMsgChange.push_back(mc);
}
else if((gc = dynamic_cast<RsGxsGroupChange*>(n)) != NULL)
{
mGroupChange.push_back(gc);
}
else
{
delete n;
}
}
}
void RsGenExchange::msgsChanged(std::map<RsGxsGroupId,
std::vector<RsGxsMessageId> >& msgs)
{
RsStackMutex stack(mGenMtx);
while(!mMsgChange.empty())
{
RsGxsMsgChange* mc = mMsgChange.back();
msgs = mc->msgChangeMap;
mMsgChange.pop_back();
delete mc;
}
}
void RsGenExchange::groupsChanged(std::list<RsGxsGroupId>& grpIds)
{
RsStackMutex stack(mGenMtx);
while(!mGroupChange.empty())
{
RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->mGrpIdList;
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); lit++)
grpIds.push_back(*lit);
mGroupChange.pop_back();
delete gc;
}
}
bool RsGenExchange::subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe)
{
if(subscribe)
setGroupSubscribeFlags(token, grpId, GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED, GXS_SERV::GROUP_SUBSCRIBE_MASK);
else
setGroupSubscribeFlags(token, grpId, 0, GXS_SERV::GROUP_SUBSCRIBE_MASK);
return true;
}
bool RsGenExchange::updated(bool willCallGrpChanged, bool willCallMsgChanged)
{
bool changed = false;
{
RsStackMutex stack(mGenMtx);
changed = (!mGroupChange.empty() || !mMsgChange.empty());
}
if(!willCallGrpChanged)
{
std::list<RsGxsGroupId> grpIds;
groupsChanged(grpIds);
}
if(!willCallMsgChanged)
{
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
msgsChanged(msgs);
}
return changed;
}
bool RsGenExchange::getGroupList(const uint32_t &token, std::list<RsGxsGroupId> &groupIds)
{
return mDataAccess->getGroupList(token, groupIds);
@ -1698,7 +1788,7 @@ void RsGenExchange::processRecvdGroups()
if(!grpIds.empty())
{
RsGxsGroupChange* c = new RsGxsGroupChange();
c->grpIdList = grpIds;
c->mGrpIdList = grpIds;
mNotifications.push_back(c);
mDataStore->storeGroup(grps);
}

52
libretroshare/src/gxs/rsgenexchange.h
View File

@ -32,6 +32,7 @@
#include "rsgxs.h"
#include "rsgds.h"
#include "rsnxs.h"
#include "retroshare/rsgxsiface.h"
#include "rsgxsdataaccess.h"
#include "rsnxsobserver.h"
#include "retroshare/rsgxsservice.h"
@ -40,8 +41,7 @@
typedef std::map<RsGxsGroupId, std::vector<RsGxsMsgItem*> > GxsMsgDataMap;
typedef std::map<RsGxsGroupId, RsGxsGrpItem*> GxsGroupDataMap;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMsgItem*> > GxsMsgRelatedDataMap;
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMetaMap;
/*!
* This should form the parent class to \n
@ -65,7 +65,7 @@ typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMe
class RsGixs;
class RsGenExchange : public RsGxsService, public RsNxsObserver, public RsThread
class RsGenExchange : public RsNxsObserver, public RsThread, public RsGxsIface
{
public:
@ -112,7 +112,6 @@ public:
*/
virtual void service_tick() = 0;
/*!
*
* @return handle to token service handle for making
@ -190,8 +189,51 @@ public:
bool getMsgRelatedMeta(const uint32_t &token, GxsMsgRelatedMetaMap& msgMeta);
/*!
* Gxs services should call this for automatic handling of
* changes, send
* @param changes
*/
virtual void receiveChanges(std::vector<RsGxsNotify*>& changes);
/*!
* Checks to see if a change has been received for
* for a message or group
* @param willCallGrpChanged if this is set to true, group changed function will return list
* groups that have changed, if false, the group changed list is cleared
* @param willCallMsgChanged if this is set to true, msgChanged function will return map
* messages that have changed, if false, the message changed map is cleared
* @return true if a change has occured for msg or group
* @see groupsChanged
* @see msgsChanged
*/
bool updated(bool willCallGrpChanged = false, bool willCallMsgChanged = false);
/*!
* The groups changed. \n
* class can reimplement to use to tailor
* the group actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes
* this function does nothing
* @param grpIds returns list of grpIds that have changed
* @see updated
*/
void groupsChanged(std::list<RsGxsGroupId>& grpIds);
/*!
* The msg changed. \n
* class can reimplement to use to tailor
* the msg actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes
* this function does nothing
* @param msgs returns map of message ids that have changed
* @see updated
*/
void msgsChanged(std::map<RsGxsGroupId,
std::vector<RsGxsMessageId> >& msgs);
bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe);
protected:
/*!
@ -563,6 +605,8 @@ private:
private:
std::vector<RsGxsNotify*> mChanges;
std::vector<RsGxsGroupChange*> mGroupChange;
std::vector<RsGxsMsgChange*> mMsgChange;
};
#endif // RSGENEXCHANGE_H

17
libretroshare/src/gxs/rsgxs.h
View File

@ -36,25 +36,8 @@
/* data types used throughout Gxs from netservice to genexchange */
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgReq;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgIdResult;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMsgMetaData*> > GxsMsgMetaResult;
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > MsgMetaResult;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMsgMetaData*> > MsgRelatedMetaResult;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMessageId> > MsgRelatedIdResult;
class RsGxsService
{
public:
RsGxsService(){}
virtual ~RsGxsService(){}
virtual void tick() = 0;
};
#endif // RSGXS_H

1
libretroshare/src/gxs/rsgxsdata.h
View File

@ -34,7 +34,6 @@
typedef std::string RsGxsGroupId;
typedef std::string RsGxsMessageId;
typedef std::pair<RsGxsGroupId, RsGxsMessageId> RsGxsGrpMsgIdPair;
class RsGroupMetaData;
class RsMsgMetaData;

185
libretroshare/src/gxs/rsgxsifaceimpl.cc
View File

@ -1,185 +0,0 @@
/*
* libretroshare/src/gxs/rsgxsifaceimpl.cc: rsgxsifaceimpl.cc
*
* RetroShare GXS.
*
* Copyright 2012 by Christopher Evi-Parker
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#include "rsgxsifaceimpl.h"
#include "gxs/rsgxs.h"
#include "gxs/rsgxsflags.h"
RsGxsIfaceImpl::RsGxsIfaceImpl(RsGenExchange *gxs)
: mGxsIfaceMutex("RsGxsIfaceImpl"), mGxs(gxs)
{
}
void RsGxsIfaceImpl::groupsChanged(std::list<RsGxsGroupId> &grpIds)
{
RsStackMutex stack(mGxsIfaceMutex);
while(!mGroupChange.empty())
{
RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->grpIdList;
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); lit++)
grpIds.push_back(*lit);
mGroupChange.pop_back();
delete gc;
}
}
bool RsGxsIfaceImpl::updated(bool willCallGrpChanged, bool willCallMsgChanged)
{
bool changed = false;
{
RsStackMutex stack(mGxsIfaceMutex);
changed = (!mGroupChange.empty() || !mMsgChange.empty());
}
if(!willCallGrpChanged)
{
std::list<RsGxsGroupId> grpIds;
groupsChanged(grpIds);
}
if(!willCallMsgChanged)
{
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgs;
msgsChanged(msgs);
}
return changed;
}
void RsGxsIfaceImpl::msgsChanged(std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > &msgs)
{
RsStackMutex stack(mGxsIfaceMutex);
while(!mMsgChange.empty())
{
RsGxsMsgChange* mc = mMsgChange.back();
msgs = mc->msgChangeMap;
mMsgChange.pop_back();
delete mc;
}
}
void RsGxsIfaceImpl::receiveChanges(std::vector<RsGxsNotify *> &changes)
{
RsStackMutex stack(mGxsIfaceMutex);
std::vector<RsGxsNotify*>::iterator vit = changes.begin();
for(; vit != changes.end(); vit++)
{
RsGxsNotify* n = *vit;
RsGxsGroupChange* gc;
RsGxsMsgChange* mc;
if((mc = dynamic_cast<RsGxsMsgChange*>(n)) != NULL)
{
mMsgChange.push_back(mc);
}
else if((gc = dynamic_cast<RsGxsGroupChange*>(n)) != NULL)
{
mGroupChange.push_back(gc);
}
else
{
delete n;
}
}
}
RsTokenService* RsGxsIfaceImpl::getTokenService()
{
return mGxs->getTokenService();
}
bool RsGxsIfaceImpl::getGroupList(const uint32_t &token,
std::list<RsGxsGroupId> &groupIds)
{
return mGxs->getGroupList(token, groupIds);
}
bool RsGxsIfaceImpl::getMsgList(const uint32_t &token,
GxsMsgIdResult& msgIds)
{
return mGxs->getMsgList(token, msgIds);
}
bool RsGxsIfaceImpl::getMsgRelatedList(const uint32_t &token, MsgRelatedIdResult &msgIds)
{
return mGxs->getMsgRelatedList(token, msgIds);
}
/* Generic Summary */
bool RsGxsIfaceImpl::getGroupSummary(const uint32_t &token,
std::list<RsGroupMetaData> &groupInfo)
{
return mGxs->getGroupMeta(token, groupInfo);
}
bool RsGxsIfaceImpl::getMsgSummary(const uint32_t &token,
GxsMsgMetaMap &msgInfo)
{
return mGxs->getMsgMeta(token, msgInfo);
}
bool RsGxsIfaceImpl::getMsgrelatedSummary(const uint32_t &token, GxsMsgRelatedMetaMap &msgInfo)
{
return mGxs->getMsgRelatedMeta(token, msgInfo);
}
bool RsGxsIfaceImpl::subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe)
{
if(subscribe)
mGxs->setGroupSubscribeFlags(token, grpId, GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED, GXS_SERV::GROUP_SUBSCRIBE_MASK);
else
mGxs->setGroupSubscribeFlags(token, grpId, 0, GXS_SERV::GROUP_SUBSCRIBE_MASK);
return true;
}
bool RsGxsIfaceImpl::acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId)
{
return mGxs->acknowledgeTokenMsg(token, msgId);
}
bool RsGxsIfaceImpl::acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId)
{
return mGxs->acknowledgeTokenGrp(token, grpId);
}

2
libretroshare/src/gxs/rsgxsnetservice.cc
View File

@ -28,7 +28,7 @@
#include <math.h>
#include "rsgxsnetservice.h"
#include "rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
/**
* #define NXS_NET_DEBUG 1

6
libretroshare/src/gxs/rstokenservice.h
View File

@ -30,8 +30,8 @@
#include <string>
#include <list>
#include "serialiser/rsgxsitems.h"
#include "gxs/rsgxs.h"
//#include "gxs/rsgxs.h"
#include "retroshare/rsgxsifacetypes.h"
#define GXS_REQUEST_TYPE_GROUP_DATA 0x00010000
#define GXS_REQUEST_TYPE_GROUP_META 0x00020000
@ -66,8 +66,6 @@
#define RS_TOKREQ_ANSTYPE_ACK 0x0004
/*!
* This class provides useful generic support for GXS style services.
* I expect much of this will be incorporated into the base GXS.

10
libretroshare/src/libretroshare.pro
View File

@ -238,7 +238,6 @@ win32 {
SQLITE_DIR = ../../../sqlite-autoconf-3070900
INCLUDEPATH += $${SQLITE_DIR}
}
}
@ -623,7 +622,8 @@ gxs {
gxs/rsgxs.h \
gxs/rsdataservice.h \
gxs/rsgxsnetservice.h \
gxs/rsgxsflags.h \
retroshare/rsgxsflags.h \
retroshare/rsgxsifacetypes.h \
gxs/rsgenexchange.h \
gxs/rsnxsobserver.h \
gxs/rsgxsdata.h \
@ -633,10 +633,10 @@ gxs {
serialiser/rsgxsitems.h \
util/retrodb.h \
util/contentvalue.h \
gxs/gxscoreserver.h \
gxs/gxssecurity.h \
gxs/rsgxsifaceimpl.h \
gxs/rsgxsifacehelper.h \
gxs/gxstokenqueue.h \
gxs/rsgxsiface.h
SOURCES += serialiser/rsnxsitems.cc \
@ -648,9 +648,7 @@ gxs {
gxs/rsgxsdataaccess.cc \
util/retrodb.cc \
util/contentvalue.cc \
gxs/gxscoreserver.cc \
gxs/gxssecurity.cc \
gxs/rsgxsifaceimpl.cc \
gxs/gxstokenqueue.cc \
# Identity Service

9
libretroshare/src/retroshare/rsgxscircles.h
View File

@ -29,9 +29,10 @@
#include <inttypes.h>
#include <string>
#include <list>
#include <set>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
#include "retroshare/rsidentity.h"
@ -100,12 +101,12 @@ class RsGxsCircleDetails
class RsGxsCircles: public RsGxsIfaceImpl
class RsGxsCircles: public RsGxsIfaceHelper
{
public:
RsGxsCircles(RsGenExchange *gxs)
:RsGxsIfaceImpl(gxs) { return; }
RsGxsCircles(RsGxsIface *gxs)
:RsGxsIfaceHelper(gxs) { return; }
virtual ~RsGxsCircles() { return; }

2
libretroshare/src/gxs/rsgxsflags.h → libretroshare/src/retroshare/rsgxsflags.h
View File

@ -16,8 +16,6 @@
*/
namespace GXS_SERV {
/** START privacy **/
static const uint32_t FLAG_PRIVACY_MASK = 0x0000000f;

8
libretroshare/src/retroshare/rsgxsforums.h
View File

@ -31,7 +31,7 @@
#include <list>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
@ -59,12 +59,12 @@ class RsGxsForumMsg
std::ostream &operator<<(std::ostream &out, const RsGxsForumGroup &group);
std::ostream &operator<<(std::ostream &out, const RsGxsForumMsg &msg);
class RsGxsForums: public RsGxsIfaceImpl
class RsGxsForums: public RsGxsIfaceHelper
{
public:
RsGxsForums(RsGenExchange *gxs)
:RsGxsIfaceImpl(gxs) { return; }
RsGxsForums(RsGxsIface *gxs)
:RsGxsIfaceHelper(gxs) { return; }
virtual ~RsGxsForums() { return; }
/* Specific Service Data */

176
libretroshare/src/retroshare/rsgxsiface.h Normal file
View File

@ -0,0 +1,176 @@
/*
* libretroshare/src/gxs/: rsgxsifaceimpl.h
*
* RetroShare GXS. RsGxsIface
*
* Copyright 2012 by Christopher Evi-Parker
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License Version 2 as published by the Free Software Foundation.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA.
*
* Please report all bugs and problems to "retroshare@lunamutt.com".
*
*/
#ifndef RSGXSIFACE_H_
#define RSGXSIFACE_H_
#include "retroshare/rsgxsservice.h"
#include "gxs/rsgxsdata.h"
#include "retroshare/rsgxsifacetypes.h"
/*!
* All implementations must offer thread safety
*/
class RsGxsIface
{
public:
virtual ~RsGxsIface(){};
public:
/*!
* Gxs services should call this for automatic handling of
* changes, send
* @param changes
*/
virtual void receiveChanges(std::vector<RsGxsNotify*>& changes) = 0;
/*!
* Checks to see if a change has been received for
* for a message or group
* @param willCallGrpChanged if this is set to true, group changed function will return list
* groups that have changed, if false, the group changed list is cleared
* @param willCallMsgChanged if this is set to true, msgChanged function will return map
* messages that have changed, if false, the message changed map is cleared
* @return true if a change has occured for msg or group
* @see groupsChanged
* @see msgsChanged
*/
virtual bool updated(bool willCallGrpChanged = false, bool willCallMsgChanged = false) = 0;
/*!
* The groups changed. \n
* class can reimplement to use to tailor
* the group actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes
* this function does nothing
* @param grpIds returns list of grpIds that have changed
* @see updated
*/
virtual void groupsChanged(std::list<RsGxsGroupId>& grpIds) = 0;
/*!
* The msg changed. \n
* class can reimplement to use to tailor
* the msg actually set for ui notification.
* If receivedChanges is not passed RsGxsNotify changes
* this function does nothing
* @param msgs returns map of message ids that have changed
* @see updated
*/
virtual void msgsChanged(std::map<RsGxsGroupId,
std::vector<RsGxsMessageId> >& msgs) = 0;
/*!
* @return handle to token service for this GXS service
*/
virtual RsTokenService* getTokenService() = 0;
/* Generic Lists */
/*!
* Retrieve list of group ids associated to a request token
* @param token token to be redeemed for this request
* @param groupIds the ids return for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getGroupList(const uint32_t &token,
std::list<RsGxsGroupId> &groupIds) = 0;
/*!
* Retrieves list of msg ids associated to a request token
* @param token token to be redeemed for this request
* @param msgIds the ids return for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getMsgList(const uint32_t &token,
GxsMsgIdResult& msgIds) = 0;
/*!
* Retrieves list of msg related ids associated to a request token
* @param token token to be redeemed for this request
* @param msgIds the ids return for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getMsgRelatedList(const uint32_t &token,
MsgRelatedIdResult& msgIds) = 0;
/*!
* @param token token to be redeemed for group summary request
* @param groupInfo the ids returned for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getGroupMeta(const uint32_t &token,
std::list<RsGroupMetaData> &groupInfo) = 0;
/*!
* @param token token to be redeemed for message summary request
* @param msgInfo the message metadata returned for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getMsgMeta(const uint32_t &token,
GxsMsgMetaMap &msgInfo) = 0;
/*!
* @param token token to be redeemed for message related summary request
* @param msgInfo the message metadata returned for given request token
* @return false if request token is invalid, check token status for error report
*/
virtual bool getMsgRelatedMeta(const uint32_t &token,
GxsMsgRelatedMetaMap &msgInfo) = 0;
/*!
* subscribes to group, and returns token which can be used
* to be acknowledged to get group Id
* @param token token to redeem for acknowledgement
* @param grpId the id of the group to subscribe to
*/
virtual bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe) = 0;
/*!
* This allows the client service to acknowledge that their msgs has
* been created/modified and retrieve the create/modified msg ids
* @param token the token related to modification/create request
* @param msgIds map of grpid->msgIds of message created/modified
* @return true if token exists false otherwise
*/
virtual bool acknowledgeTokenMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId) = 0;
/*!
* This allows the client service to acknowledge that their grps has
* been created/modified and retrieve the create/modified grp ids
* @param token the token related to modification/create request
* @param msgIds vector of ids of groups created/modified
* @return true if token exists false otherwise
*/
virtual bool acknowledgeTokenGrp(const uint32_t& token, RsGxsGroupId& grpId) = 0;
};
#endif /* RSGXSIFACE_H_ */

96
libretroshare/src/gxs/rsgxsifaceimpl.h → libretroshare/src/retroshare/rsgxsifacehelper.h
View File

@ -26,7 +26,8 @@
*
*/
#include "gxs/rsgenexchange.h"
#include "retroshare/rsgxsiface.h"
#include "rsgxsflags.h"
/*!
* The simple idea of this class is to implement the simple interface functions
@ -36,7 +37,7 @@
* - subscription to groups
* - retrieval of msgs and group ids and meta info
*/
class RsGxsIfaceImpl
class RsGxsIfaceHelper
{
public:
@ -44,17 +45,21 @@ public:
*
* @param gxs handle to RsGenExchange instance of service (Usually the service class itself)
*/
RsGxsIfaceImpl(RsGenExchange* gxs);
RsGxsIfaceHelper(RsGxsIface* gxs)
: mGxs(gxs)
{}
~RsGxsIfaceHelper(){}
protected:
/*!
* Gxs services should call this for automatic handling of
* changes, send
* @param changes
*/
void receiveChanges(std::vector<RsGxsNotify*>& changes);
public:
void receiveChanges(std::vector<RsGxsNotify *> &changes)
{
mGxs->receiveChanges(changes);
}
/*!
* Checks to see if a change has been received for
@ -67,7 +72,10 @@ public:
* @see groupsChanged
* @see msgsChanged
*/
virtual bool updated(bool willCallGrpChanged = false, bool willCallMsgChanged = false);
bool updated(bool willCallGrpChanged = false, bool willCallMsgChanged = false)
{
return mGxs->updated(willCallGrpChanged, willCallMsgChanged);
}
/*!
* The groups changed. \n
@ -78,7 +86,10 @@ public:
* @param grpIds returns list of grpIds that have changed
* @see updated
*/
virtual void groupsChanged(std::list<RsGxsGroupId>& grpIds);
void groupsChanged(std::list<RsGxsGroupId> &grpIds)
{
mGxs->groupsChanged(grpIds);
}
/*!
* The msg changed. \n
@ -89,13 +100,17 @@ public:
* @param msgs returns map of message ids that have changed
* @see updated
*/
virtual void msgsChanged(std::map<RsGxsGroupId,
std::vector<RsGxsMessageId> >& msgs);
void msgsChanged(std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > &msgs)
{
mGxs->msgsChanged(msgs);
}
/*!
* @return handle to token service for this GXS service
*/
RsTokenService* getTokenService();
RsTokenService* getTokenService()
{
return mGxs->getTokenService();
}
/* Generic Lists */
@ -106,7 +121,10 @@ public:
* @return false if request token is invalid, check token status for error report
*/
bool getGroupList(const uint32_t &token,
std::list<RsGxsGroupId> &groupIds);
std::list<RsGxsGroupId> &groupIds)
{
return mGxs->getGroupList(token, groupIds);
}
/*!
* Retrieves list of msg ids associated to a request token
@ -115,7 +133,10 @@ public:
* @return false if request token is invalid, check token status for error report
*/
bool getMsgList(const uint32_t &token,
GxsMsgIdResult& msgIds);
GxsMsgIdResult& msgIds)
{
return mGxs->getMsgList(token, msgIds);
}
/*!
* Retrieves list of msg related ids associated to a request token
@ -123,8 +144,10 @@ public:
* @param msgIds the ids return for given request token
* @return false if request token is invalid, check token status for error report
*/
bool getMsgRelatedList(const uint32_t &token,
MsgRelatedIdResult& msgIds);
bool getMsgRelatedList(const uint32_t &token, MsgRelatedIdResult &msgIds)
{
return mGxs->getMsgRelatedList(token, msgIds);
}
/*!
* @param token token to be redeemed for group summary request
@ -132,7 +155,10 @@ public:
* @return false if request token is invalid, check token status for error report
*/
bool getGroupSummary(const uint32_t &token,
std::list<RsGroupMetaData> &groupInfo);
std::list<RsGroupMetaData> &groupInfo)
{
return mGxs->getGroupMeta(token, groupInfo);
}
/*!
* @param token token to be redeemed for message summary request
@ -140,15 +166,20 @@ public:
* @return false if request token is invalid, check token status for error report
*/
bool getMsgSummary(const uint32_t &token,
GxsMsgMetaMap &msgInfo);
GxsMsgMetaMap &msgInfo)
{
return mGxs->getMsgMeta(token, msgInfo);
}
/*!
* @param token token to be redeemed for message related summary request
* @param msgInfo the message metadata returned for given request token
* @return false if request token is invalid, check token status for error report
*/
bool getMsgrelatedSummary(const uint32_t &token,
GxsMsgRelatedMetaMap &msgInfo);
bool getMsgrelatedSummary(const uint32_t &token, GxsMsgRelatedMetaMap &msgInfo)
{
return mGxs->getMsgRelatedMeta(token, msgInfo);
}
/*!
* subscribes to group, and returns token which can be used
@ -156,7 +187,10 @@ public:
* @param token token to redeem for acknowledgement
* @param grpId the id of the group to subscribe to
*/
virtual bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe);
bool subscribeToGroup(uint32_t& token, const RsGxsGroupId& grpId, bool subscribe)
{
return mGxs->subscribeToGroup(token, grpId, subscribe);
}
/*!
* This allows the client service to acknowledge that their msgs has
@ -165,7 +199,10 @@ public:
* @param msgIds map of grpid->msgIds of message created/modified
* @return true if token exists false otherwise
*/
bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId);
bool acknowledgeMsg(const uint32_t& token, std::pair<RsGxsGroupId, RsGxsMessageId>& msgId)
{
return mGxs->acknowledgeTokenMsg(token, msgId);
}
/*!
* This allows the client service to acknowledge that their grps has
@ -174,17 +211,14 @@ public:
* @param msgIds vector of ids of groups created/modified
* @return true if token exists false otherwise
*/
bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId);
bool acknowledgeGrp(const uint32_t& token, RsGxsGroupId& grpId)
{
return mGxs->acknowledgeTokenGrp(token, grpId);
}
private:
RsGenExchange* mGxs;
std::vector<RsGxsGroupChange*> mGroupChange;
std::vector<RsGxsMsgChange*> mMsgChange;
RsMutex mGxsIfaceMutex;
RsGxsIface* mGxs;
};
#endif // RSGXSIFACEIMPL_H

125
libretroshare/src/retroshare/rsgxsifacetypes.h Normal file
View File

@ -0,0 +1,125 @@
/*
* rsgxsifacetypes.h
*
* Created on: 28 Feb 2013
* Author: crispy
*/
#ifndef RSGXSIFACETYPES_H_
#define RSGXSIFACETYPES_H_
#include <map>
#include <vector>
typedef std::string RsGxsGroupId;
typedef std::string RsGxsMessageId;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgIdResult;
typedef std::pair<RsGxsGroupId, RsGxsMessageId> RsGxsGrpMsgIdPair;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsGxsMessageId> > MsgRelatedIdResult;
typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgReq;
class RsMsgMetaData;
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > MsgMetaResult;
class RsGxsGrpMetaData;
class RsGxsMsgMetaData;
class RsGroupMetaData
{
public:
RsGroupMetaData()
{
mGroupFlags = 0;
mSubscribeFlags = 0;
mPop = 0;
mMsgCount = 0;
mLastPost = 0;
mGroupStatus = 0;
mCircleType = 0;
//mPublishTs = 0;
}
void operator =(const RsGxsGrpMetaData& rGxsMeta);
std::string mGroupId;
std::string mGroupName;
uint32_t mGroupFlags;
uint32_t mSignFlags; // Combination of RSGXS_GROUP_SIGN_PUBLISH_MASK & RSGXS_GROUP_SIGN_AUTHOR_MASK.
time_t mPublishTs; // Mandatory.
std::string mAuthorId; // Optional.
// for circles
std::string mCircleId;
uint32_t mCircleType;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
uint32_t mSubscribeFlags;
uint32_t mPop; // HOW DO WE DO THIS NOW.
uint32_t mMsgCount; // ???
time_t mLastPost; // ???
uint32_t mGroupStatus;
std::string mServiceString; // Service Specific Free-Form extra storage.
std::string mOriginator;
std::string mInternalCircle;
};
class RsMsgMetaData
{
public:
RsMsgMetaData()
{
mPublishTs = 0;
mMsgFlags = 0;
mMsgStatus = 0;
mChildTs = 0;
}
void operator =(const RsGxsMsgMetaData& rGxsMeta);
std::string mGroupId;
std::string mMsgId;
std::string mThreadId;
std::string mParentId;
std::string mOrigMsgId;
std::string mAuthorId;
std::string mMsgName;
time_t mPublishTs;
/// the first 16 bits for service, last 16 for GXS
uint32_t mMsgFlags;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
// normally READ / UNREAD flags. LOCAL Data.
/// the first 16 bits for service, last 16 for GXS
uint32_t mMsgStatus;
time_t mChildTs;
std::string mServiceString; // Service Specific Free-Form extra storage.
};
#endif /* RSGXSIFACETYPES_H_ */

4
libretroshare/src/retroshare/rsgxsservice.h
View File

@ -4,6 +4,8 @@
#include "gxs/rstokenservice.h"
typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMetaMap;
/*!
* The aim of this class is to abstract
@ -28,7 +30,7 @@ public:
class RsGxsGroupChange : public RsGxsNotify
{
public:
std::list<RsGxsGroupId> grpIdList;
std::list<RsGxsGroupId> mGrpIdList;
};
/*!

6
libretroshare/src/retroshare/rsidentity.h
View File

@ -31,7 +31,7 @@
#include <list>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
/* The Main Interface Class - for information about your Peers */
class RsIdentity;
@ -198,12 +198,12 @@ class RsIdentityParameters
};
class RsIdentity: public RsGxsIfaceImpl
class RsIdentity: public RsGxsIfaceHelper
{
public:
RsIdentity(RsGenExchange *gxs): RsGxsIfaceImpl(gxs) { return; }
RsIdentity(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) { return; }
virtual ~RsIdentity() { return; }
/********************************************************************************************/

6
libretroshare/src/retroshare/rsposted.h
View File

@ -31,7 +31,7 @@
#include <string>
#include <list>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
class RsPosted;
extern RsPosted *rsPosted;
@ -80,7 +80,7 @@ std::ostream &operator<<(std::ostream &out, const RsPostedComment &comment);
class RsPosted : public RsGxsIfaceImpl
class RsPosted : public RsGxsIfaceHelper
{
public:
@ -92,7 +92,7 @@ class RsPosted : public RsGxsIfaceImpl
static const uint32_t FLAG_MSGTYPE_MASK;
RsPosted(RsGenExchange* gxs) : RsGxsIfaceImpl(gxs) { return; }
RsPosted(RsGxsIface* gxs) : RsGxsIfaceHelper(gxs) { return; }
virtual ~RsPosted() { return; }
/* Specific Service Data */

6
libretroshare/src/retroshare/rswiki.h
View File

@ -31,7 +31,7 @@
#include <list>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
/* The Main Interface Class - for information about your Peers */
class RsWiki;
@ -113,11 +113,11 @@ std::ostream &operator<<(std::ostream &out, const RsWikiSnapshot &shot);
std::ostream &operator<<(std::ostream &out, const RsWikiComment &comment);
class RsWiki: public RsGxsIfaceImpl
class RsWiki: public RsGxsIfaceHelper
{
public:
RsWiki(RsGenExchange *gxs): RsGxsIfaceImpl(gxs) { return; }
RsWiki(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) { return; }
virtual ~RsWiki() { return; }
/* Specific Service Data */

6
libretroshare/src/retroshare/rswire.h
View File

@ -31,7 +31,7 @@
#include <list>
#include "gxs/rstokenservice.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
/* The Main Interface Class - for information about your Peers */
@ -104,11 +104,11 @@ std::ostream &operator<<(std::ostream &out, const RsWireGroup &group);
std::ostream &operator<<(std::ostream &out, const RsWirePulse &pulse);
class RsWire: public RsGxsIfaceImpl
class RsWire: public RsGxsIfaceHelper
{
public:
RsWire(RsGenExchange *gxs): RsGxsIfaceImpl(gxs) { return; }
RsWire(RsGxsIface *gxs): RsGxsIfaceHelper(gxs) { return; }
virtual ~RsWire() { return; }
/* Specific Service Data */

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

@ -1805,10 +1805,9 @@ RsTurtle *rsTurtle = NULL ;
#ifdef RS_ENABLE_GXS
// NEW GXS SYSTEMS.
#include "gxs/gxscoreserver.h"
#include "gxs/rsdataservice.h"
#include "gxs/rsgxsnetservice.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "services/p3idservice.h"
#include "services/p3gxscircles.h"

103
libretroshare/src/serialiser/rsgxsitems.h
View File

@ -30,108 +30,7 @@
#include "serialiser/rsserial.h"
#include "serialiser/rstlvtypes.h"
#include "serialiser/rstlvkeys.h"
class RsGxsGrpMetaData;
class RsGxsMsgMetaData;
class RsGroupMetaData
{
public:
RsGroupMetaData()
{
mGroupFlags = 0;
mSubscribeFlags = 0;
mPop = 0;
mMsgCount = 0;
mLastPost = 0;
mGroupStatus = 0;
mCircleType = 0;
//mPublishTs = 0;
}
void operator =(const RsGxsGrpMetaData& rGxsMeta);
std::string mGroupId;
std::string mGroupName;
uint32_t mGroupFlags;
uint32_t mSignFlags; // Combination of RSGXS_GROUP_SIGN_PUBLISH_MASK & RSGXS_GROUP_SIGN_AUTHOR_MASK.
time_t mPublishTs; // Mandatory.
std::string mAuthorId; // Optional.
// for circles
std::string mCircleId;
uint32_t mCircleType;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
uint32_t mSubscribeFlags;
uint32_t mPop; // HOW DO WE DO THIS NOW.
uint32_t mMsgCount; // ???
time_t mLastPost; // ???
uint32_t mGroupStatus;
std::string mServiceString; // Service Specific Free-Form extra storage.
std::string mOriginator;
std::string mInternalCircle;
};
class RsMsgMetaData
{
public:
RsMsgMetaData()
{
mPublishTs = 0;
mMsgFlags = 0;
mMsgStatus = 0;
mChildTs = 0;
}
void operator =(const RsGxsMsgMetaData& rGxsMeta);
std::string mGroupId;
std::string mMsgId;
std::string mThreadId;
std::string mParentId;
std::string mOrigMsgId;
std::string mAuthorId;
std::string mMsgName;
time_t mPublishTs;
/// the first 16 bits for service, last 16 for GXS
uint32_t mMsgFlags;
// BELOW HERE IS LOCAL DATA, THAT IS NOT FROM MSG.
// normally READ / UNREAD flags. LOCAL Data.
/// the first 16 bits for service, last 16 for GXS
uint32_t mMsgStatus;
time_t mChildTs;
std::string mServiceString; // Service Specific Free-Form extra storage.
};
#include "retroshare/rsgxsifacetypes.h"
std::ostream &operator<<(std::ostream &out, const RsGroupMetaData &meta);
std::ostream &operator<<(std::ostream &out, const RsMsgMetaData &meta);

1
libretroshare/src/serialiser/rsposteditems.cc
View File

@ -26,6 +26,7 @@
#include "serialiser/rsposteditems.h"
#include "rsbaseserial.h"
#include "rstlvbase.h"
uint32_t RsGxsPostedSerialiser::size(RsItem *item)

4
libretroshare/src/services/p3gxscircles.cc
View File

@ -25,7 +25,7 @@
#include "services/p3gxscircles.h"
#include "serialiser/rsgxscircleitems.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "util/rsrandom.h"
#include "util/rsstring.h"
@ -173,7 +173,7 @@ void p3GxsCircles::notifyChanges(std::vector<RsGxsNotify *> &changes)
std::cerr << "p3GxsCircles::notifyChanges()";
std::cerr << std::endl;
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
// for new circles we need to add them to the list.
// TODO.

4
libretroshare/src/services/p3gxsforums.cc
View File

@ -29,7 +29,7 @@
#include <retroshare/rsidentity.h>
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <stdio.h>
// For Dummy Msgs.
@ -82,7 +82,7 @@ uint32_t p3GxsForums::forumsAuthenPolicy()
}
void p3GxsForums::notifyChanges(std::vector<RsGxsNotify *> &changes)
{
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
}
void p3GxsForums::service_tick()

4
libretroshare/src/services/p3idservice.cc
View File

@ -25,7 +25,7 @@
#include "services/p3idservice.h"
#include "serialiser/rsgxsiditems.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "util/rsrandom.h"
#include "util/rsstring.h"
@ -158,7 +158,7 @@ void p3IdService::notifyChanges(std::vector<RsGxsNotify *> &changes)
std::cerr << "p3IdService::notifyChanges()";
std::cerr << std::endl;
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
}
/********************************************************************************/

4
libretroshare/src/services/p3photoservice.cc
View File

@ -1,6 +1,6 @@
#include "p3photoservice.h"
#include "serialiser/rsphotoitems.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
RsPhoto *rsPhoto = NULL;
@ -136,7 +136,7 @@ void p3PhotoService::groupsChanged(std::list<RsGxsGroupId>& grpIds)
while(!mGroupChange.empty())
{
RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->grpIdList;
std::list<RsGxsGroupId>& gList = gc->mGrpIdList;
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); lit++)
grpIds.push_back(*lit);

4
libretroshare/src/services/p3posted.cc
View File

@ -5,7 +5,7 @@
#include <stdio.h>
#include "p3posted.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "serialiser/rsposteditems.h"
#define UPDATE_PHASE_GRP_REQUEST 1
@ -58,7 +58,7 @@ p3Posted::p3Posted(RsGeneralDataService *gds, RsNetworkExchangeService *nes)
void p3Posted::notifyChanges(std::vector<RsGxsNotify *> &changes)
{
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
}
void p3Posted::service_tick()

4
libretroshare/src/services/p3wiki.cc
View File

@ -24,7 +24,7 @@
*/
#include "services/p3wiki.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "serialiser/rswikiitems.h"
#include "util/rsrandom.h"
@ -110,7 +110,7 @@ void p3Wiki::notifyChanges(std::vector<RsGxsNotify*>& changes)
std::cerr << "p3Wiki::notifyChanges() New stuff";
std::cerr << std::endl;
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
}
/* Specific Service Data */

2
libretroshare/src/services/p3wire.cc
View File

@ -52,7 +52,7 @@ void p3Wire::notifyChanges(std::vector<RsGxsNotify*>& changes)
std::cerr << "p3Wire::notifyChanges() New stuff";
std::cerr << std::endl;
receiveChanges(changes);
RsGxsIfaceHelper::receiveChanges(changes);
}
/* Specific Service Data */

2
libretroshare/src/tests/gxs/genexchangetester.cpp
View File

@ -1,7 +1,7 @@
#include "genexchangetester.h"
#include "support.h"
#include "gxs/rsdataservice.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#define TEST_FLAG 0x00004;
#define TEST_MASK 0x0000f;

2
libretroshare/src/tests/gxs/genexchangetestservice.h
View File

@ -2,7 +2,7 @@
#define GENEXCHANGETESTSERVICE_H
#include "gxs/rsgenexchange.h"
#include "gxs/rsgxsifaceimpl.h"
#include "retroshare/rsgxsifacehelper.h"
#include "rsdummyservices.h"
class GenExchangeTestService : public RsGenExchange

2
libretroshare/src/tests/gxs/nxstestscenario.cc
View File

@ -7,7 +7,7 @@
#include "nxstestscenario.h"
#include "gxs/rsdataservice.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include "data_support.h"
#include <stdio.h>

2
retroshare-gui/src/gui/GxsForumsDialog.cpp
View File

@ -33,7 +33,7 @@
#include "notifyqt.h"
// These should be in retroshare/ folder.
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
//#define DEBUG_FORUMS

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -25,7 +25,7 @@
#include <retroshare/rspeers.h>
#include <retroshare/rsidentity.h>
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <iostream>
#include <sstream>

2
retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
View File

@ -4,7 +4,7 @@
#include "ui_AlbumCreateDialog.h"
#include "util/misc.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo, QWidget *parent):
QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),

2
retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
View File

@ -2,7 +2,7 @@
#include "AlbumDialog.h"
#include "ui_AlbumDialog.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPhoto* rs_Photo, QWidget *parent) :
QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),

2
retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
View File

@ -27,7 +27,7 @@
#include <retroshare/rspeers.h>
#include <retroshare/rsphoto.h>
#include <gxs/rsgxsflags.h>
#include <retroshare/rsgxsflags.h>
#include <iostream>
#include <sstream>

2
retroshare-gui/src/gui/Posted/PostedListDialog.cpp
View File

@ -28,7 +28,7 @@
#include "gui/Posted/PostedDialog.h"
#include <retroshare/rsposted.h>
#include <gxs/rsgxsflags.h>
#include <retroshare/rsgxsflags.h>
#include <iostream>
#include <sstream>

2
retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
View File

@ -34,7 +34,7 @@
#include <retroshare/rswiki.h>
// These should be in retroshare/ folder.
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <iostream>

4
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp
View File

@ -24,7 +24,7 @@
#include "util/misc.h"
#include "GxsGroupDialog.h"
#include "gui/common/PeerDefs.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <algorithm>
@ -331,7 +331,7 @@ void GxsGroupDialog::createGroup()
std::cerr << std::endl;
QString name = misc::removeNewLine(ui.groupName->text());
uint32_t flags = 0;
uint32_t flags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
if(name.isEmpty())
{

3
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -40,9 +40,10 @@
#include <retroshare/rsgxsforums.h>
#include <retroshare/rspeers.h>
// These should be in retroshare/ folder.
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <iostream>
#include <algorithm>
#define DEBUG_FORUMS

3
retroshare-gui/src/gui/gxsforums/GxsForumsFillThread.cpp
View File

@ -25,10 +25,11 @@
#include "GxsForumsFillThread.h"
#include "GxsForumThreadWidget.h"
#include "gxs/rsgxsflags.h"
#include "retroshare/rsgxsflags.h"
#include <retroshare/rsgxsforums.h>
#include <iostream>
#include <algorithm>
#define DEBUG_FORUMS

2
retroshare-gui/src/util/RsGxsUpdateBroadcast.cpp
View File

@ -3,7 +3,7 @@
#include "RsGxsUpdateBroadcast.h"
RsGxsUpdateBroadcast::RsGxsUpdateBroadcast(RsGxsIfaceImpl *ifaceImpl, float dt, QObject *parent) :
RsGxsUpdateBroadcast::RsGxsUpdateBroadcast(RsGxsIfaceHelper *ifaceImpl, float dt, QObject *parent) :
QObject(parent), mIfaceImpl(ifaceImpl), mDt(dt)
{
}

6
retroshare-gui/src/util/RsGxsUpdateBroadcast.h
View File

@ -3,13 +3,13 @@
#include <QObject>
#include <gxs/rsgxsifaceimpl.h>
#include <retroshare/rsgxsifacehelper.h>
class RsGxsUpdateBroadcast : public QObject
{
Q_OBJECT
public:
explicit RsGxsUpdateBroadcast(RsGxsIfaceImpl* ifaceImpl, float dt, QObject *parent = 0);
explicit RsGxsUpdateBroadcast(RsGxsIfaceHelper* ifaceImpl, float dt, QObject *parent = 0);
void startMonitor();
void update();
@ -26,7 +26,7 @@ public slots:
private:
RsGxsIfaceImpl* mIfaceImpl;
RsGxsIfaceHelper* mIfaceImpl;
float mDt;
};