Move Blacklist parameters out of the class

No need to expose these, so keep them internal to the implementation,
like most settings are.

diff --git a/common/rfb/Blacklist.cxx b/common/rfb/Blacklist.cxx
index 4590befe514cccb4d6400398fce7cab922038724..243d173d2973b24ac9c66003baed5defb3efc1e1 100644 (file)
--- 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 0eb3846093d3d4fb990c4ac008e3eb4a56539e29..45e36a0ee0074442dd872039a183064f8ae0e90f 100644 (file)
--- 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 {