From 3fa859b50cac44d98c3062bcfc421bf2a96001a7 Mon Sep 17 00:00:00 2001
From: moret <moret@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Thu, 5 Jun 2008 09:26:55 +0000
Subject: [PATCH] Fix NetDriver (network errors)

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2455 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackNetDriver.cpp | 7 ++++++-
 common/JackNetTool.h     | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp
index 68a9ae99..edeba782 100644
--- a/common/JackNetDriver.cpp
+++ b/common/JackNetDriver.cpp
@@ -116,6 +116,8 @@ namespace Jack
 			//then tell the master we are ready
 			jack_info ( "Initializing connection with %s...", fParams.fMasterNetName );
 			status = SendMasterStartSync();
+			if ( status == NET_ERROR )
+				return false;
 		}
 		while ( status != ROLLING );
 
@@ -217,7 +219,10 @@ namespace Jack
 		//tell the master to start
 		SetPacketType ( &fParams, START_MASTER );
 		if ( send ( fSockfd, &fParams, sizeof ( session_params_t ), MSG_DONTWAIT ) < 0 )
+		{
 			jack_error ( "Error in send : %s", strerror ( errno ) );
+			return ( ( errno == ECONNABORTED ) || ( errno == ECONNREFUSED ) || ( errno == ECONNRESET ) ) ? NET_ERROR : SEND_ERROR;
+		}
 		return ROLLING;
 	}
 
@@ -237,7 +242,7 @@ namespace Jack
 		fTxBuffer = NULL;
 		fRxBuffer = NULL;
 		fNetAudioCaptureBuffer = NULL;
-		fNetAudioCaptureBuffer = NULL;
+		fNetAudioPlaybackBuffer = NULL;
 		fNetMidiCaptureBuffer = NULL;
 		fNetMidiPlaybackBuffer = NULL;
 		fMidiCapturePortList = NULL;
diff --git a/common/JackNetTool.h b/common/JackNetTool.h
index 2940a710..d9537032 100644
--- a/common/JackNetTool.h
+++ b/common/JackNetTool.h
@@ -57,6 +57,8 @@ namespace Jack
 	{
 		SOCKET_ERROR,
 		CONNECT_ERROR,
+		NET_ERROR,
+		SEND_ERROR,
 		RECV_ERROR,
 		CONNECTED,
 		ROLLING