From 8e9e154db73e4aa656e05b11a9fc6b8d31d481cf Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 25 Mar 2019 14:02:45 +0100 Subject: [PATCH] Move Blacklist parameters out of the class No need to expose these, so keep them internal to the implementation, like most settings are. --- common/rfb/Blacklist.cxx | 18 ++++++++++-------- common/rfb/Blacklist.h | 3 --- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/rfb/Blacklist.cxx b/common/rfb/Blacklist.cxx index 4590befe..243d173d 100644 --- a/common/rfb/Blacklist.cxx +++ b/common/rfb/Blacklist.cxx @@ -20,14 +20,16 @@ using namespace rfb; -IntParameter Blacklist::threshold("BlacklistThreshold", - "The number of unauthenticated connection attempts allowed from any " - "individual host before that host is black-listed", - 5); -IntParameter Blacklist::initialTimeout("BlacklistTimeout", - "The initial timeout applied when a host is first black-listed. " - "The host cannot re-attempt a connection until the timeout expires.", - 10); +IntParameter threshold("BlacklistThreshold", + "The number of unauthenticated connection attempts " + "allowed from any individual host before that host " + "is black-listed", + 5); +IntParameter initialTimeout("BlacklistTimeout", + "The initial timeout applied when a host is " + "first black-listed. The host cannot re-attempt " + "a connection until the timeout expires.", + 10); Blacklist::Blacklist() { diff --git a/common/rfb/Blacklist.h b/common/rfb/Blacklist.h index 0eb38460..45e36a0e 100644 --- a/common/rfb/Blacklist.h +++ b/common/rfb/Blacklist.h @@ -67,9 +67,6 @@ namespace rfb { bool isBlackmarked(const char* name); void clearBlackmark(const char* name); - static IntParameter threshold; - static IntParameter initialTimeout; - protected: struct ltStr { bool operator()(const char* s1, const char* s2) const { -- 2.39.5