--- projects/cms/source/host/ihost-perl/ihost.pl	2001/02/28 10:53:13	1.20
+++ projects/cms/source/host/ihost-perl/ihost.pl	2001/03/01 10:49:27	1.22
@@ -9,8 +9,8 @@
 # methods as you see fit.
 #  - pjm2@ukc.ac.uk
 #
-# $Author: tdb $
-# $Id: ihost.pl,v 1.20 2001/02/28 10:53:13 tdb Exp $
+# $Author: pjm2 $
+# $Id: ihost.pl,v 1.22 2001/03/01 10:49:27 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";
@@ -269,7 +269,7 @@ EOF
                                       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);
@@ -293,7 +293,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;
@@ -304,7 +304,7 @@ sub send_tcp_heartbeat() {
 
     print $sock "HEARTBEAT\n";
     $response = <$sock>;
-    chop $response;
+    chop $response or return;
     if (!$response eq "OK") {
         close($sock);
         print "Server gave wrong response to HEARTBEAT: $response\n";
@@ -313,7 +313,7 @@ sub send_tcp_heartbeat() {
     
     print $sock "CONFIG\n";
     $response = <$sock>;
-    chop $response;
+    chop $response or return;
     if (!$response eq "OK") {
         close($sock);
         print "Server gave wrong response to CONFIG: $response\n";
@@ -322,7 +322,7 @@ sub send_tcp_heartbeat() {
 
     print $sock "$file_list\n";
     $response = <$sock>;
-    chop $response;
+    chop $response or return;
     if (!$response eq "OK") {
         close($sock);
         print "Server gave wrong response to file list: $response\n";
@@ -331,7 +331,7 @@ sub send_tcp_heartbeat() {
     
     print $sock "$last_modified\n";
     $response = <$sock>;
-    chop $response;
+    chop $response or return;
     if ($response eq "ERROR") {
         close($sock);
         &tcp_configure();
@@ -344,7 +344,7 @@ sub send_tcp_heartbeat() {
     }
     
     print $sock "ENDHEARTBEAT\n";
-    $response = <$sock>;
+    $response = <$sock> or return;
     chop $response;
     if (!$response eq "OK") {
         close($sock);