[Box Backup-dev] COMMIT r206 - box/chris/win32/crash-test-pipes/bin/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2005-12-12 01:07:45 +0000 (Mon, 12 Dec 2005)
New Revision: 206

Modified:
   box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
Log:
Removed custom exceptions, still crashes

Modified: box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 01:00:10 UTC (rev 205)
+++ box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 01:07:45 UTC (rev 206)
@@ -7,27 +7,20 @@
 //
 // --------------------------------------------------------------------------
 
-#define THROW_EXCEPTION(type, subtype)	\
-	{	\
-		throw type(type::subtype);	\
-	}
-
 #include <stdio.h>
 #include <unistd.h>
 #include <windows.h>
 
-#include "ServerException.h"
-// #include "WinNamedPipeStream.h"
-
 class BackupDaemon
 {
 public:
 	BackupDaemon();
 	~BackupDaemon();
+
 private:
-	BackupDaemon(const BackupDaemon &);
-public:
+	BackupDaemon(const BackupDaemon &) { /* do not call */ }
 
+public:
 	void Run();
 
 	// Allow other classes to call this too
@@ -48,28 +41,9 @@
 
 #define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"
 
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupDaemon::BackupDaemon()
-//		Purpose: constructor
-//		Created: 2003/10/08
-//
-// --------------------------------------------------------------------------
-BackupDaemon::BackupDaemon()
-{ }
+BackupDaemon::BackupDaemon() { }
+BackupDaemon::~BackupDaemon() { }
 
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupDaemon::~BackupDaemon()
-//		Purpose: Destructor
-//		Created: 2003/10/08
-//
-// --------------------------------------------------------------------------
-BackupDaemon::~BackupDaemon()
-{ }
-
 void ConnectorConnectPipe()
 {
 	HANDLE SocketHandle = CreateFileW( 
@@ -145,7 +119,7 @@
 	if (handle == NULL)
 	{
 		printf("CreateNamedPipeW failed: %d\n", GetLastError());
-		THROW_EXCEPTION(ServerException, SocketOpenError)
+		throw 1;
 	}
 
 	bool connected = ConnectNamedPipe(handle, (LPOVERLAPPED) NULL);
@@ -154,7 +128,7 @@
 	{
 		printf("ConnectNamedPipe failed: %d\n", GetLastError());
 		CloseHandle(handle);
-		THROW_EXCEPTION(ServerException, SocketOpenError)
+		throw 1;
 	}
 
 	if (!FlushFileBuffers(handle))
@@ -170,7 +144,7 @@
 	if (!CloseHandle(handle))
 	{
 		printf("CloseHandle failed: %d\n", GetLastError());
-		THROW_EXCEPTION(ServerException, SocketCloseError)
+		throw 1;
 	}
 }
 
@@ -182,10 +156,9 @@
 		{
 			NamedPipeAccept(BOX_NAMED_PIPE_NAME);
 		}
-		catch (ConnectionException &e)
+		catch (int i)
 		{
-			if (e.GetType()    == ConnectionException::ExceptionType &&
-			    e.GetSubType() == ConnectionException::SocketConnectError)
+			if (i == 2)
 			{
 				printf("Impossible error in "
 					"this thread! Aborting.\n");
@@ -267,7 +240,7 @@
 		0 /* let OS choose protocol */);
 	if(handle == -1)
 	{
-		THROW_EXCEPTION(ServerException, SocketOpenError)
+		throw 2;
 	}
 	
 	// Connect it
@@ -275,6 +248,6 @@
 	{
 		// Dispose of the socket
 		::closesocket(handle);
-		THROW_EXCEPTION(ConnectionException, SocketConnectError)
+		throw 2;
 	}
 }