[Box Backup-commit] COMMIT r3430 - box/trunk/bin/bbackupctl

subversion at boxbackup.org subversion at boxbackup.org
Wed Dec 3 13:42:00 GMT 2014


Author: chris
Date: 2014-12-03 13:41:59 +0000 (Wed, 03 Dec 2014)
New Revision: 3430

Modified:
   box/trunk/bin/bbackupctl/bbackupctl.cpp
Log:
Fix missing timeouts on network operations in bbackupctl.

Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp	2014-12-01 10:40:48 UTC (rev 3429)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp	2014-12-03 13:41:59 UTC (rev 3430)
@@ -173,7 +173,7 @@
 	
 	// 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 @@
 		"  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 @@
 	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)
 		{




More information about the Boxbackup-commit mailing list