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

Merge branch 'master' into jsonapi

Browse source
This commit is contained in:
G10h4ck 2018-10-10 22:23:28 +02:00 • committed by GitHub
commit 047ae7f723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
260 changed files with 1737 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/rsserver/p3face-config.cc
View file

@ -39,7 +39,7 @@
#endif // ifdef RS_JSONAPI
#include <sys/time.h>
#include <time.h>
#include "util/rstime.h"
#include "pqi/p3peermgr.h"
#include "pqi/p3netmgr.h"

6
libretroshare/src/rsserver/p3face-server.cc
View file

@ -34,7 +34,7 @@
#include "pqi/authssl.h"
#include <sys/time.h>
#include <time.h>
#include "util/rstime.h"
#include "pqi/p3peermgr.h"
#include "pqi/p3linkmgr.h"
@ -51,7 +51,7 @@ int rsserverzone = 101;
#define WARN_BIG_CYCLE_TIME (0.2)
#ifdef WINDOWS_SYS
#include <time.h>
#include "util/rstime.h"
#include <sys/timeb.h>
#endif
@ -251,7 +251,7 @@ void RsServer::data_tick()
/* Tick slow services */
if(rsPlugins)
rsPlugins->slowTickPlugins((time_t)ts);
rsPlugins->slowTickPlugins((rstime_t)ts);
// slow update tick as well.
// update();

6
libretroshare/src/rsserver/p3msgs.cc
View file

@ -26,7 +26,7 @@
//const int p3facemsgzone = 11453;
#include <sys/time.h>
#include <time.h>
#include "util/rstime.h"
#include "retroshare/rstypes.h"
#include "rsserver/p3msgs.h"
@ -287,9 +287,9 @@ bool p3Msgs::getMessage(const std::string &mid, MessageInfo &msg)
return mMsgSrv->getMessage(mid, msg);
}
void p3Msgs::getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox, unsigned int *pnTrashbox)
void p3Msgs::getMessageCount(uint32_t &nInbox, uint32_t &nInboxNew, uint32_t &nOutbox, uint32_t &nDraftbox, uint32_t &nSentbox, uint32_t &nTrashbox)
{
mMsgSrv->getMessageCount(pnInbox, pnInboxNew, pnOutbox, pnDraftbox, pnSentbox, pnTrashbox);
mMsgSrv->getMessageCount(nInbox, nInboxNew, nOutbox, nDraftbox, nSentbox, nTrashbox);
}
/****************************************/

2
libretroshare/src/rsserver/p3msgs.h
View file

@ -52,7 +52,7 @@ class p3Msgs: public RsMsgs
*/
virtual bool getMessageSummaries(std::list<Rs::Msgs::MsgInfoSummary> &msgList);
virtual bool getMessage(const std::string &mId, Rs::Msgs::MessageInfo &msg);
virtual void getMessageCount(unsigned int *pnInbox, unsigned int *pnInboxNew, unsigned int *pnOutbox, unsigned int *pnDraftbox, unsigned int *pnSentbox, unsigned int *pnTrashbox);
virtual void getMessageCount(uint32_t &nInbox, uint32_t &nInboxNew, uint32_t &nOutbox, uint32_t &nDraftbox, uint32_t &nSentbox, uint32_t &nTrashbox);
virtual bool MessageSend(Rs::Msgs::MessageInfo &info);
virtual bool SystemMessage(const std::string &title, const std::string &message, uint32_t systemFlag);

2
libretroshare/src/rsserver/p3peers.cc
View file

@ -745,7 +745,7 @@ bool p3Peers::addFriend(const RsPeerId &ssl_id, const RsPgpId &gpg_id,ServicePe
* If we are adding an SSL certificate. we flag lastcontact as now.
* This will cause the SSL certificate to be retained for 30 days... and give the person a chance to connect!
* */
time_t now = time(NULL);
rstime_t now = time(NULL);
return mPeerMgr->addFriend(ssl_id, gpg_id, RS_NET_MODE_UDP, RS_VS_DISC_FULL, RS_VS_DHT_FULL, now, perm_flags);
}

2
libretroshare/src/rsserver/rstypes.cc
View file

@ -32,7 +32,7 @@
#include "retroshare/rstypes.h"
#include <iostream>
#include <iomanip>
#include <time.h>
#include "util/rstime.h"
/**********************************************************************