--- projects/cms/source/host/ihost-perl/ihost.pl	2001/11/14 14:17:12	1.35
+++ projects/cms/source/host/ihost-perl/ihost.pl	2001/11/14 16:41:30	1.36
@@ -5,12 +5,10 @@
 # http://www.i-scream.org.uk
 #
 # An all-in-one script to act as an i-scream host on
-# a typical Unix/Linux box.  You may adapt the data-gathering
-# methods as you see fit.
-#  - pjm2@ukc.ac.uk
+# a typical Unix/Linux box.
 #
 # $Author: tdb $
-# $Id: ihost.pl,v 1.35 2001/11/14 14:17:12 tdb Exp $
+# $Id: ihost.pl,v 1.36 2001/11/14 16:41:30 tdb Exp $
 #------------------------------------------------------------
 
 $| = 1;
@@ -35,6 +33,7 @@ use vars qw (
              $fqdn
              $pidfile
              $retry_wait
+             @statgrab
             );
 
 if (@ARGV != 2) {
@@ -250,8 +249,6 @@ sub tcp_configure() {
 }
 
 
-
-
 #-----------------------------------------------------------------------
 # send_udp_packet
 # Sends a UDP packet to an i-scream filter.
@@ -260,92 +257,29 @@ sub tcp_configure() {
 #-----------------------------------------------------------------------
 sub send_udp_packet() {
 
-    my(@statgrab) = `./statgrab.pl`;
-    my(%packet);
-    for (my($i) = 0; $i <= $#statgrab; $i++) {
-        $statgrab[$i] =~ /^([^\s]*) (.*)$/;
-        $packet{$1} = $2;
-    }
+    @statgrab = `./statgrab.pl`;
     
+    # get some extra data
     my($date) = time;
-    
-    my($disk_info) = "<disk>";
-    my($i) = 0;
-    while (defined $packet{"packet.disk.p$i.attributes.mount"}) {
-        $disk_info .= "<p$i";
-        $disk_info .= " name=\"" . $packet{"packet.disk.p$i.attributes.name"} . "\"";
-        $disk_info .= " kbytes=\"" . $packet{"packet.disk.p$i.attributes.kbytes"} . "\"";
-        $disk_info .= " used=\"" . $packet{"packet.disk.p$i.attributes.used"} . "\"";
-        $disk_info .= " avail=\"" . $packet{"packet.disk.p$i.attributes.avail"} . "\"";
-        $disk_info .= " mount=\"" . $packet{"packet.disk.p$i.attributes.mount"} . "\"";
-        $disk_info .= "></p$i>";
-        ++$i;
-    }
-    $disk_info .= "</disk>";
-
     my($ip);
     $ip = inet_ntoa(scalar(gethostbyname(hostname())) || 'localhost') or $ip = 'localhost';
-
-    # Build the XML packet this way, as we can clearly
-    # see the structure and contents... I like this ;-)
-    # [Note that the server rejects UDP packets that are
-    # larger than 8196 bytes]
-    my($xml) = <<EOF;
     
-<packet seq_no="$seq_no" machine_name="$fqdn" date="$date" type="data" ip="$ip">
-    <load>
-        <load1>$packet{"packet.load.load1"}</load1>
-        <load5>$packet{"packet.load.load5"}</load5>
-        <load15>$packet{"packet.load.load15"}</load15>
-    </load>
-    <os>
-        <name>$packet{"packet.os.name"}</name>
-        <release>$packet{"packet.os.release"}</release>
-        <platform>$packet{"packet.os.platform"}</platform>
-        <sysname>$packet{"packet.os.sysname"}</sysname>
-        <version>$packet{"packet.os.version"}</version>
-        <uptime>$packet{"packet.os.uptime"}</uptime>
-    </os>
-    <users>
-        <count>$packet{"packet.users.count"}</count>
-        <list>$packet{"packet.users.list"}</list>
-    </users>
-    <processes>
-        <total>$packet{"packet.processes.total"}</total>
-        <sleeping>$packet{"packet.processes.sleeping"}</sleeping>
-        <zombie>$packet{"packet.processes.zombie"}</zombie>
-        <stopped>$packet{"packet.processes.stopped"}</stopped>
-        <cpu>$packet{"packet.processes.cpu"}</cpu>
-    </processes>
-    <cpu>
-        <idle>$packet{"packet.cpu.idle"}</idle>
-        <user>$packet{"packet.cpu.user"}</user>
-        <kernel>$packet{"packet.cpu.kernel"}</kernel>
-        <iowait>$packet{"packet.cpu.iowait"}</iowait>
-        <swap>$packet{"packet.cpu.swap"}</swap>
-    </cpu>
-    <memory>
-        <total>$packet{"packet.memory.total"}</total>
-        <free>$packet{"packet.memory.free"}</free>
-    </memory>
-    <swap>
-        <total>$packet{"packet.swap.total"}</total>
-        <free>$packet{"packet.swap.free"}</free>
-    </swap>
-    $disk_info
-</packet>
-
-EOF
-
-    # Make the packet smaller by stripping out newlines and leading spaces.
-    $xml =~ s/\n\s*//g;
-
+    # add some extra data to the array
+    push(@statgrab, "packet.attributes.seq_no=$seq_no");
+    push(@statgrab, "packet.attributes.machine_name=$fqdn");
+    push(@statgrab, "packet.attributes.date=$date");
+    push(@statgrab, "packet.attributes.type=data");
+    push(@statgrab, "packet.attributes.ip=$ip");
+    
+    # turn the array into some nice XML
+    my($xml) = &make_xml("", "");
+    
     my($sock) = new IO::Socket::INET (
                                       PeerPort => $udp_port,
                                       PeerAddr => $filter_addr,
                                       Proto => 'udp'
                                      ) or die "Could not send UDP: $!\n";
-
+    
     print $sock $xml or die "Could not send UDP packet: $!\n";
     close($sock);
     $seq_no++;
@@ -355,8 +289,6 @@ EOF
 }
 
 
-
-
 #-----------------------------------------------------------------------
 # send_tcp_heartbeat
 # Establishes a TCP connection to an i-scream filter.
@@ -440,6 +372,7 @@ sub send_tcp_heartbeat() {
     return;
 }
 
+
 #-----------------------------------------------------------------------
 # write_pid
 # Writes the PID (process ID) of this instance to $pidfile.
@@ -451,4 +384,37 @@ sub write_pid() {
     close PID;
     
     return;
+}
+
+#-----------------------------------------------------------------------
+# make_xml
+# Turns an array of statgrab data into an XML string.
+#-----------------------------------------------------------------------
+sub make_xml() {
+    my($curlevel, $curline) = @_;
+    my($xmltemp) = ""; my($curtag) = ""; my($attributes) = "";
+    while(true) {
+        $curline = shift(@statgrab) if $curline eq ""; chomp $curline;
+        if($curline =~ /^$curlevel([^\.\s]+\.)/) {
+            $curtag=$1;
+        }
+        if($curline =~ /^$curlevel$curtag([^\.\s]+)\s+(.*)$/) {
+            $xmltemp .= "<$1$attributes>$2</$1>";
+        }
+        elsif($curline =~ /^$curlevel$curtag(attributes)\.([^\.=]+)=(.*)$/) {
+            $attributes .= " $2=\"$3\"";
+        }
+        else {
+            $xmltemp .= &make_xml("$curlevel$curtag", $curline);
+        }
+        my($nextline) = $statgrab[0]; chomp $nextline if defined $nextline;
+        $curtag =~ s/(.*)\./$1/;                
+        if(defined $nextline && $nextline =~ /^$curlevel$curtag\./) {
+            $curline = "";
+        }
+        else {
+            $xmltemp = "<$curtag$attributes>$xmltemp</$curtag>" unless $curtag eq "";
+            return $xmltemp;
+        }
+    }
 }