ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/ihost-perl/ihost.pl
(Generate patch)

Comparing projects/cms/source/host/ihost-perl/ihost.pl (file contents):
Revision 1.16 by tdb, Tue Feb 13 12:28:50 2001 UTC vs.
Revision 1.19 by tdb, Wed Feb 28 10:52:16 2001 UTC

# Line 32 | Line 32 | use vars qw (
32               $tcp_port
33               $filter_addr
34               $file_list
35 +             $fqdn
36              );
37  
38   if (@ARGV != 2) {
# Line 119 | Line 120 | sub tcp_configure() {
120  
121      print "File list obtained: $file_list\n";
122  
123 +    print $sock "FQDN\n";
124 +    $response = <$sock>;
125 +    chop $response;
126 +    $fqdn = $response;
127 +
128 +    print "FQDN returned: $fqdn\n";
129 +
130      print $sock "UDPUpdateTime\n";
131      $response = <$sock>;
132      chop $response;
# Line 201 | Line 209 | sub send_udp_packet() {
209      }
210      $disk_info .= "</disk>";
211  
212 <    my($hostname) = hostname();
205 <    $hostname =~ s/\..*$//g;
206 <    my($resolv) = `cat /etc/resolv.conf`;
207 <    my($domainname);
208 <    my($machine_name);
209 <    if($resolv =~ /domain\s+([^\s]+)/) {
210 <        # some machines have domain <domain> in resolv.conf
211 <        $domainname = $1;
212 <        $machine_name = "$hostname.$domainname";
213 <    }
214 <    elsif($resolv =~ /search\s+([^\s]+)/) {
215 <        # some machines have search <domain> in resolv.conf
216 <        $domainname = $1;
217 <        $machine_name = "$hostname.$domainname";
218 <    }
219 <    else {
220 <        # we can't find out the domain
221 <        $machine_name = $hostname;
222 <    }
223 <    my($ip) = inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost');
212 >    my($ip) = inet_ntoa(scalar(gethostbyname(hostname())) || 'localhost');
213  
214      # Build the XML packet this way, as we can clearly
215      # see the structure and contents... I like this ;-)
# Line 228 | Line 217 | sub send_udp_packet() {
217      # larger than 8196 bytes]
218      my($xml) = <<EOF;
219      
220 < <packet seq_no="$seq_no" machine_name="$machine_name" date="$date" type="data" ip="$ip">
220 > <packet seq_no="$seq_no" machine_name="$fqdn" date="$date" type="data" ip="$ip">
221      <load>
222          <load1>$packet{"packet.load.load1"}</load1>
223          <load5>$packet{"packet.load.load5"}</load5>
# Line 275 | Line 264 | EOF
264  
265      # Make the packet smaller by stripping out newlines and leading spaces.
266      $xml =~ s/\n\s*//g;
267 +
268 + print $xml;
269      
270      my($sock) = new IO::Socket::INET (
271                                        PeerPort => $udp_port,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines