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

Fix Gcc Warning in p3banlist

Browse Source
This commit is contained in:
Phenom 2017-09-28 19:24:26 +02:00
parent e66c0d1349
commit 7f851f66be
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libretroshare/src/services/p3banlist.cc
View File

@ -62,13 +62,14 @@
*/ */
RsBanList *rsBanList = NULL ; RsBanList *rsBanList = NULL ;
p3BanList::p3BanList(p3ServiceControl *sc, p3NetMgr */*nm*/) : p3BanList::p3BanList(p3ServiceControl *sc, p3NetMgr */*nm*/)
p3Service(), mBanMtx("p3BanList"), mServiceCtrl(sc), mSentListTime(0), : p3Service(), mBanMtx("p3BanList"), mServiceCtrl(sc)
mLastDhtInfoRequest(0), mIPFilteringEnabled(true), , mSentListTime(0), mLastDhtInfoRequest(0)
// default number of IPs in same range to trigger a complete IP /24 filter. // default number of IPs in same range to trigger a complete IP /24 filter.
mAutoRangeLimit(100), , mAutoRangeLimit(100), mAutoRangeIps(false)
mAutoRangeIps(false), mIPFriendGatheringEnabled(false), , mIPFilteringEnabled(true)
mIPDHTGatheringEnabled(false) , mIPFriendGatheringEnabled(false)
, mIPDHTGatheringEnabled(false)
{ addSerialType(new RsBanListSerialiser()); } { addSerialType(new RsBanListSerialiser()); }
const std::string BANLIST_APP_NAME = "banlist"; const std::string BANLIST_APP_NAME = "banlist";

10
libretroshare/src/services/p3banlist.h
View File

@ -141,22 +141,22 @@ private:
int printBanSet_locked(std::ostream &out); int printBanSet_locked(std::ostream &out);
bool isWhiteListed_locked(const sockaddr_storage &addr); bool isWhiteListed_locked(const sockaddr_storage &addr);
p3ServiceControl *mServiceCtrl;
//p3NetMgr *mNetMgr;
time_t mSentListTime; time_t mSentListTime;
std::map<RsPeerId, BanList> mBanSources; std::map<RsPeerId, BanList> mBanSources;
std::map<struct sockaddr_storage, BanListPeer> mBanSet; std::map<struct sockaddr_storage, BanListPeer> mBanSet;
std::map<struct sockaddr_storage, BanListPeer> mBanRanges; std::map<struct sockaddr_storage, BanListPeer> mBanRanges;
std::map<struct sockaddr_storage, BanListPeer> mWhiteListedRanges; std::map<struct sockaddr_storage, BanListPeer> mWhiteListedRanges;
p3ServiceControl *mServiceCtrl;
//p3NetMgr *mNetMgr;
time_t mLastDhtInfoRequest ; time_t mLastDhtInfoRequest ;
uint32_t mAutoRangeLimit ;
bool mAutoRangeIps ;
bool mIPFilteringEnabled ; bool mIPFilteringEnabled ;
bool mIPFriendGatheringEnabled ; bool mIPFriendGatheringEnabled ;
bool mIPDHTGatheringEnabled ; bool mIPDHTGatheringEnabled ;
uint32_t mAutoRangeLimit ;
bool mAutoRangeIps ;
}; };
#endif // SERVICE_RSBANLIST_HEADER #endif // SERVICE_RSBANLIST_HEADER