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.13 by pjm2, Mon Feb 5 17:14:41 2001 UTC vs.
Revision 1.16 by tdb, Tue Feb 13 12:28:50 2001 UTC

# Line 190 | Line 190 | sub send_udp_packet() {
190      my($disk_info) = "<disk>";
191      my($i) = 0;
192      while (defined $packet{"packet.disk.p$i.attributes.mount"}) {
193 <        $disk_info .= "<p$i>";
194 <        $disk_info .= qq/<name>$packet{"packet.disk.p$i.attributes.name"}<\/name>/;
195 <        $disk_info .= qq/<kbytes>$packet{"packet.disk.p$i.attributes.kbytes"}<\/kbytes>/;
196 <        $disk_info .= qq/<used>$packet{"packet.disk.p$i.attributes.used"}<\/used>/;
197 <        $disk_info .= qq/<avail>$packet{"packet.disk.p$i.attributes.avail"}<\/avail>/;
198 <        $disk_info .= qq/<mount>$packet{"packet.disk.p$i.attributes.mount"}<\/mount>/;
199 <        $disk_info .= "</p$i>";
193 >        $disk_info .= "<p$i";
194 >        $disk_info .= " name=\"" . $packet{"packet.disk.p$i.attributes.name"} . "\"";
195 >        $disk_info .= " kbytes=\"" . $packet{"packet.disk.p$i.attributes.kbytes"} . "\"";
196 >        $disk_info .= " used=\"" . $packet{"packet.disk.p$i.attributes.used"} . "\"";
197 >        $disk_info .= " avail=\"" . $packet{"packet.disk.p$i.attributes.avail"} . "\"";
198 >        $disk_info .= " mount=\"" . $packet{"packet.disk.p$i.attributes.mount"} . "\"";
199 >        $disk_info .= "></p$i>";
200          ++$i;
201      }
202      $disk_info .= "</disk>";
203  
204    print "$disk_info\n";
205
204      my($hostname) = hostname();
205      $hostname =~ s/\..*$//g;
206 <    `cat /etc/resolv.conf` =~ /domain\s+([^\s]+)/;
207 <    my($domainname) = $1;
208 <    my($machine_name) = "$hostname.$domainname";
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');
224  
225      # Build the XML packet this way, as we can clearly

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines