Changeset 2116

Timestamp:

28/03/2008 22:59:28 (2 years ago)

Author:

chris

Message:

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.

Location:

box/trunk

Files:

• . (modified) (1 prop)
• .hgignore (added)
• bin/bbackupd (modified) (1 prop)
• bin/bbackupd/BackupClientContext.cpp (modified) (3 diffs)
• bin/bbackupd/BackupClientContext.h (modified) (2 diffs)
• bin/bbackupd/BackupDaemon.cpp (modified) (1 diff)
• bin/bbackupquery (modified) (1 prop)
• bin/bbackupquery/bbackupquery.cpp (modified) (1 diff)
• bin/bbstored (modified) (1 prop)
• infrastructure (modified) (1 prop)
• lib/backupclient (modified) (1 prop)
• lib/backupclient/BackupDaemonConfigVerify.cpp (modified) (2 diffs)
• lib/backupstore/BackupStoreConfigVerify.cpp (modified) (2 diffs)
• lib/common (modified) (1 prop)
• lib/common/Configuration.cpp (modified) (22 diffs)
• lib/common/Configuration.h (modified) (3 diffs)
• lib/compress (modified) (1 prop)
• lib/crypto (modified) (1 prop)
• lib/intercept (modified) (1 prop)
• lib/raidfile (modified) (1 prop)
• lib/raidfile/RaidFileController.cpp (modified) (1 diff)
• lib/server (modified) (1 prop)
• lib/server/Daemon.h (modified) (1 diff)
• lib/server/ServerStream.h (modified) (1 diff)
• lib/server/ServerTLS.h (modified) (1 diff)
• test/basicserver (modified) (1 prop)
• test/basicserver/testbasicserver.cpp (modified) (2 diffs)
• test/bbackupd/testbbackupd.cpp (modified) (4 diffs)
• test/bbackupd/testfiles (modified) (1 prop)
• test/bbackupd/testfiles/bbackupd-temploc.conf (modified) (1 diff)
• test/bbackupd/testfiles/bbackupd.conf.in (modified) (1 diff)
• test/bbackupd/testfiles/bbstored.conf (modified) (1 diff)
• test/common/testcommon.cpp (modified) (3 diffs)

box/trunk

@@ -11 +11 @@
 release
 runtest.pl
+.hg

@@ -11 +11 @@
 release
 runtest.pl
+.hg

box/trunk/bin/bbackupd

@@ -1 +1 @@
 Makefile
 bbackupd-config
+autogen_*

@@ -1 +1 @@
 Makefile
 bbackupd-config
+autogen_*

box/trunk/bin/bbackupd/BackupClientContext.cpp

@@ -45 +45 @@
         TLSContext &rTLSContext, 
         const std::string &rHostname,
+        int Port,
         int32_t AccountNumber, 
         bool ExtendedLogging,
@@ -53 +54 @@
           mrTLSContext(rTLSContext),
           mHostname(rHostname),
+          mPort(Port),
           mAccountNumber(AccountNumber),
           mpSocket(0),
@@ -130 +132 @@
 
                 // Connect!
-                mpSocket->Open(mrTLSContext, Socket::TypeINET, mHostname.c_str(), BOX_PORT_BBSTORED);
+                mpSocket->Open(mrTLSContext, Socket::TypeINET,
+                        mHostname.c_str(), mPort);
                 
                 // And create a procotol object

box/trunk/bin/bbackupd/BackupClientContext.h

@@ -42 +42 @@
                 TLSContext &rTLSContext, 
                 const std::string &rHostname,
+                int32_t Port,
                 int32_t AccountNumber, 
                 bool ExtendedLogging,
@@ -202 +203 @@
         TLSContext &mrTLSContext;
         std::string mHostname;
+        int mPort;
         int32_t mAccountNumber;
         SocketStreamTLS *mpSocket;

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -959 +959 @@
                                         tlsContext, 
                                         conf.GetKeyValue("StoreHostname"),
+                                        conf.GetKeyValueInt("StorePort"),
                                         conf.GetKeyValueInt("AccountNumber"), 
                                         conf.GetKeyValueBool("ExtendedLogging"),

box/trunk/bin/bbackupquery

@@ -1 @@
-autogen_Documentation.cpp
+autogen_*
 Makefile
 makedocumentation.pl

@@ -1 @@
-autogen_Documentation.cpp
+autogen_*
 Makefile
 makedocumentation.pl

box/trunk/bin/bbackupquery/bbackupquery.cpp

@@ -261 +261 @@
         if(!quiet) BOX_INFO("Connecting to store...");
         SocketStreamTLS socket;
