Changeset 2946

Timestamp:

26/04/2011 19:48:00 (13 months ago)

Author:

chris

Message:

Add a method to BackupStoreFilenameClear? to get the clear filename only if
it's available or crypto has been configured to decrypt it. This allows
client and server to share the same definition of protocol objects that
use Filenames, instead of using BackupStoreFilename? on the server and
BackupStoreFilenameClear? on the client.

Location:

box/trunk/lib/backupstore

Files:

• BackupStoreFilenameClear.cpp (modified) (4 diffs)
• BackupStoreFilenameClear.h (modified) (1 diff)

box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp

@@ -60 +60 @@
 // --------------------------------------------------------------------------
 BackupStoreFilenameClear::BackupStoreFilenameClear(const BackupStoreFilenameClear &rToCopy)
-        : BackupStoreFilename(rToCopy),
-          mClearFilename(rToCopy.mClearFilename)
+: BackupStoreFilename(rToCopy),
+  mClearFilename(rToCopy.mClearFilename)
 {
 }
@@ -74 +74 @@
 // --------------------------------------------------------------------------
 BackupStoreFilenameClear::BackupStoreFilenameClear(const BackupStoreFilename &rToCopy)
-        : BackupStoreFilename(rToCopy)
+: BackupStoreFilename(rToCopy)
 {
         // Will get a clear filename when it's required
@@ -112 +112 @@
         MakeClearAvailable();
         return mClearFilename;
+}
+const std::string &BackupStoreFilenameClear::GetClearFilenameIfPossible(const std::string& alternative) const
+{
+        if(mClearFilename.empty() && !(sBlowfishDecrypt.IsInitialised()))
+        {
+                // encrypted and cannot decrypt
+                return alternative;
+        }
+        else
+        {
+                return GetClearFilename();
+        }
 }
 #endif
@@ -168 +180 @@
         {
         case Encoding_Clear:
-                BOX_TRACE("**** BackupStoreFilename encoded with "
+                BOX_WARNING("**** BackupStoreFilename encoded with "
                         "Clear encoding ****");
                 mClearFilename.assign(GetEncodedFilename().c_str() + 2,

box/trunk/lib/backupstore/BackupStoreFilenameClear.h

@@ -39 +39 @@
 #else
         const std::string &GetClearFilename() const;
+        const std::string &GetClearFilenameIfPossible(const std::string& alternative) const;
 #endif
         void SetClearFilename(const std::string &rToEncode);