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

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/zeroconf/p3zcnatassist.h
View file

@ -101,7 +101,7 @@ virtual bool statusPortForward(const uint32_t fwdId, PortForwardParams &param
DNSServiceRef mMappingRef;
uint32_t mMappingStatus;
time_t mMappingStatusTS;
rstime_t mMappingStatusTS;
};
#endif /* MRK_P3_ZC_NAT_ASSIST_H */

12
libretroshare/src/zeroconf/p3zeroconf.cc
View file

@ -359,7 +359,7 @@ void p3ZeroConf::checkServiceFDs()
{
locked_checkFD(mResolveRef);
time_t age = time(NULL) - mResolveStatusTS;
rstime_t age = time(NULL) - mResolveStatusTS;
if (age > ZC_MAX_RESOLVE_TIME)
{
std::cerr << "p3ZeroConf::checkServiceFDs() Killing very old Resolve request";
@ -374,7 +374,7 @@ void p3ZeroConf::checkServiceFDs()
{
locked_checkFD(mQueryRef);
time_t age = time(NULL) - mQueryStatusTS;
rstime_t age = time(NULL) - mQueryStatusTS;
if (age > ZC_MAX_QUERY_TIME)
{
std::cerr << "p3ZeroConf::checkServiceFDs() Killing very old Query request";
@ -494,7 +494,7 @@ int p3ZeroConf::checkLocationResults()
std::cerr << "sslid = " << lr.sslId;
std::cerr << std::endl;
time_t now = time(NULL);
rstime_t now = time(NULL);
mPeerMgr->addFriend(lr.sslId, lr.gpgId, RS_NET_MODE_UDP, RS_VS_DISC_FULL, RS_VS_DHT_FULL, now);
return 1;
}
@ -555,7 +555,7 @@ int p3ZeroConf::checkQueryResults()
std::cerr << "sslid = " << qr.sslId;
std::cerr << std::endl;
time_t now = time(NULL);
rstime_t now = time(NULL);
uint32_t flags = RS_CB_FLAG_MODE_TCP;
uint32_t source = RS_CB_DHT; // SHOULD ADD NEW SOURCE ZC???
struct sockaddr_storage dummyProxyAddr, dummySrcAddr;
@ -1370,7 +1370,7 @@ class RsZCBrowseDetails
RsZCBrowseDetails();
uint32_t mBrowseState;
time_t mBrowseUpdate;
rstime_t mBrowseUpdate;
uint32_t mBrowseInterfaceIndex;
std::string mBrowserServiceName;
@ -1398,7 +1398,7 @@ class RsZCPeerDetails
/* Browse Info */
uint32_t mBrowseState;
time_t mBrowseUpdate;
rstime_t mBrowseUpdate;
uint32_t mBrowseInterfaceIndex;
std::string mBrowserServiceName;

14
libretroshare/src/zeroconf/p3zeroconf.h
View file

@ -110,14 +110,14 @@ class zcLocationDetails
{
public:
std::string mSslId;
time_t mFoundTs;
rstime_t mFoundTs;
uint32_t mStatus;
std::string mHostTarget;
std::string mFullName;
uint16_t mPort;
struct sockaddr_storage mAddress;
time_t mAddrTs;
rstime_t mAddrTs;
};
@ -262,10 +262,10 @@ virtual bool setAttachMode(bool on);
uint32_t mResolveStatus;
uint32_t mQueryStatus;
time_t mRegisterStatusTS;
time_t mBrowseStatusTS;
time_t mResolveStatusTS;
time_t mQueryStatusTS;
rstime_t mRegisterStatusTS;
rstime_t mBrowseStatusTS;
rstime_t mResolveStatusTS;
rstime_t mQueryStatusTS;
std::string mQuerySslId;
std::string mQueryGpgId;
@ -277,7 +277,7 @@ std::list<zcQueryResult> mQueryResults;
time_t mMinuteTS;
rstime_t mMinuteTS;
std::map<std::string, zcPeerDetails> mPeerDetails;
};