-        socket.Open(tlsContext, Socket::TypeINET, conf.GetKeyValue("StoreHostname").c_str(), BOX_PORT_BBSTORED);
+        socket.Open(tlsContext, Socket::TypeINET,
+                conf.GetKeyValue("StoreHostname").c_str(),
+                conf.GetKeyValueInt("StorePort"));
         
         // 3. Make a protocol, and handshake

box/trunk/bin/bbstored

@@ -1 @@
-autogen_BackupProtocolServer.cpp
-autogen_BackupProtocolServer.h
+autogen_*
 Makefile
 bbstored-certs

@@ -1 @@
-autogen_BackupProtocolServer.cpp
-autogen_BackupProtocolServer.h
+autogen_*
 Makefile
 bbstored-certs

box/trunk/infrastructure

@@ -2 +2 @@
 makebuildenv.pl
 makeparcels.pl
+makedistribution.pl

@@ -2 +2 @@
 makebuildenv.pl
 makeparcels.pl
+makedistribution.pl

box/trunk/lib/backupclient

@@ -1 @@
-autogen_BackupProtocolClient.cpp
-autogen_BackupProtocolClient.h
-autogen_BackupStoreException.cpp
-autogen_BackupStoreException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_BackupProtocolClient.cpp
-autogen_BackupProtocolClient.h
-autogen_BackupStoreException.cpp
-autogen_BackupStoreException.h
+autogen_*
 Makefile

box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

