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

Tiny fixes seems groups and messages propagate now

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2017-01-19 00:32:37 +01:00
parent 38ab9a058f
commit 0af9291e54
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1493,11 +1493,12 @@ int RsServer::StartupRetroShare()
NULL, rsInitConfig->gxs_passwd ); NULL, rsInitConfig->gxs_passwd );
p3GxsMails* mGxsMails = new p3GxsMails(gxsmail_ds, NULL, mGxsIdService); p3GxsMails* mGxsMails = new p3GxsMails(gxsmail_ds, NULL, mGxsIdService);
RsGxsNetService* gxsmails_ns = new RsGxsNetService( RsGxsNetService* gxsmails_ns = new RsGxsNetService(
RS_SERVICE_TYPE_GXS_MAIL, gxschannels_ds, nxsMgr, mGxsMails, RS_SERVICE_TYPE_GXS_MAIL, gxsmail_ds, nxsMgr, mGxsMails,
mGxsMails->getServiceInfo(), mReputations, mGxsCircles, mGxsMails->getServiceInfo(), mReputations, mGxsCircles,
mGxsIdService, pgpAuxUtils); mGxsIdService, pgpAuxUtils);
mGxsMails->setNetworkExchangeService(gxsmails_ns); mGxsMails->setNetworkExchangeService(gxsmails_ns);
pqih->addService(gxsmails_ns, true); pqih->addService(gxsmails_ns, true);
mConfigMgr->addConfiguration("gxs_mail.cfg", gxsmails_ns);
# endif // RS_GXS_MAIL # endif // RS_GXS_MAIL
// remove pword from memory // remove pword from memory

5
libretroshare/src/serialiser/rsgxsmailitems.h
View File

@ -23,9 +23,8 @@
#include "serialiser/rsbaseserial.h" #include "serialiser/rsbaseserial.h"
#include "serialiser/rstlvidset.h" #include "serialiser/rstlvidset.h"
#include "retroshare/rsgxsflags.h" #include "retroshare/rsgxsflags.h"
#include "retroshare/rsgxscircles.h" // For: GXS_CIRCLE_TYPE_PUBLIC
// TODO: move to rsserviceids.h
const uint16_t RS_SERVICE_TYPE_GXS_MAIL = 0x0230;
enum GxsMailSubtypes enum GxsMailSubtypes
{ {
@ -132,6 +131,7 @@ struct RsGxsMailGroupItem : RsGxsGrpItem
{ {
meta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC; meta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
meta.mGroupName = "Mail"; meta.mGroupName = "Mail";
meta.mCircleType = GXS_CIRCLE_TYPE_PUBLIC;
} }
void clear() {} void clear() {}
@ -177,7 +177,6 @@ struct RsGxsMailSerializer : RsSerialType
default: return 0; default: return 0;
} }
std::cout << "RsGxsMailSerializer::size() " << item->PacketSubType() << " return " << s << std::endl;
return s; return s;
} }

1
libretroshare/src/serialiser/rsserviceids.h
View File

@ -82,6 +82,7 @@ const uint16_t RS_SERVICE_GXS_TYPE_GXSCIRCLE = 0x0218;
// not gxs, but used with identities. // not gxs, but used with identities.
const uint16_t RS_SERVICE_GXS_TYPE_REPUTATION = 0x0219; const uint16_t RS_SERVICE_GXS_TYPE_REPUTATION = 0x0219;
const uint16_t RS_SERVICE_TYPE_GXS_RECOGN = 0x0220; const uint16_t RS_SERVICE_TYPE_GXS_RECOGN = 0x0220;
const uint16_t RS_SERVICE_TYPE_GXS_MAIL = 0x0230;
// Experimental Services. // Experimental Services.
/* DSDV Testing at the moment - Service Only */ /* DSDV Testing at the moment - Service Only */

2
libretroshare/src/services/p3gxsmails.h
View File

@ -81,7 +81,7 @@ private:
*/ */
bool inline supersedePreferredGroup(const RsGxsGroupId& potentialGrId) bool inline supersedePreferredGroup(const RsGxsGroupId& potentialGrId)
{ {
std::cout << "supersedePreferredGroup(const RsGxsGroupId& potentialGrId) " << preferredGroupId << " <? " << potentialGrId << std::endl; //std::cout << "supersedePreferredGroup(const RsGxsGroupId& potentialGrId) " << preferredGroupId << " <? " << potentialGrId << std::endl;
if(preferredGroupId < potentialGrId) if(preferredGroupId < potentialGrId)
{ {
preferredGroupId = potentialGrId; preferredGroupId = potentialGrId;