From 732bdbdaacb429c94c4120070e531038e3d6f132 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 28 Mar 2008 22:59:28 +0000 Subject: Allow configuration of the server port that the client will connect to (bbackupd and bbackupquery). Redesign ConfigurationVerify to use classes instead of structs. Use port 22011 instead of 2201 during tests, to reduce the chances of conflicting with a running bbstored or other process. Ignore autogen_* in svn:ignore everywhere instead of individual per-file ignores. --- lib/server/Daemon.h | 5 +++-- lib/server/ServerStream.h | 4 ++-- lib/server/ServerTLS.h | 9 ++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/server') diff --git a/lib/server/Daemon.h b/lib/server/Daemon.h index 60444ab9..ef5728ec 100644 --- a/lib/server/Daemon.h +++ b/lib/server/Daemon.h @@ -92,8 +92,9 @@ private: std::string mAppName; }; -#define DAEMON_VERIFY_SERVER_KEYS {"PidFile", 0, ConfigTest_Exists, 0}, \ - {"User", 0, ConfigTest_LastEntry, 0} +#define DAEMON_VERIFY_SERVER_KEYS \ + ConfigurationVerifyKey("PidFile", ConfigTest_Exists), \ + ConfigurationVerifyKey("User", ConfigTest_LastEntry) #endif // DAEMON__H diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h index 0ec5ef49..41899e78 100644 --- a/lib/server/ServerStream.h +++ b/lib/server/ServerStream.h @@ -365,8 +365,8 @@ private: }; #define SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) \ - {"ListenAddresses", DEFAULT_ADDRESSES, 0, 0}, \ - DAEMON_VERIFY_SERVER_KEYS + ConfigurationVerifyKey("ListenAddresses", 0, DEFAULT_ADDRESSES), \ + DAEMON_VERIFY_SERVER_KEYS #include "MemLeakFindOff.h" diff --git a/lib/server/ServerTLS.h b/lib/server/ServerTLS.h index 71d35380..1bfcb547 100644 --- a/lib/server/ServerTLS.h +++ b/lib/server/ServerTLS.h @@ -70,11 +70,10 @@ private: }; #define SERVERTLS_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) \ - {"CertificateFile", 0, ConfigTest_Exists, 0}, \ - {"PrivateKeyFile", 0, ConfigTest_Exists, 0}, \ - {"TrustedCAsFile", 0, ConfigTest_Exists, 0}, \ - SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) - + ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists), \ + ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists), \ + ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists), \ + SERVERSTREAM_VERIFY_SERVER_KEYS(DEFAULT_ADDRESSES) #endif // SERVERTLS__H -- cgit v1.2.3