mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
incorporated requested changes
This commit is contained in:
parent
ae6a5c74d2
commit
247c368279
@ -136,23 +136,13 @@ int promptAtBoot; /* popup the password prompt */
|
||||
|
||||
struct RsConfigDataRates : RsSerializable
|
||||
{
|
||||
RsConfigDataRates()
|
||||
{
|
||||
mRateIn = 0;
|
||||
mRateMaxIn = 0;
|
||||
mAllocIn = 0;
|
||||
|
||||
mAllocTs = 0;
|
||||
|
||||
mRateOut = 0;
|
||||
mRateMaxOut = 0;
|
||||
mAllowedOut = 0;
|
||||
|
||||
mAllowedTs = 0;
|
||||
|
||||
mQueueIn = 0;
|
||||
mQueueOut = 0;
|
||||
}
|
||||
RsConfigDataRates() :
|
||||
mRateIn(0), mRateMaxIn(0), mAllocIn(0),
|
||||
mAllocTs(0),
|
||||
mRateOut(0), mRateMaxOut(0), mAllowedOut(0),
|
||||
mAllowedTs(0),
|
||||
mQueueIn(0), mQueueOut(0)
|
||||
{}
|
||||
|
||||
/* all in kB/s */
|
||||
float mRateIn;
|
||||
@ -171,7 +161,6 @@ struct RsConfigDataRates : RsSerializable
|
||||
int mQueueOut;
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(mRateIn);
|
||||
RS_SERIAL_PROCESS(mRateMaxIn);
|
||||
@ -204,7 +193,6 @@ struct RSTrafficClue : RsSerializable
|
||||
RSTrafficClue& operator+=(const RSTrafficClue& tc) { size += tc.size; count += tc.count ; return *this ;}
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(TS);
|
||||
RS_SERIAL_PROCESS(size);
|
||||
@ -257,7 +245,6 @@ struct RsConfigNetStatus : RsSerializable
|
||||
uint32_t netDhtRsNetSize;/* response from dht */
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(ownId);
|
||||
RS_SERIAL_PROCESS(ownName);
|
||||
|
@ -41,8 +41,8 @@ class RsDisc
|
||||
{
|
||||
public:
|
||||
|
||||
RsDisc() { return; }
|
||||
virtual ~RsDisc() { return; }
|
||||
RsDisc() {}
|
||||
virtual ~RsDisc() {}
|
||||
|
||||
/**
|
||||
* @brief getDiscFriends get a list with all friends (ssl id) to a given friend (ssl id)
|
||||
|
@ -61,7 +61,6 @@ struct RsServiceInfo : RsSerializable
|
||||
uint16_t mMinVersionMinor;
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(mServiceName);
|
||||
RS_SERIAL_PROCESS(mServiceType);
|
||||
@ -83,7 +82,6 @@ struct RsPeerServiceInfo : RsSerializable
|
||||
std::map<uint32_t, RsServiceInfo> mServiceList;
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(mPeerId);
|
||||
RS_SERIAL_PROCESS(mServiceList);
|
||||
@ -114,7 +112,6 @@ struct RsServicePermissions : RsSerializable
|
||||
std::set<RsPeerId> mPeersDenied;
|
||||
|
||||
// RsSerializable interface
|
||||
public:
|
||||
void serial_process(RsGenericSerializer::SerializeJob j, RsGenericSerializer::SerializeContext &ctx) {
|
||||
RS_SERIAL_PROCESS(mServiceId);
|
||||
RS_SERIAL_PROCESS(mServiceName);
|
||||
@ -130,8 +127,8 @@ class RsServiceControl
|
||||
{
|
||||
public:
|
||||
|
||||
RsServiceControl() { return; }
|
||||
virtual ~RsServiceControl() { return; }
|
||||
RsServiceControl() {}
|
||||
virtual ~RsServiceControl(){}
|
||||
|
||||
/**
|
||||
* @brief getOwnServices return a map off all services.
|
||||
|
@ -1179,7 +1179,7 @@ bool p3discovery2::getDiscFriends(const RsPeerId& id, std::list<RsPeerId> &proxy
|
||||
|
||||
bool p3discovery2::getWaitingDiscCount(size_t &sendCount, size_t &recvCount)
|
||||
{
|
||||
RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/
|
||||
RS_STACK_MUTEX(mDiscMtx);
|
||||
sendCount = mPendingDiscPgpCertOutList.size();
|
||||
recvCount = mPendingDiscPgpCertInList.size();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user