@@ -18 +18 @@
 static const ConfigurationVerifyKey backuplocationkeys[] = 
 {
-        {"ExcludeFile", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeFilesRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeDir", 0, ConfigTest_MultiValueAllowed, 0},
-        {"ExcludeDirsRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeFile", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeFilesRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeDir", 0, ConfigTest_MultiValueAllowed, 0},
-        {"AlwaysIncludeDirsRegex", 0, ConfigTest_MultiValueAllowed, 0},
-        {"Path", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("ExcludeFile", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeFilesRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeDir", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("ExcludeDirsRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeFile", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeFilesRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeDir", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("AlwaysIncludeDirsRegex", ConfigTest_MultiValueAllowed),
+        ConfigurationVerifyKey("Path", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -65 +65 @@
 static const ConfigurationVerifyKey verifyrootkeys[] = 
 {
-        {"AccountNumber", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
+        ConfigurationVerifyKey("AccountNumber",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("UpdateStoreInterval",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MinimumFileAge",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MaxUploadWait",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("MaxFileTimeInFuture", ConfigTest_IsInt, 172800),
+        // file is uploaded if the file is this much in the future
+        // (2 days default)
+        ConfigurationVerifyKey("AutomaticBackup", ConfigTest_IsBool, true),
+        
+        ConfigurationVerifyKey("SyncAllowScript", 0),
+        // script that returns "now" if backup is allowed now, or a number
+        // of seconds to wait before trying again if not
 
-        {"UpdateStoreInterval", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MinimumFileAge", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MaxUploadWait", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"MaxFileTimeInFuture", "172800", ConfigTest_IsInt, 0},         // file is uploaded if the file is this much in the future (2 days default)
+        ConfigurationVerifyKey("MaximumDiffingTime", ConfigTest_IsInt),
+        ConfigurationVerifyKey("DeleteRedundantLocationsAfter",
+                ConfigTest_IsInt, 172800),
 
-        {"AutomaticBackup", "yes", ConfigTest_IsBool, 0},
+        ConfigurationVerifyKey("FileTrackingSizeThreshold", 
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("DiffingUploadSizeThreshold",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("StoreHostname", ConfigTest_Exists),
+        ConfigurationVerifyKey("StorePort", ConfigTest_IsInt,
+                BOX_PORT_BBSTORED),
+        ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false),
+        // extended log to syslog
+        ConfigurationVerifyKey("ExtendedLogFile", 0),
+        // extended log to a file
+        ConfigurationVerifyKey("LogAllFileAccess", ConfigTest_IsBool, false),
+        ConfigurationVerifyKey("CommandSocket", 0),
+        // not compulsory to have this
+        ConfigurationVerifyKey("KeepAliveTime", ConfigTest_IsInt),
+        ConfigurationVerifyKey("StoreObjectInfoFile", 0),
+        // optional
+
+        ConfigurationVerifyKey("NotifyScript", 0),
+        // optional script to run when backup needs attention, eg store full
         
-        {"SyncAllowScript", 0, 0, 0},                   // optional script to run to see if the sync should be started now
-                                // return "now" if it's allowed, or a number of seconds if it's not
-
-        {"MaximumDiffingTime", 0, ConfigTest_IsInt, 0},
-        {"DeleteRedundantLocationsAfter", "172800", ConfigTest_IsInt, 0},
-
-        {"FileTrackingSizeThreshold", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"DiffingUploadSizeThreshold", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"StoreHostname", 0, ConfigTest_Exists, 0},
-        {"ExtendedLogging",     "no", ConfigTest_IsBool, 0}, // extended log to syslog
-        {"ExtendedLogFile",     NULL, 0, 0}, // extended log to a file
-        {"LogAllFileAccess", "no", ConfigTest_IsBool, 0},
-
-        {"CommandSocket", 0, 0, 0},                             // not compulsory to have this
-        {"KeepAliveTime", 0, ConfigTest_IsInt, 0},                              // optional
-        {"StoreObjectInfoFile", 0, 0, 0},                               // optional
-
-        {"NotifyScript", 0, 0, 0},                              // optional script to run when backup needs attention, eg store full
-        
-        {"CertificateFile", 0, ConfigTest_Exists, 0},
-        {"PrivateKeyFile", 0, ConfigTest_Exists, 0},
-        {"TrustedCAsFile", 0, ConfigTest_Exists, 0},
-        {"KeysFile", 0, ConfigTest_Exists, 0},
-        {"DataDirectory", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("KeysFile", ConfigTest_Exists),
+        ConfigurationVerifyKey("DataDirectory", 
+                ConfigTest_Exists | ConfigTest_LastEntry),
 };
 

box/trunk/lib/backupstore/BackupStoreConfigVerify.cpp

@@ -17 +17 @@
 static const ConfigurationVerifyKey verifyserverkeys[] = 
 {
-        SERVERTLS_VERIFY_SERVER_KEYS(0) // no default listen addresses
+        SERVERTLS_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue)
+        // no default listen addresses
 };
 
@@ -33 +34 @@
 static const ConfigurationVerifyKey verifyrootkeys[] = 
 {
-        {"AccountDatabase",     0, ConfigTest_Exists, 0},
-        {"TimeBetweenHousekeeping",     0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"ExtendedLogging",     "no", ConfigTest_IsBool, 0},                    // make value "yes" to enable in config file
+        ConfigurationVerifyKey("AccountDatabase", ConfigTest_Exists),
+        ConfigurationVerifyKey("TimeBetweenHousekeeping",
+                ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("ExtendedLogging", ConfigTest_IsBool, false),
+        // make value "yes" to enable in config file
 
         #ifdef WIN32
-                {"RaidFileConf", "", ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry)
         #else
-                {"RaidFileConf", BOX_FILE_RAIDFILE_DEFAULT_CONFIG, ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("RaidFileConf", ConfigTest_LastEntry,
+                        BOX_FILE_RAIDFILE_DEFAULT_CONFIG)
         #endif
-
 };
 

box/trunk/lib/common

@@ -1 @@
-autogen_CommonException.cpp
-autogen_CommonException.h
-autogen_ConversionException.cpp
-autogen_ConversionException.h
+autogen_*
 BoxConfig.h
 BoxConfig.h.in
 Makefile
 makeexception.pl
+BoxPortsAndFiles.h

@@ -1 @@
-autogen_CommonException.cpp
-autogen_CommonException.h
-autogen_ConversionException.cpp
-autogen_ConversionException.h
+autogen_*
 BoxConfig.h
 BoxConfig.h.in
 Makefile
 makeexception.pl
+BoxPortsAndFiles.h

box/trunk/lib/common/Configuration.cpp

@@ -12 +12 @@
 #include <stdlib.h>
 #include <limits.h>
+
+#include <sstream>
 
 #include "Configuration.h"
@@ -30 +32 @@
 static const bool sValueBooleanValue[] = {true, true, false, false};
 
-
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(false),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+// to allow passing NULL for default ListenAddresses
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        NoDefaultValue_t t,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(false),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        std::string defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mDefaultValue(defaultValue),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        const char *defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mDefaultValue(defaultValue),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{ }
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        int defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{
+        ASSERT(flags & ConfigTest_IsInt);
+        std::ostringstream val;
+        val << defaultValue;
+        mDefaultValue = val.str();
+}
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        std::string name,
+        int flags,
+        bool defaultValue,
+        void *testFunction
+)
+: mName(name),
+  mHasDefaultValue(true),
+  mFlags(flags),
+  mTestFunction(testFunction)
+{
+        ASSERT(flags & ConfigTest_IsBool);
+        mDefaultValue = defaultValue ? "yes" : "no";
+}
+
+ConfigurationVerifyKey::ConfigurationVerifyKey
+(
+        const ConfigurationVerifyKey& rToCopy
+)
+: mName(rToCopy.mName),
+  mDefaultValue(rToCopy.mDefaultValue),
+  mHasDefaultValue(rToCopy.mHasDefaultValue),
+  mFlags(rToCopy.mFlags),
+  mTestFunction(rToCopy.mTestFunction)
+{ }
 
 // --------------------------------------------------------------------------
@@ -121 +221 @@
                         if(!Verify(*pconfig, *pVerify, std::string(), rErrorMsg))
                         {
-                                //TRACE1("Error message from Verify: %s", rErrorMsg.c_str());
-                                TRACE0("Error at Configuration::Verify\n");
+                                BOX_ERROR("Error verifying configuration: " <<
+                                        rErrorMsg);
                                 delete pconfig;
                                 pconfig = 0;
@@ -190 +290 @@
                         else
                         {
-                                rErrorMsg += "Unexpected start block in " + rConfig.mName + "\n";
+                                rErrorMsg += "Unexpected start block in " +
+                                        rConfig.mName + "\n";
                         }
                 }
@@ -291 +392 @@
 //
 // Function
-//              Name:    Configuration::KeyExists(const char *)
+//              Name:    Configuration::KeyExists(const std::string&)
 //              Purpose: Checks to see if a key exists
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-bool Configuration::KeyExists(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        return mKeys.find(pKeyName) != mKeys.end();
-}
-
-
-// --------------------------------------------------------------------------
-//
-// Function
-//              Name:    Configuration::GetKeyValue(const char *)
+bool Configuration::KeyExists(const std::string& rKeyName) const
+{
+        return mKeys.find(rKeyName) != mKeys.end();
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Configuration::GetKeyValue(const std::string&)
 //              Purpose: Returns the value of a configuration variable
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-const std::string &Configuration::GetKeyValue(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+const std::string &Configuration::GetKeyValue(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
         {
-                BOX_ERROR("Missing configuration key: " << pKeyName);
+                BOX_ERROR("Missing configuration key: " << rKeyName);
                 THROW_EXCEPTION(CommonException, ConfigNoKey)
         }
@@ -333 +430 @@
 //
 // Function
-//              Name:    Configuration::GetKeyValueInt(const char *)
+//              Name:    Configuration::GetKeyValueInt(const std::string& rKeyName)
 //              Purpose: Gets a key value as an integer
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-int Configuration::GetKeyValueInt(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+int Configuration::GetKeyValueInt(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
@@ -363 +458 @@
 //
 // Function
-//              Name:    Configuration::GetKeyValueBool(const char *) const
+//              Name:    Configuration::GetKeyValueBool(const std::string&)
 //              Purpose: Gets a key value as a boolean
 //              Created: 17/2/04
 //
 // --------------------------------------------------------------------------
-bool Configuration::GetKeyValueBool(const char *pKeyName) const
-{
-        if(pKeyName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
-        std::map<std::string, std::string>::const_iterator i(mKeys.find(pKeyName));
+bool Configuration::GetKeyValueBool(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
         
         if(i == mKeys.end())
@@ -429 +522 @@
 //
 // Function
-//              Name:    Configuration::SubConfigurationExists(const char *)
+//              Name:    Configuration::SubConfigurationExists(const
+//                       std::string&)
 //              Purpose: Checks to see if a sub configuration exists
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-bool Configuration::SubConfigurationExists(const char *pSubName) const
-{
-        if(pSubName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
+bool Configuration::SubConfigurationExists(const std::string& rSubName) const
+{
         // Attempt to find it...
         std::list<std::pair<std::string, Configuration> >::const_iterator i(mSubConfigurations.begin());
@@ -444 +536 @@
         {
                 // This the one?
-                if(i->first == pSubName)
+                if(i->first == rSubName)
                 {
                         // Yes.
@@ -459 +551 @@
 //
 // Function
-//              Name:    Configuration::GetSubConfiguration(const char *)
+//              Name:    Configuration::GetSubConfiguration(const
+//                       std::string&)
 //              Purpose: Gets a sub configuration
 //              Created: 2003/07/23
 //
 // --------------------------------------------------------------------------
-const Configuration &Configuration::GetSubConfiguration(const char *pSubName) const
-{
-        if(pSubName == 0) {THROW_EXCEPTION(CommonException, BadArguments)}
-
+const Configuration &Configuration::GetSubConfiguration(const std::string&
+        rSubName) const
+{
         // Attempt to find it...
         std::list<std::pair<std::string, Configuration> >::const_iterator i(mSubConfigurations.begin());
@@ -474 +566 @@
         {
                 // This the one?
-                if(i->first == pSubName)
+                if(i->first == rSubName)
                 {
                         // Yes.
@@ -529 +621 @@
                 {
                         // Can the key be found?
-                        ASSERT(pvkey->mpName);
-                        if(rConfig.KeyExists(pvkey->mpName))
+                        if(rConfig.KeyExists(pvkey->Name()))
                         {
                                 // Get value
-                                const std::string &rval = rConfig.GetKeyValue(pvkey->mpName);
+                                const std::string &rval = rConfig.GetKeyValue(pvkey->Name());
                                 const char *val = rval.c_str();
 
                                 // Check it's a number?
-                                if((pvkey->Tests & ConfigTest_IsInt) == ConfigTest_IsInt)
+                                if((pvkey->Flags() & ConfigTest_IsInt) == ConfigTest_IsInt)
                                 {                                       
                                         // Test it...
@@ -546 +637 @@
                                                 // not a good value
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) is not a valid integer.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is not a valid integer.\n";
                                         }
                                 }
                                 
                                 // Check it's a bool?
-                                if((pvkey->Tests & ConfigTest_IsBool) == ConfigTest_IsBool)
+                                if((pvkey->Flags() & ConfigTest_IsBool) == ConfigTest_IsBool)
                                 {                               
                                         // See if it's one of the allowed strings.
@@ -569 +660 @@
                                         {
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) is not a valid boolean value.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is not a valid boolean value.\n";
                                         }
                                 }
                                 
                                 // Check for multi valued statments where they're not allowed
-                                if((pvkey->Tests & ConfigTest_MultiValueAllowed) == 0)
+                                if((pvkey->Flags() & ConfigTest_MultiValueAllowed) == 0)
                                 {
                                         // Check to see if this key is a multi-value -- it shouldn't be
@@ -580 +671 @@
                                         {
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->mpName + " (key) multi value not allowed (duplicated key?).\n";
+                                                rErrorMsg += rLevel + rConfig.mName +"." + pvkey->Name() + " (key) multi value not allowed (duplicated key?).\n";
                                         }
                                 }                               
@@ -587 +678 @@
                         {
                                 // Is it required to exist?
-                                if((pvkey->Tests & ConfigTest_Exists) == ConfigTest_Exists)
+                                if((pvkey->Flags() & ConfigTest_Exists) == ConfigTest_Exists)
                                 {
                                         // Should exist, but doesn't.
                                         ok = false;
-                                        rErrorMsg += rLevel + rConfig.mName + "." + pvkey->mpName + " (key) is missing.\n";
-                                }
-                                else if(pvkey->mpDefaultValue)
-                                {
-                                        rConfig.mKeys[std::string(pvkey->mpName)] = std::string(pvkey->mpDefaultValue);
+                                        rErrorMsg += rLevel + rConfig.mName + "." + pvkey->Name() + " (key) is missing.\n";
+                                }
+                                else if(pvkey->HasDefaultValue())
+                                {
+                                        rConfig.mKeys[pvkey->Name()] =
+                                                pvkey->DefaultValue();
                                 }
                         }
                 
-                        if((pvkey->Tests & ConfigTest_LastEntry) == ConfigTest_LastEntry)
+                        if((pvkey->Flags() & ConfigTest_LastEntry) == ConfigTest_LastEntry)
                         {
                                 // No more!
@@ -619 +711 @@
                         while(scan)
                         {
-                                if(scan->mpName == i->first)
+                                if(scan->Name() == i->first)
                                 {
                                         found = true;
@@ -626 +718 @@
                                 
                                 // Next?
-                                if((scan->Tests & ConfigTest_LastEntry) == ConfigTest_LastEntry)
+                                if((scan->Flags() & ConfigTest_LastEntry) == ConfigTest_LastEntry)
                                 {
                                         break;
@@ -651 +743 @@
                 while(scan)
                 {
-                        ASSERT(scan->mpName);
-                        if(scan->mpName[0] == '*')
+                        if(scan->mName.length() > 0 && scan->mName[0] == '*')
                         {
                                 wildcardverify = scan;
@@ -660 +751 @@
                         if((scan->Tests & ConfigTest_Exists) == ConfigTest_Exists)
                         {
-                                if(scan->mpName[0] == '*')
+                                if(scan->mName.length() > 0 &&
+                                        scan->mName[0] == '*')
                                 {
                                         // Check something exists
@@ -673 +765 @@
                                 {
                                         // Check real thing exists
-                                        if(!rConfig.SubConfigurationExists(scan->mpName))
+                                        if(!rConfig.SubConfigurationExists(scan->mName))
                                         {
                                                 // Should exist, but doesn't.
                                                 ok = false;
-                                                rErrorMsg += rLevel + rConfig.mName + "." + scan->mpName + " (block) is missing.\n";
+                                                rErrorMsg += rLevel + rConfig.mName + "." + scan->mName + " (block) is missing.\n";
                                         }
                                 }
@@ -702 +794 @@
                         while(scan)
                         {
-                                if(strcmp(scan->mpName, name) == 0)
+                                if(scan->mName == name)
                                 {
                                         // found it!

box/trunk/lib/common/Configuration.h

@@ -30 +30 @@
 {
 public:
-        const char *mpName;                     // "*" for all other keys (not implemented yet)
-        const char *mpDefaultValue;     // default for when it's not present
-        int Tests;
-        void *TestFunction;                     // set to zero for now, will implement later
+        typedef enum
+        {
+                NoDefaultValue = 1
+        } NoDefaultValue_t;
+
+        ConfigurationVerifyKey(std::string name, int flags,
+                void *testFunction = NULL);
+        // to allow passing ConfigurationVerifyKey::NoDefaultValue
+        // for default ListenAddresses
+        ConfigurationVerifyKey(std::string name, int flags,
+                NoDefaultValue_t t, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                std::string defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                const char* defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                int defaultValue, void *testFunction = NULL);
+        ConfigurationVerifyKey(std::string name, int flags,
+                bool defaultValue, void *testFunction = NULL);
+        const std::string& Name() const { return mName; }
+        const std::string& DefaultValue() const { return mDefaultValue; }
+        const bool HasDefaultValue() const { return mHasDefaultValue; }
+        const int Flags() const { return mFlags; }
+        const void* TestFunction() const { return mTestFunction; }
+        ConfigurationVerifyKey(const ConfigurationVerifyKey& rToCopy);
+
+private:
+        ConfigurationVerifyKey& operator=(const ConfigurationVerifyKey&
+                noAssign);
+
+        std::string mName;         // "*" for all other keys (not implemented yet)
+        std::string mDefaultValue; // default for when it's not present
+        bool mHasDefaultValue;
+        int mFlags;
+        void *mTestFunction; // set to zero for now, will implement later
 };
 
@@ -39 +70 @@
 {
 public:
-        const char *mpName;                     // "*" for all other sub config names
+        std::string mName; // "*" for all other sub config names
         const ConfigurationVerify *mpSubConfigurations;
         const ConfigurationVerifyKey *mpKeys;
         int Tests;      
-        void *TestFunction;                     // set to zero for now, will implement later
+        void *TestFunction; // set to zero for now, will implement later
 };
 
@@ -80 +111 @@
         { return LoadAndVerify(rFilename, 0, rErrorMsg); }
         
-        bool KeyExists(const char *pKeyName) const;
-        const std::string &GetKeyValue(const char *pKeyName) const;
-        int GetKeyValueInt(const char *pKeyName) const;
-        bool GetKeyValueBool(const char *pKeyName) const;
+        bool KeyExists(const std::string& rKeyName) const;
+        const std::string &GetKeyValue(const std::string& rKeyName) const;
+        int GetKeyValueInt(const std::string& rKeyName) const;
+        bool GetKeyValueBool(const std::string& rKeyName) const;
         std::vector<std::string> GetKeyNames() const;
         
-        bool SubConfigurationExists(const char *pSubName) const;
-        const Configuration &GetSubConfiguration(const char *pSubName) const;
+        bool SubConfigurationExists(const std::string& rSubName) const;
+        const Configuration &GetSubConfiguration(const std::string& rSubName) const;
         std::vector<std::string> GetSubConfigurationNames() const;
         

box/trunk/lib/compress

@@ -1 @@
-autogen_CompressException.cpp
-autogen_CompressException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_CompressException.cpp
-autogen_CompressException.h
+autogen_*
 Makefile

box/trunk/lib/crypto

@@ -1 @@
-autogen_CipherException.cpp
-autogen_CipherException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_CipherException.cpp
-autogen_CipherException.h
+autogen_*
 Makefile

box/trunk/lib/raidfile

@@ -1 @@
-autogen_RaidFileException.cpp
-autogen_RaidFileException.h
+autogen_*
 Makefile
 raidfile-config

@@ -1 @@
-autogen_RaidFileException.cpp
-autogen_RaidFileException.h
+autogen_*
 Makefile
 raidfile-config

box/trunk/lib/raidfile/RaidFileController.cpp

@@ -71 +71 @@
         static const ConfigurationVerifyKey verifykeys[] =
         {
-                {"SetNumber",   0,      ConfigTest_Exists | ConfigTest_IsInt, 0},
-                {"BlockSize",   0,      ConfigTest_Exists | ConfigTest_IsInt, 0},
-                {"Dir0",                0,      ConfigTest_Exists, 0},
-                {"Dir1",                0,      ConfigTest_Exists, 0},
-                {"Dir2",                0,      ConfigTest_Exists | ConfigTest_LastEntry, 0}
+                ConfigurationVerifyKey("SetNumber",
+                        ConfigTest_Exists | ConfigTest_IsInt),
+                ConfigurationVerifyKey("BlockSize",
+                        ConfigTest_Exists | ConfigTest_IsInt),
+                ConfigurationVerifyKey("Dir0", ConfigTest_Exists),
+                ConfigurationVerifyKey("Dir1", ConfigTest_Exists),
+                ConfigurationVerifyKey("Dir2",
+                        ConfigTest_Exists | ConfigTest_LastEntry)
         };
         

box/trunk/lib/server

@@ -1 @@
-autogen_ConnectionException.cpp
-autogen_ConnectionException.h
-autogen_ServerException.cpp
-autogen_ServerException.h
+autogen_*
 Makefile
 makeprotocol.pl

@@ -1 @@
-autogen_ConnectionException.cpp
-autogen_ConnectionException.h
-autogen_ServerException.cpp
-autogen_ServerException.h
+autogen_*
 Makefile
 makeprotocol.pl

box/trunk/lib/server/Daemon.h

@@ -93 +93 @@
 };
 
-#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

box/trunk/lib/server/ServerStream.h

@@ -366 +366 @@
 
 #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"

box/trunk/lib/server/ServerTLS.h

@@ -71 +71 @@
 
 #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

box/trunk/test/basicserver

@@ -1 @@
-autogen_TestProtocolClient.cpp
-autogen_TestProtocolClient.h
-autogen_TestProtocolServer.cpp
-autogen_TestProtocolServer.h
+autogen_*
 _main.cpp
 Makefile

@@ -1 @@
-autogen_TestProtocolClient.cpp
-autogen_TestProtocolClient.h
-autogen_TestProtocolServer.cpp
-autogen_TestProtocolServer.h
+autogen_*
 _main.cpp
 Makefile

box/trunk/test/basicserver/testbasicserver.cpp

@@ -186 +186 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERSTREAM_VERIFY_SERVER_KEYS(0)      // no default addresses
+                SERVERSTREAM_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 
@@ -259 +259 @@
         static ConfigurationVerifyKey verifyserverkeys[] = 
         {
-                SERVERTLS_VERIFY_SERVER_KEYS(0) // no default listen addresses
+                SERVERTLS_VERIFY_SERVER_KEYS(ConfigurationVerifyKey::NoDefaultValue) // no default listen addresses
         };
 

box/trunk/test/bbackupd/testbbackupd.cpp

@@ -515 +515 @@
                         // connect and log in
                         SocketStreamTLS conn;
-                        conn.Open(context, Socket::TypeINET, "localhost", BOX_PORT_BBSTORED);
+                        conn.Open(context, Socket::TypeINET, "localhost",
+                                22011);
                         BackupProtocolClient protocol(conn);
                         protocol.QueryVersion(BACKUP_STORE_SERVER_VERSION);
@@ -608 +609 @@
 {
         sSocket.Open(rContext, Socket::TypeINET, 
-                "localhost", BOX_PORT_BBSTORED);
+                "localhost", 22011);
         std::auto_ptr<BackupProtocolClient> connection;
         connection.reset(new BackupProtocolClient(sSocket));
@@ -2560 +2561 @@
                                 == Restore_TargetExists);
                         
-                        // Make sure you can't restore to a nonexistant path
-                        printf("Try to restore to a path that doesn't exist\n");
-                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
-                                "testfiles/no-such-path/subdir", 
-                                true /* print progress dots */) 
-                                == Restore_TargetPathNotFound);
-                        
                         // Find ID of the deleted directory
                         deldirid = GetDirID(*client, "x1", restoredirid);
@@ -2578 +2572 @@
                                 true /* deleted files */) 
                                 == Restore_Complete);
+
+                        // Make sure you can't restore to a nonexistant path
+                        printf("\n\n==== Try to restore to a path "
+                                "that doesn't exist\n");
+                        fflush(stdout);
+                        TEST_THAT(BackupClientRestore(*client, restoredirid, 
+                                "testfiles/no-such-path/subdir", 
+                                true /* print progress dots */) 
+                                == Restore_TargetPathNotFound);
 
                         // Log out

box/trunk/test/bbackupd/testfiles

@@ -2 +2 @@
 extcheck2.pl
 notifyscript.pl
+bbackupd.conf
+syncallowscript.pl

@@ -2 +2 @@
 extcheck2.pl
 notifyscript.pl
+bbackupd.conf
+syncallowscript.pl

box/trunk/test/bbackupd/testfiles/bbackupd-temploc.conf

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbackupd.conf.in

@@ -9 +9 @@
 
 StoreHostname = localhost
+StorePort = 22011
 AccountNumber = 0x01234567
 

box/trunk/test/bbackupd/testfiles/bbstored.conf

@@ -10 +10 @@
 {
         PidFile = testfiles/bbstored.pid
-        ListenAddresses = inet:localhost
+        ListenAddresses = inet:localhost:22011
         CertificateFile = testfiles/serverCerts.pem
         PrivateKeyFile = testfiles/serverPrivKey.pem

box/trunk/test/common/testcommon.cpp

@@ -58 +58 @@
 ConfigurationVerifyKey verifykeys1_1_1[] =
 {
-        {"bing", 0, ConfigTest_Exists, 0},
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"terrible", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("bing", ConfigTest_Exists),
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("terrible", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_1_2[] =
 {
-        {"fish", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("fish", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -90 +90 @@
 ConfigurationVerifyKey verifykeys1_1[] =
 {
-        {"value", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string1", 0, ConfigTest_Exists, 0},
-        {"string2", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("value", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string1", ConfigTest_Exists),
+        ConfigurationVerifyKey("string2", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
 ConfigurationVerifyKey verifykeys1_2[] = 
 {
-        {"carrots", 0, ConfigTest_Exists | ConfigTest_IsInt, 0},
-        {"string", 0, ConfigTest_Exists | ConfigTest_LastEntry, 0}
+        ConfigurationVerifyKey("carrots", ConfigTest_Exists | ConfigTest_IsInt),
+        ConfigurationVerifyKey("string", ConfigTest_Exists | ConfigTest_LastEntry)
 };
 
@@ -121 +121 @@
 ConfigurationVerifyKey verifykeys1[] =
 {
-                {"notExpected", 0, 0, 0},
-                {"HasDefaultValue", "Lovely default value", 0, 0},
-                {"MultiValue", 0, ConfigTest_MultiValueAllowed, 0},
-                {"BoolTrue1", 0, ConfigTest_IsBool, 0},
-                {"BoolTrue2", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse1", 0, ConfigTest_IsBool, 0},
-                {"BoolFalse2", 0, ConfigTest_IsBool, 0},
-                {"TOPlevel", 0, ConfigTest_LastEntry | ConfigTest_Exists, 0}
+                ConfigurationVerifyKey("notExpected", 0),
+                ConfigurationVerifyKey("HasDefaultValue", 0, "Lovely default value"),
+                ConfigurationVerifyKey("MultiValue", ConfigTest_MultiValueAllowed),
+                ConfigurationVerifyKey("BoolTrue1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolTrue2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse1", ConfigTest_IsBool),
+                ConfigurationVerifyKey("BoolFalse2", ConfigTest_IsBool),
+                ConfigurationVerifyKey("TOPlevel", 
+                        ConfigTest_LastEntry | ConfigTest_Exists)
 };
 

@@ -11 +11 @@
 release
 runtest.pl
+.hg

@@ -1 +1 @@
 Makefile
 bbackupd-config
+autogen_*

@@ -1 @@
-autogen_Documentation.cpp
+autogen_*
 Makefile
 makedocumentation.pl

@@ -1 @@
-autogen_BackupProtocolServer.cpp
-autogen_BackupProtocolServer.h
+autogen_*
 Makefile
 bbstored-certs

@@ -2 +2 @@
 makebuildenv.pl
 makeparcels.pl
+makedistribution.pl

@@ -1 @@
-autogen_BackupProtocolClient.cpp
-autogen_BackupProtocolClient.h
-autogen_BackupStoreException.cpp
-autogen_BackupStoreException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_CommonException.cpp
-autogen_CommonException.h
-autogen_ConversionException.cpp
-autogen_ConversionException.h
+autogen_*
 BoxConfig.h
 BoxConfig.h.in
 Makefile
 makeexception.pl
+BoxPortsAndFiles.h

@@ -1 @@
-autogen_CompressException.cpp
-autogen_CompressException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_CipherException.cpp
-autogen_CipherException.h
+autogen_*
 Makefile

@@ -1 @@
-autogen_RaidFileException.cpp
-autogen_RaidFileException.h
+autogen_*
 Makefile
 raidfile-config

@@ -1 @@
-autogen_ConnectionException.cpp
-autogen_ConnectionException.h
-autogen_ServerException.cpp
-autogen_ServerException.h
+autogen_*
 Makefile
 makeprotocol.pl

@@ -1 @@
-autogen_TestProtocolClient.cpp
-autogen_TestProtocolClient.h
-autogen_TestProtocolServer.cpp
-autogen_TestProtocolServer.h
+autogen_*
 _main.cpp
 Makefile

@@ -2 +2 @@
 extcheck2.pl
 notifyscript.pl
+bbackupd.conf
+syncallowscript.pl