diff options
author | Chris Wilson <chris+github@qwirx.com> | 2011-08-27 14:06:46 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2011-08-27 14:06:46 +0000 |
commit | a473bb0923b0f7800bb95ef96ba20f5cf6cbe5b4 (patch) | |
tree | 68620eb4a0566889c5a2e903a5b2fb0b678d9613 /bin/bbackupquery | |
parent | 50aac86024fae12072a240e6b952c9bb11437956 (diff) |
Combine client and server protocols to make way for an offline/local protocol.
Rename ProtocolObject to Message.
Diffstat (limited to 'bin/bbackupquery')
-rw-r--r-- | bin/bbackupquery/BackupQueries.cpp | 66 | ||||
-rw-r--r-- | bin/bbackupquery/CommandCompletion.cpp | 22 | ||||
-rw-r--r-- | bin/bbackupquery/bbackupquery.cpp | 6 |
3 files changed, 47 insertions, 47 deletions
diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp index edeeb034..3a63f8b5 100644 --- a/bin/bbackupquery/BackupQueries.cpp +++ b/bin/bbackupquery/BackupQueries.cpp @@ -49,7 +49,7 @@ #include "PathUtils.h" #include "SelfFlushingStream.h" #include "Utils.h" -#include "autogen_BackupProtocolClient.h" +#include "autogen_BackupProtocol.h" #include "MemLeakFindOn.h" @@ -358,16 +358,16 @@ static std::string GetTimeString(BackupStoreDirectory::Entry& en, void BackupQueries::List(int64_t DirID, const std::string &rListRoot, const bool *opts, bool FirstLevel) { // Generate exclude flags - int16_t excludeFlags = BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING; - if(!opts[LIST_OPTION_ALLOWOLD]) excludeFlags |= BackupProtocolClientListDirectory::Flags_OldVersion; - if(!opts[LIST_OPTION_ALLOWDELETED]) excludeFlags |= BackupProtocolClientListDirectory::Flags_Deleted; + int16_t excludeFlags = BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING; + if(!opts[LIST_OPTION_ALLOWOLD]) excludeFlags |= BackupProtocolListDirectory::Flags_OldVersion; + if(!opts[LIST_OPTION_ALLOWDELETED]) excludeFlags |= BackupProtocolListDirectory::Flags_Deleted; // Do communication try { mrConnection.QueryListDirectory( DirID, - BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING, + BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING, // both files and directories excludeFlags, true /* want attributes */); @@ -434,7 +434,7 @@ void BackupQueries::List(int64_t DirID, const std::string &rListRoot, const bool // terminate *(f++) = ' '; *(f++) = '\0'; - printf(displayflags); + printf("%s", displayflags); if(en_flags != 0) { @@ -544,7 +544,7 @@ int64_t BackupQueries::FindDirectoryObjectID(const std::string &rDirName, // Start from current stack, or root, whichever is required std::vector<std::pair<std::string, int64_t> > stack; - int64_t dirID = BackupProtocolClientListDirectory::RootDirectory; + int64_t dirID = BackupProtocolListDirectory::RootDirectory; if(rDirName.size() > 0 && rDirName[0] == '/') { // Root, do nothing @@ -560,9 +560,9 @@ int64_t BackupQueries::FindDirectoryObjectID(const std::string &rDirName, } // Generate exclude flags - int16_t excludeFlags = BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING; - if(!AllowOldVersion) excludeFlags |= BackupProtocolClientListDirectory::Flags_OldVersion; - if(!AllowDeletedDirs) excludeFlags |= BackupProtocolClientListDirectory::Flags_Deleted; + int16_t excludeFlags = BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING; + if(!AllowOldVersion) excludeFlags |= BackupProtocolListDirectory::Flags_OldVersion; + if(!AllowDeletedDirs) excludeFlags |= BackupProtocolListDirectory::Flags_Deleted; // Read directories for(unsigned int e = 0; e < dirElements.size(); ++e) @@ -582,20 +582,20 @@ int64_t BackupQueries::FindDirectoryObjectID(const std::string &rDirName, stack.pop_back(); // New dir ID - dirID = (stack.size() > 0)?(stack[stack.size() - 1].second):BackupProtocolClientListDirectory::RootDirectory; + dirID = (stack.size() > 0)?(stack[stack.size() - 1].second):BackupProtocolListDirectory::RootDirectory; } else { // At root anyway - dirID = BackupProtocolClientListDirectory::RootDirectory; + dirID = BackupProtocolListDirectory::RootDirectory; } } else { // Not blank element. Read current directory. - std::auto_ptr<BackupProtocolClientSuccess> dirreply(mrConnection.QueryListDirectory( + std::auto_ptr<BackupProtocolSuccess> dirreply(mrConnection.QueryListDirectory( dirID, - BackupProtocolClientListDirectory::Flags_Dir, // just directories + BackupProtocolListDirectory::Flags_Dir, // just directories excludeFlags, true /* want attributes */)); @@ -646,7 +646,7 @@ int64_t BackupQueries::GetCurrentDirectoryID() // Special case for root if(mDirStack.size() == 0) { - return BackupProtocolClientListDirectory::RootDirectory; + return BackupProtocolListDirectory::RootDirectory; } // Otherwise, get from the last entry on the stack @@ -837,8 +837,8 @@ void BackupQueries::CommandGetObject(const std::vector<std::string> &args, const try { // Request object - std::auto_ptr<BackupProtocolClientSuccess> getobj(mrConnection.QueryGetObject(id)); - if(getobj->GetObjectID() != BackupProtocolClientGetObject::NoObject) + std::auto_ptr<BackupProtocolSuccess> getobj(mrConnection.QueryGetObject(id)); + if(getobj->GetObjectID() != BackupProtocolGetObject::NoObject) { // Stream that object out to the file std::auto_ptr<IOStream> objectStream(mrConnection.ReceiveStream()); @@ -1017,19 +1017,19 @@ void BackupQueries::CommandGet(std::vector<std::string> args, const bool *opts) if(opts['i']) { // can retrieve anything by ID - flagsExclude = BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING; + flagsExclude = BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING; } else { // only current versions by name flagsExclude = - BackupProtocolClientListDirectory::Flags_OldVersion | - BackupProtocolClientListDirectory::Flags_Deleted; + BackupProtocolListDirectory::Flags_OldVersion | + BackupProtocolListDirectory::Flags_Deleted; } fileId = FindFileID(args[0], opts, &dirId, &localName, - BackupProtocolClientListDirectory::Flags_File, // just files + BackupProtocolListDirectory::Flags_File, // just files flagsExclude, NULL /* don't care about flags found */); if (fileId == 0) @@ -1519,10 +1519,10 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, // Get the directory listing from the store mrConnection.QueryListDirectory( DirID, - BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING, + BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING, // get everything - BackupProtocolClientListDirectory::Flags_OldVersion | - BackupProtocolClientListDirectory::Flags_Deleted, + BackupProtocolListDirectory::Flags_OldVersion | + BackupProtocolListDirectory::Flags_Deleted, // except for old versions and deleted files true /* want attributes */); @@ -1896,7 +1896,7 @@ void BackupQueries::CommandRestore(const std::vector<std::string> &args, const b return; } - if(dirID == BackupProtocolClientListDirectory::RootDirectory) + if(dirID == BackupProtocolListDirectory::RootDirectory) { BOX_ERROR("Cannot restore the root directory -- restore locations individually."); return; @@ -2053,7 +2053,7 @@ void BackupQueries::CommandUsage(const bool *opts) bool MachineReadable = opts['m']; // Request full details from the server - std::auto_ptr<BackupProtocolClientAccountUsage> usage(mrConnection.QueryGetAccountUsage()); + std::auto_ptr<BackupProtocolAccountUsage> usage(mrConnection.QueryGetAccountUsage()); // Display each entry in turn int64_t hardLimit = usage->GetBlocksHardLimit(); @@ -2129,9 +2129,9 @@ void BackupQueries::CommandUndelete(const std::vector<std::string> &args, const fileId = FindFileID(storeDirEncoded, opts, &parentId, &fileName, /* include files and directories */ - BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING, + BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, /* include old and deleted files */ - BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING, + BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, &flagsOut); if (fileId == 0) @@ -2144,7 +2144,7 @@ void BackupQueries::CommandUndelete(const std::vector<std::string> &args, const try { // Undelete object - if(flagsOut & BackupProtocolClientListDirectory::Flags_File) + if(flagsOut & BackupProtocolListDirectory::Flags_File) { mrConnection.QueryUndeleteFile(parentId, fileId); } @@ -2209,10 +2209,10 @@ void BackupQueries::CommandDelete(const std::vector<std::string> &args, fileId = FindFileID(storeDirEncoded, opts, &parentId, &fileName, /* include files and directories */ - BackupProtocolClientListDirectory::Flags_EXCLUDE_NOTHING, + BackupProtocolListDirectory::Flags_EXCLUDE_NOTHING, /* exclude old and deleted files */ - BackupProtocolClientListDirectory::Flags_OldVersion | - BackupProtocolClientListDirectory::Flags_Deleted, + BackupProtocolListDirectory::Flags_OldVersion | + BackupProtocolListDirectory::Flags_Deleted, &flagsOut); if (fileId == 0) @@ -2227,7 +2227,7 @@ void BackupQueries::CommandDelete(const std::vector<std::string> &args, try { // Delete object - if(flagsOut & BackupProtocolClientListDirectory::Flags_File) + if(flagsOut & BackupProtocolListDirectory::Flags_File) { mrConnection.QueryDeleteFile(parentId, fn); } diff --git a/bin/bbackupquery/CommandCompletion.cpp b/bin/bbackupquery/CommandCompletion.cpp index f7dab973..6d6189b3 100644 --- a/bin/bbackupquery/CommandCompletion.cpp +++ b/bin/bbackupquery/CommandCompletion.cpp @@ -32,7 +32,7 @@ #include "BackupQueries.h" #include "Configuration.h" -#include "autogen_BackupProtocolClient.h" +#include "autogen_BackupProtocol.h" #include "MemLeakFindOn.h" @@ -154,12 +154,12 @@ int16_t GetExcludeFlags(BackupQueries::ParsedCommand& rCommand) if (rCommand.mOptions.find(LIST_OPTION_ALLOWOLD) == std::string::npos) { - excludeFlags |= BackupProtocolClientListDirectory::Flags_OldVersion; + excludeFlags |= BackupProtocolListDirectory::Flags_OldVersion; } if (rCommand.mOptions.find(LIST_OPTION_ALLOWDELETED) == std::string::npos) { - excludeFlags |= BackupProtocolClientListDirectory::Flags_Deleted; + excludeFlags |= BackupProtocolListDirectory::Flags_Deleted; } return excludeFlags; @@ -225,18 +225,18 @@ std::vector<std::string> CompleteRemoteFileOrDirectory( // If we're looking for directories, then only list directories. bool completeFiles = includeFlags & - BackupProtocolClientListDirectory::Flags_File; + BackupProtocolListDirectory::Flags_File; bool completeDirs = includeFlags & - BackupProtocolClientListDirectory::Flags_Dir; + BackupProtocolListDirectory::Flags_Dir; int16_t listFlags = 0; if(completeFiles) { - listFlags = BackupProtocolClientListDirectory::Flags_INCLUDE_EVERYTHING; + listFlags = BackupProtocolListDirectory::Flags_INCLUDE_EVERYTHING; } else if(completeDirs) { - listFlags = BackupProtocolClientListDirectory::Flags_Dir; + listFlags = BackupProtocolListDirectory::Flags_Dir; } rProtocol.QueryListDirectory(listDirId, @@ -258,7 +258,7 @@ std::vector<std::string> CompleteRemoteFileOrDirectory( if(name.compare(0, searchPrefix.length(), searchPrefix) == 0) { if(en->IsDir() && - (includeFlags & BackupProtocolClientListDirectory::Flags_Dir) == 0) + (includeFlags & BackupProtocolListDirectory::Flags_Dir) == 0) { // Was looking for a file, but this is a // directory, so append a slash to the name @@ -282,13 +282,13 @@ std::vector<std::string> CompleteRemoteFileOrDirectory( COMPLETION_FUNCTION(RemoteDir, completions = CompleteRemoteFileOrDirectory(rCommand, prefix, rProtocol, rQueries, - BackupProtocolClientListDirectory::Flags_Dir); + BackupProtocolListDirectory::Flags_Dir); ) COMPLETION_FUNCTION(RemoteFile, completions = CompleteRemoteFileOrDirectory(rCommand, prefix, rProtocol, rQueries, - BackupProtocolClientListDirectory::Flags_File); + BackupProtocolListDirectory::Flags_File); ) COMPLETION_FUNCTION(LocalDir, @@ -324,7 +324,7 @@ COMPLETION_FUNCTION(RemoteFileIdInCurrentDir, rProtocol.QueryListDirectory( listDirId, - BackupProtocolClientListDirectory::Flags_File, + BackupProtocolListDirectory::Flags_File, excludeFlags, false /* no attributes */); // Retrieve the directory from the stream following diff --git a/bin/bbackupquery/bbackupquery.cpp b/bin/bbackupquery/bbackupquery.cpp index 788db51f..a89fba5f 100644 --- a/bin/bbackupquery/bbackupquery.cpp +++ b/bin/bbackupquery/bbackupquery.cpp @@ -50,7 +50,7 @@ #include "SSLLib.h" #include "BackupStoreConstants.h" #include "BackupStoreException.h" -#include "autogen_BackupProtocolClient.h" +#include "autogen_BackupProtocol.h" #include "BackupQueries.h" #include "FdGetLine.h" #include "BackupClientCryptoKeys.h" @@ -447,7 +447,7 @@ int main(int argc, const char *argv[]) if(!quiet) BOX_INFO("Login to store..."); // Check the version of the server { - std::auto_ptr<BackupProtocolClientVersion> serverVersion(connection.QueryVersion(BACKUP_STORE_SERVER_VERSION)); + std::auto_ptr<BackupProtocolVersion> serverVersion(connection.QueryVersion(BACKUP_STORE_SERVER_VERSION)); if(serverVersion->GetVersion() != BACKUP_STORE_SERVER_VERSION) { THROW_EXCEPTION(BackupStoreException, WrongServerVersion) @@ -455,7 +455,7 @@ int main(int argc, const char *argv[]) } // Login -- if this fails, the Protocol will exception connection.QueryLogin(conf.GetKeyValueUint32("AccountNumber"), - (readWrite)?0:(BackupProtocolClientLogin::Flags_ReadOnly)); + (readWrite)?0:(BackupProtocolLogin::Flags_ReadOnly)); // 5. Tell user. if(!quiet) printf("Login complete.\n\nType \"help\" for a list of commands.\n\n"); |