diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-12-03 13:41:59 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-12-03 13:41:59 +0000 |
| commit | 5a8312b5066d9b538e0466417aebf6f10135d846 (patch) | |
| tree | 5b0668936d3614eb476644f5139f6a6ad6db76e4 /bin | |
| parent | d49cc0d348a8ebb966240110884386fc93ad085b (diff) | |
Fix missing timeouts on network operations in bbackupctl.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index 256bace1..b00e90ba 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -173,7 +173,7 @@ int main(int argc, const char *argv[]) // Wait for the configuration summary std::string configSummary; - if(!getLine.GetLine(configSummary, PROTOCOL_DEFAULT_TIMEOUT)) + if(!getLine.GetLine(configSummary, false, PROTOCOL_DEFAULT_TIMEOUT)) { BOX_ERROR("Failed to receive configuration summary " "from daemon"); @@ -206,7 +206,7 @@ int main(int argc, const char *argv[]) " MaxUploadWait = " << maxUploadWait << " seconds"); std::string stateLine; - if(!getLine.GetLine(stateLine, PROTOCOL_DEFAULT_TIMEOUT) || getLine.IsEOF()) + if(!getLine.GetLine(stateLine, false, PROTOCOL_DEFAULT_TIMEOUT) || getLine.IsEOF()) { BOX_ERROR("Failed to receive state line from daemon"); return 1; @@ -314,7 +314,8 @@ int main(int argc, const char *argv[]) bool syncIsRunning = false; bool finished = false; - while(command != NoCommand && !finished && !getLine.IsEOF() && getLine.GetLine(line)) + while(command != NoCommand && !finished && !getLine.IsEOF() && + getLine.GetLine(line, false, PROTOCOL_DEFAULT_TIMEOUT)) { switch (command) { |