Changeset 2696

Timestamp:

06/06/2010 16:12:20 (2 years ago)

Author:

chris

Message:

Add support for account numbers greater than 0x7fffffff without wrapping.

Location:

box/trunk

Files:

• bin/bbackupd/BackupClientContext.cpp (modified) (1 diff)
• bin/bbackupd/BackupClientContext.h (modified) (2 diffs)
• bin/bbackupd/BackupDaemon.cpp (modified) (1 diff)
• lib/backupclient/BackupDaemonConfigVerify.cpp (modified) (1 diff)
• lib/common/Configuration.cpp (modified) (2 diffs)
• lib/common/Configuration.h (modified) (2 diffs)

box/trunk/bin/bbackupd/BackupClientContext.cpp

@@ -46 +46 @@
         const std::string &rHostname,
         int Port,
-        int32_t AccountNumber, 
+        uint32_t AccountNumber, 
         bool ExtendedLogging,
         bool ExtendedLogToFile,

box/trunk/bin/bbackupd/BackupClientContext.h

@@ -46 +46 @@
                 const std::string &rHostname,
                 int32_t Port,
-                int32_t AccountNumber, 
+                uint32_t AccountNumber, 
                 bool ExtendedLogging,
                 bool ExtendedLogToFile,
@@ -214 +214 @@
         std::string mHostname;
         int mPort;
-        int32_t mAccountNumber;
+        uint32_t mAccountNumber;
         SocketStreamTLS *mpSocket;
         BackupProtocolClient *mpConnection;

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -744 +744 @@
                 conf.GetKeyValue("StoreHostname"),
                 conf.GetKeyValueInt("StorePort"),
-                conf.GetKeyValueInt("AccountNumber"), 
+                conf.GetKeyValueUint32("AccountNumber"), 
                 conf.GetKeyValueBool("ExtendedLogging"),
                 conf.KeyExists("ExtendedLogFile"),

box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp

@@ -66 +66 @@
 {
         ConfigurationVerifyKey("AccountNumber",
-                ConfigTest_Exists | ConfigTest_IsInt),
+                ConfigTest_Exists | ConfigTest_IsUint32),
         ConfigurationVerifyKey("UpdateStoreInterval",
                 ConfigTest_Exists | ConfigTest_IsInt),

box/trunk/lib/common/Configuration.cpp

@@ -454 +454 @@
         else
         {
-                long value = ::strtol((i->second).c_str(), NULL, 0 /* C style handling */);
+                long value = ::strtol((i->second).c_str(), NULL,
+                        0 /* C style handling */);
                 if(value == LONG_MAX || value == LONG_MIN)
+                {
+                        THROW_EXCEPTION(CommonException, ConfigBadIntValue)
+                }
+                return (int)value;
+        }
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//              Name:    Configuration::GetKeyValueUint32(const std::string& rKeyName)
+//              Purpose: Gets a key value as a 32-bit unsigned integer
+//              Created: 2003/07/23
+//
+// --------------------------------------------------------------------------
+uint32_t Configuration::GetKeyValueUint32(const std::string& rKeyName) const
+{
+        std::map<std::string, std::string>::const_iterator i(mKeys.find(rKeyName));
+        
+        if(i == mKeys.end())
+        {
+                THROW_EXCEPTION(CommonException, ConfigNoKey)
+        }
+        else
+        {
+                errno = 0;
+                long value = ::strtoul((i->second).c_str(), NULL,
+                        0 /* C style handling */);
+                if(errno != 0)
                 {
                         THROW_EXCEPTION(CommonException, ConfigBadIntValue)
@@ -681 +712 @@
                                         }
                                 }
+
+                                // Check it's a number?
+                                if(pvkey->Flags() & ConfigTest_IsUint32)
+                                {                                       
+                                        // Test it...
+                                        char *end;
+                                        errno = 0;
+                                        uint32_t r = ::strtoul(val, &end, 0);
+                                        if(errno != 0 || end != (val + rval.size()))
+                                        {
+                                                // not a good value
+                                                ok = false;
+                                                rErrorMsg += rLevel + mName + "." + pvkey->Name() + " (key) is not a valid unsigned 32-bit integer.\n";
+                                        }
+                                }
                                 
                                 // Check it's a bool?

box/trunk/lib/common/Configuration.h

@@ -23 +23 @@
         ConfigTest_Exists = 2,
         ConfigTest_IsInt = 4,
-        ConfigTest_MultiValueAllowed = 8,
-        ConfigTest_IsBool = 16
+        ConfigTest_IsUint32 = 8, 
+        ConfigTest_MultiValueAllowed = 16,
+        ConfigTest_IsBool = 32
 };
 
@@ -113 +114 @@
         const std::string &GetKeyValue(const std::string& rKeyName) const;
         int GetKeyValueInt(const std::string& rKeyName) const;
+        uint32_t GetKeyValueUint32(const std::string& rKeyName) const;
         bool GetKeyValueBool(const std::string& rKeyName) const;
         std::vector<std::string> GetKeyNames() const;