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

Use safer rstime_t instead of time_t

Browse source 
Avoid problems to serialization on different platforms, without breaking
nested STL containers serialization.

The conversion have been made with sed, and checked with grep, plus
kdiff3 visual ispection, plus rutime tests, so it should be fine.
This commit is contained in:
Gioacchino Mazzurco 2018-10-07 01:34:05 +02:00
parent 41aa675a9b
commit 329050a9c2
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
223 changed files with 930 additions and 911 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();

2
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"

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"
/**********************************************************************