Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

incorporated requested changes

Browse Source
This commit is contained in:
sehraf 2018-09-09 22:21:18 +02:00
parent ae6a5c74d2
commit 247c368279
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libretroshare/src/retroshare/rsconfig.h
View File

@ -136,23 +136,13 @@ int promptAtBoot; /* popup the password prompt */
struct RsConfigDataRates : RsSerializable struct RsConfigDataRates : RsSerializable
{ {
RsConfigDataRates() RsConfigDataRates() :
{ mRateIn(0), mRateMaxIn(0), mAllocIn(0),
mRateIn = 0; mAllocTs(0),
mRateMaxIn = 0; mRateOut(0), mRateMaxOut(0), mAllowedOut(0),
mAllocIn = 0; mAllowedTs(0),
mQueueIn(0), mQueueOut(0)
mAllocTs = 0; {}
mRateOut = 0;
mRateMaxOut = 0;
mAllowedOut = 0;
mAllowedTs = 0;
mQueueIn = 0;
mQueueOut = 0;
}
/* all in kB/s */ /* all in kB/s */
float mRateIn; float mRateIn;
@ -171,7 +161,6 @@ struct RsConfigDataRates : RsSerializable
int mQueueOut; int mQueueOut;
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(mRateIn); RS_SERIAL_PROCESS(mRateIn);
RS_SERIAL_PROCESS(mRateMaxIn); RS_SERIAL_PROCESS(mRateMaxIn);
@ -204,7 +193,6 @@ struct RSTrafficClue : RsSerializable
RSTrafficClue& operator+=(const RSTrafficClue& tc) { size += tc.size; count += tc.count ; return *this ;} RSTrafficClue& operator+=(const RSTrafficClue& tc) { size += tc.size; count += tc.count ; return *this ;}
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(TS); RS_SERIAL_PROCESS(TS);
RS_SERIAL_PROCESS(size); RS_SERIAL_PROCESS(size);
@ -257,7 +245,6 @@ struct RsConfigNetStatus : RsSerializable
uint32_t netDhtRsNetSize;/* response from dht */ uint32_t netDhtRsNetSize;/* response from dht */
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(ownId); RS_SERIAL_PROCESS(ownId);
RS_SERIAL_PROCESS(ownName); RS_SERIAL_PROCESS(ownName);

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

@ -41,8 +41,8 @@ class RsDisc
{ {
public: public:
RsDisc() { return; } RsDisc() {}
virtual ~RsDisc() { return; } virtual ~RsDisc() {}
/** /**
* @brief getDiscFriends get a list with all friends (ssl id) to a given friend (ssl id) * @brief getDiscFriends get a list with all friends (ssl id) to a given friend (ssl id)

7
libretroshare/src/retroshare/rsservicecontrol.h
View File

@ -61,7 +61,6 @@ struct RsServiceInfo : RsSerializable
uint16_t mMinVersionMinor; uint16_t mMinVersionMinor;
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(mServiceName); RS_SERIAL_PROCESS(mServiceName);
RS_SERIAL_PROCESS(mServiceType); RS_SERIAL_PROCESS(mServiceType);
@ -83,7 +82,6 @@ struct RsPeerServiceInfo : RsSerializable
std::map<uint32_t, RsServiceInfo> mServiceList; std::map<uint32_t, RsServiceInfo> mServiceList;
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(mPeerId); RS_SERIAL_PROCESS(mPeerId);
RS_SERIAL_PROCESS(mServiceList); RS_SERIAL_PROCESS(mServiceList);
@ -114,7 +112,6 @@ struct RsServicePermissions : RsSerializable
std::set<RsPeerId> mPeersDenied; std::set<RsPeerId> mPeersDenied;
// RsSerializable interface // RsSerializable interface
public:
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) { void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
RS_SERIAL_PROCESS(mServiceId); RS_SERIAL_PROCESS(mServiceId);
RS_SERIAL_PROCESS(mServiceName); RS_SERIAL_PROCESS(mServiceName);
@ -130,8 +127,8 @@ class RsServiceControl
{ {
public: public:
RsServiceControl() { return; } RsServiceControl() {}
virtual ~RsServiceControl() { return; } virtual ~RsServiceControl(){}
/** /**
* @brief getOwnServices return a map off all services. * @brief getOwnServices return a map off all services.

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

@ -1179,7 +1179,7 @@ bool p3discovery2::getDiscFriends(const RsPeerId& id, std::list<RsPeerId> &proxy
bool p3discovery2::getWaitingDiscCount(size_t &sendCount, size_t &recvCount) bool p3discovery2::getWaitingDiscCount(size_t &sendCount, size_t &recvCount)
{ {
RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/ RS_STACK_MUTEX(mDiscMtx);
sendCount = mPendingDiscPgpCertOutList.size(); sendCount = mPendingDiscPgpCertOutList.size();
recvCount = mPendingDiscPgpCertInList.size(); recvCount = mPendingDiscPgpCertInList.size();