[Box Backup-dev] COMMIT r653 - box/chris/general/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-07-19 08:48:29 +0000 (Wed, 19 Jul 2006)
New Revision: 653

Modified:
   box/chris/general/lib/common/Test.h
Log:
* Test.h
- Removed dependency on WinNamedPipeStream, now in lib/server


Modified: box/chris/general/lib/common/Test.h
===================================================================
--- box/chris/general/lib/common/Test.h	2006-07-19 03:08:58 UTC (rev 652)
+++ box/chris/general/lib/common/Test.h	2006-07-19 08:48:29 UTC (rev 653)
@@ -211,130 +211,10 @@
 #endif // WIN32
 }
 
-#ifdef WIN32
+#ifndef WIN32
 
-#include "WinNamedPipeStream.h"
-#include "IOStreamGetLine.h"
-#include "BoxPortsAndFiles.h"
-
-inline bool SendCommands(const std::string& rCmd)
-{
-	WinNamedPipeStream connection;
-
-	try
-	{
-		connection.Connect(BOX_NAMED_PIPE_NAME);
-	}
-	catch(...)
-	{
-		printf("Failed to connect to daemon control socket.\n");
-		return false;
-	}
-
-	// For receiving data
-	IOStreamGetLine getLine(connection);
-	
-	// Wait for the configuration summary
-	std::string configSummary;
-	if(!getLine.GetLine(configSummary))
-	{
-		printf("Failed to receive configuration summary from daemon\n");
-		return false;
-	}
-
-	// Was the connection rejected by the server?
-	if(getLine.IsEOF())
-	{
-		printf("Server rejected the connection.\n");
-		return false;
-	}
-
-	// Decode it
-	int autoBackup, updateStoreInterval, minimumFileAge, maxUploadWait;
-	if(::sscanf(configSummary.c_str(), "bbackupd: %d %d %d %d", 
-			&autoBackup, &updateStoreInterval, 
-			&minimumFileAge, &maxUploadWait) != 4)
-	{
-		printf("Config summary didn't decode\n");
-		return false;
-	}
-
-	std::string cmds;
-	bool expectResponse;
-
-	if (rCmd != "")
-	{
-		cmds = rCmd;
-		cmds += "\nquit\n";
-		expectResponse = true;
-	}
-	else
-	{
-		cmds = "quit\n";
-		expectResponse = false;
-	}
-	
-	connection.Write(cmds.c_str(), cmds.size());
-	
-	// Read the response
-	std::string line;
-	bool statusOk = !expectResponse;
-
-	while (expectResponse && !getLine.IsEOF() && getLine.GetLine(line))
-	{
-		// Is this an OK or error line?
-		if (line == "ok")
-		{
-			statusOk = true;
-		}
-		else if (line == "error")
-		{
-			printf("ERROR (%s)\n", rCmd.c_str());
-			break;
-		}
-		else
-		{
-			printf("WARNING: Unexpected response to command '%s': "
-				"%s", rCmd.c_str(), line.c_str());
-		}
-	}
-	
-	return statusOk;
-}
-
 inline bool HUPServer(int pid)
 {
-	return SendCommands("reload");
-}
-
-inline bool KillServer(int pid)
-{
-	HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, false, pid);
-	if (hProcess == NULL)
-	{
-		printf("Failed to open process %d: error %d\n",
-			pid, (int)GetLastError());
-		return false;
-	}
-
-	if (!TerminateProcess(hProcess, 1))
-	{
-		printf("Failed to terminate process %d: error %d\n",
-			pid, (int)GetLastError());
-		CloseHandle(hProcess);
-		return false;
-	}
-
-	CloseHandle(hProcess);
-
-	::sleep(1);
-	return !ServerIsAlive(pid);
-}
-
-#else // !WIN32
-
-inline bool HUPServer(int pid)
-{
 	if(pid == 0) return false;
 	return ::kill(pid, SIGHUP) != -1;
 }
@@ -348,7 +228,7 @@
 	return !ServerIsAlive(pid);
 }
 
-#endif // WIN32
+#endif // !WIN32
 
 inline void TestRemoteProcessMemLeaks(const char *filename)
 {