--- projects/cms/source/host/ihost-perl/ihost.pl	2001/12/18 03:51:11	1.43
+++ projects/cms/source/host/ihost-perl/ihost.pl	2002/05/11 17:20:07	1.48
@@ -8,7 +8,7 @@
 # a typical Unix/Linux box.
 #
 # $Author: tdb $
-# $Id: ihost.pl,v 1.43 2001/12/18 03:51:11 tdb Exp $
+# $Id: ihost.pl,v 1.48 2002/05/11 17:20:07 tdb Exp $
 #------------------------------------------------------------
 
 $| = 1;
@@ -33,6 +33,8 @@ use vars qw (
              $fqdn
              $pidfile
              $retry_wait
+             $ostype
+             $key
              @data
             );
 
@@ -46,6 +48,11 @@ $filter_manager_port = $ARGV[1];
 $seq_no = 1;
 $retry_wait = 60;
 
+# work out our platform, if we can.
+$ostype = `uname -s`;
+chomp $ostype;
+$ostype = "unknown" if not defined $ostype;
+
 # write our PID to a file
 # use home dir by default
 #$pidfile = $ENV{"HOME"};
@@ -55,6 +62,7 @@ $pidfile .= "/.ihost.pid";
 &write_pid();
 
 &tcp_configure();
+&send_tcp_heartbeat();
 &send_udp_packet();
 
 $last_udp_time = time;
@@ -134,63 +142,63 @@ sub tcp_configure() {
     
         print $sock "LASTMODIFIED\n";
         $response = <$sock>;
-        if (!$response) {
-            print "The i-scream server did not return anything for the LASTMODIFIED command.\n";
+        if (!$response || $response eq "ERROR\n") {
+            print "The i-scream server did not provide the LASTMODIFIED value.\n";
             close($sock);
             wait_then_retry();
             next;
         }
-        chop $response;
+        chomp $response;
         $last_modified = $response;
     
         print "Config last modified: ". (scalar localtime $last_modified/1000) . "\n";
 
         print $sock "FILELIST\n";
         $response = <$sock>;
-        if (!$response) {
+        if (!$response || $response eq "ERROR\n") {
             print "The i-scream server did not provide a configuration file list.\n";
             close($sock);
             wait_then_retry();
             next;
         }
-        chop $response;
+        chomp $response;
         $file_list = $response;
 
         print "File list obtained: $file_list\n";
 
         print $sock "FQDN\n";
         $response = <$sock>;
-        if (!$response) {
+        if (!$response || $response eq "ERROR\n") {
             print "The i-scream server did not tell us our FQDN.\n";
             close($sock);
             wait_then_retry();
             next;
         }
-        chop $response;
+        chomp $response;
         $fqdn = $response;
 
         print "FQDN returned: $fqdn\n";
 
         print $sock "UDPUpdateTime\n";
         $response = <$sock>;
-        if (!$response) {
+        if (!$response || $response eq "ERROR\n") {
             print "The i-scream server did not give us a UDPUpdateTime.\n";
             close($sock);
             wait_then_retry();
             next;
         }
-        chop $response;
+        chomp $response;
         $udp_update_time = $response;
 
         print $sock "TCPUpdateTime\n";
         $response = <$sock>;
-        if (!$response) {
+        if (!$response || $response eq "ERROR\n") {
             print "The i-scream server did not give us a TCPUpdateTime.\n";
             close($sock);
             wait_then_retry();
             next;
         }
-        chop $response;
+        chomp $response;
         $tcp_update_time = $response;
     
         print "UDP packet period: $udp_update_time seconds.\nTCP heartbeat period: $tcp_update_time seconds.\n";
@@ -214,14 +222,14 @@ sub tcp_configure() {
             wait_then_retry();
             next;
         }
-        chop $response;
-        $response =~ /^(.*);(.*);(.*)/;
+        chomp $response;
         if ($response eq "ERROR") {
             print "There are no active configured filters for your host.\n";
             close($sock);
             wait_then_retry();
             next;
         }
+        $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";
@@ -266,7 +274,7 @@ sub send_udp_packet() {
     opendir PLUGINS, $plugins_dir;
     my(@plugins) = readdir PLUGINS;
     foreach my $plugin (@plugins) {
-        push @data, `$plugins_dir/$plugin` if -x "$plugins_dir/$plugin" && -f "$plugins_dir/$plugin";
+        push @data, `$plugins_dir/$plugin $ostype` if -x "$plugins_dir/$plugin" && -f "$plugins_dir/$plugin";
     }
     
     # get some extra data
@@ -280,6 +288,7 @@ sub send_udp_packet() {
     push(@data, "packet.attributes.date $date");
     push(@data, "packet.attributes.type data");
     push(@data, "packet.attributes.ip $ip");
+    push(@data, "packet.attributes.key $key");
     
     # sort the data
     @data = sort(grep(!/^$/, grep(/^packet\./, @data)));
@@ -368,6 +377,9 @@ sub send_tcp_heartbeat() {
         return;
     }
     
+    print $sock "KEY\n";
+    $key = <$sock>;
+    
     print $sock "ENDHEARTBEAT\n";
     $response = <$sock>;
     if (!$response eq "OK\n") {
@@ -423,11 +435,11 @@ sub make_xml() {
                 $xmltemp .= &make_xml("$curlevel$curtag", $curline);
             }
             my($nextline) = $data[0]; chomp $nextline if defined $nextline;
-            if((defined $nextline) && ($nextline =~ /^$curlevel$curtag/)) {
+            $curtag =~ s/(.*)\./$1/;
+            if((defined $nextline) && ($nextline =~ /^$curlevel$curtag\./)) {
                 $curline = ""; 
             }
             else {
-                $curtag =~ s/(.*)\./$1/;
                 $xmltemp = "<$curtag$attributes>$xmltemp</$curtag>" unless $curtag eq "";
                 return $xmltemp;
             }
@@ -445,5 +457,15 @@ sub make_xml() {
                 return $xmltemp;
             }
         }
+	# dealing with a null value
+	elsif($curline =~ /^$curlevel([^\.\s]+)$/) {
+	    # simply adding a space makes the above elsif deal with it :)
+	    # just level with an empty tag in the XML
+	    $curline .= " ";
+	}
+	# failing all that, skip the line
+	else {
+	    $curline = "";
+	}
     }
 }