From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 25 Mar 2019 13:02:45 +0000 (+0100)
Subject: Move Blacklist parameters out of the class
X-Git-Tag: v1.9.90~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8e9e154db73e4aa656e05b11a9fc6b8d31d481cf;p=tigervnc.git

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 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 {