--- projects/cms/source/host/ihost-perl/ihost.pl	2001/02/28 10:52:16	1.19
+++ projects/cms/source/host/ihost-perl/ihost.pl	2001/03/06 08:38:42	1.24
@@ -9,8 +9,8 @@
 # methods as you see fit.
 #  - pjm2@ukc.ac.uk
 #
-# $Author: tdb $
-# $Id: ihost.pl,v 1.19 2001/02/28 10:52:16 tdb Exp $
+# $Author: pjm2 $
+# $Id: ihost.pl,v 1.24 2001/03/06 08:38:42 pjm2 Exp $
 #------------------------------------------------------------
 
 $| = 1;
@@ -86,7 +86,7 @@ sub tcp_configure() {
                                      PeerAddr => $filter_manager_addr,
                                      PeerPort => $filter_manager_port,
                                      Proto => 'tcp'
-                                    );
+                                    ) or die "Cannot connect!";
     if (!defined $sock) {
         print "IHOST ERROR: Could not connect to $filter_manager_addr:$filter_manager_port.\n";
         print "Please check that there is an i-scream server at this address.\n";
@@ -151,9 +151,17 @@ sub tcp_configure() {
     
     print $sock "FILTER\n";
     $response = <$sock>;
+    unless (defined($response)) {
+        print "Failed: Could not get a filter address from the filter manager.\n";
+        exit(1);
+    }
     chop $response;
     $response =~ /(.*);(.*);(.*)/;
     ($filter_addr, $udp_port, $tcp_port) = ($1, $2, $3);
+    unless (defined($filter_addr) && defined($udp_port) && defined($tcp_port)) {
+        print "Failed: Filter address response from server did not make sense: $response\n";
+        exit(1);
+    }
     
     print "Got filter data ($filter_addr, $udp_port, $tcp_port)\n";
 
@@ -265,13 +273,11 @@ EOF
     # Make the packet smaller by stripping out newlines and leading spaces.
     $xml =~ s/\n\s*//g;
 
-print $xml;
-    
     my($sock) = new IO::Socket::INET (
                                       PeerPort => $udp_port,
                                       PeerAddr => $filter_addr,
                                       Proto => 'udp'
-                                     ) or die "Socket: $!\n";
+                                     ) or die "Could not send UDP: $!\n";
 
     print $sock $xml or die "Could not send UDP packet: $!\n";
     close($sock);
@@ -295,7 +301,7 @@ sub send_tcp_heartbeat() {
                                      PeerAddr => $filter_addr,
                                      PeerPort => $tcp_port,
                                      Proto => 'tcp'
-                                    );
+                                    ) or return;
     if (!defined $sock) {
         print "IHOST WARNING: Failed to deliver a heartbeat to the i-scream filter.\n";
         return;
@@ -306,6 +312,7 @@ sub send_tcp_heartbeat() {
 
     print $sock "HEARTBEAT\n";
     $response = <$sock>;
+    return if (!defined $response);
     chop $response;
     if (!$response eq "OK") {
         close($sock);
@@ -315,6 +322,7 @@ sub send_tcp_heartbeat() {
     
     print $sock "CONFIG\n";
     $response = <$sock>;
+    return if (!defined $response);
     chop $response;
     if (!$response eq "OK") {
         close($sock);
@@ -324,6 +332,7 @@ sub send_tcp_heartbeat() {
 
     print $sock "$file_list\n";
     $response = <$sock>;
+    return if (!defined $response);
     chop $response;
     if (!$response eq "OK") {
         close($sock);
@@ -333,6 +342,7 @@ sub send_tcp_heartbeat() {
     
     print $sock "$last_modified\n";
     $response = <$sock>;
+    return if (!defined $response);
     chop $response;
     if ($response eq "ERROR") {
         close($sock);
@@ -347,6 +357,7 @@ sub send_tcp_heartbeat() {
     
     print $sock "ENDHEARTBEAT\n";
     $response = <$sock>;
+    return if (!defined $response);
     chop $response;
     if (!$response eq "OK") {
         close($sock);