From 44cd5a315431118f8dda8f10fe0ffc77baf10c17 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 24 Feb 2009 13:53:37 +0000
Subject: [PATCH] More error checking in netslave and netmaster clients.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/branches/libjacknet@3340 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 ChangeLog                   |  2 +-
 example-clients/netmaster.c | 12 ++++++++++--
 example-clients/netslave.c  |  6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eda5a137..f60b58e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@ Michael Voigt
 2009-02-24 Stephane Letz  <letz@grame.fr>
 
 	* New libjacknet library with net.h and JackNetAPI.cpp files. New netmaster.c and netmaster.c examples.
-	* Add iPhone sources and project.
+	* Add sources and project for iPhone.
 
 2009-02-23 Stephane Letz  <letz@grame.fr>
 
diff --git a/example-clients/netmaster.c b/example-clients/netmaster.c
index ebfdfdb6..c9d5be48 100644
--- a/example-clients/netmaster.c
+++ b/example-clients/netmaster.c
@@ -145,8 +145,16 @@ main (int argc, char *argv[])
             memcpy(audio_output_buffer[i], audio_input_buffer[i], buffer_size * sizeof(float));
         }
         
-        jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL);
-        jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL);
+        if (jack_net_master_send(net, result.audio_output, audio_output_buffer, 0, NULL) < 0) {
+            printf("jack_net_master_send failure, exiting\n");
+            break;
+        }
+        
+        if (jack_net_master_recv(net, result.audio_input, audio_input_buffer, 0, NULL) < 0) {
+            printf("jack_net_master_recv failure, exiting\n");
+            break;
+        }
+
         usleep(wait_usec);
 	};
     
diff --git a/example-clients/netslave.c b/example-clients/netslave.c
index 7c83ece0..6390743d 100644
--- a/example-clients/netslave.c
+++ b/example-clients/netslave.c
@@ -49,6 +49,10 @@ usage ()
 "              [ -p port (default = %d)]\n", DEFAULT_MULTICAST_IP, DEFAULT_PORT);
 }
 
+static void net_shutdown(void* data)
+{
+    printf("Restarting...\n");
+}
 
 static int net_process(jack_nframes_t buffer_size,
                             int audio_input, 
@@ -129,6 +133,8 @@ main (int argc, char *argv[])
     printf("Slave is found and running...\n");
 
     jack_set_net_slave_process_callback(net, net_process, NULL);
+    jack_set_net_slave_shutdown_callback(net, net_shutdown, NULL);
+
     if (jack_net_slave_activate(net) != 0) {
     	fprintf(stderr, "Cannot sactivate client\n");
 		return 1;