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.17 by pjm2, Tue Feb 27 19:14:26 2001 UTC vs.
Revision 1.22 by pjm2, Thu Mar 1 10:49:27 2001 UTC

# Line 86 | Line 86 | sub tcp_configure() {
86                                       PeerAddr => $filter_manager_addr,
87                                       PeerPort => $filter_manager_port,
88                                       Proto => 'tcp'
89 <                                    );
89 >                                    ) or die "Cannot connect!";
90      if (!defined $sock) {
91          print "IHOST ERROR: Could not connect to $filter_manager_addr:$filter_manager_port.\n";
92          print "Please check that there is an i-scream server at this address.\n";
# Line 209 | Line 209 | sub send_udp_packet() {
209      }
210      $disk_info .= "</disk>";
211  
212 <    my($hostname) = hostname();
213 <    $hostname =~ s/\..*$//g;
214 <    my($resolv) = `cat /etc/resolv.conf`;
215 <    my($domainname);
216 <    my($machine_name);
217 <    if($resolv =~ /domain\s+([^\s]+)/) {
218 <        # some machines have domain <domain> in resolv.conf
219 <        $domainname = $1;
220 <        $machine_name = "$hostname.$domainname";
221 <    }
222 <    elsif($resolv =~ /search\s+([^\s]+)/) {
223 <        # some machines have search <domain> in resolv.conf
224 <        $domainname = $1;
225 <        $machine_name = "$hostname.$domainname";
226 <    }
227 <    else {
228 <        # we can't find out the domain
229 <        $machine_name = $hostname;
230 <    }
231 <    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 236 | 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 283 | Line 264 | EOF
264  
265      # Make the packet smaller by stripping out newlines and leading spaces.
266      $xml =~ s/\n\s*//g;
267 <    
267 >
268      my($sock) = new IO::Socket::INET (
269                                        PeerPort => $udp_port,
270                                        PeerAddr => $filter_addr,
271                                        Proto => 'udp'
272 <                                     ) or die "Socket: $!\n";
272 >                                     ) or die "Could not send UDP: $!\n";
273  
274      print $sock $xml or die "Could not send UDP packet: $!\n";
275      close($sock);
# Line 312 | Line 293 | sub send_tcp_heartbeat() {
293                                       PeerAddr => $filter_addr,
294                                       PeerPort => $tcp_port,
295                                       Proto => 'tcp'
296 <                                    );
296 >                                    ) or return;
297      if (!defined $sock) {
298          print "IHOST WARNING: Failed to deliver a heartbeat to the i-scream filter.\n";
299          return;
# Line 323 | Line 304 | sub send_tcp_heartbeat() {
304  
305      print $sock "HEARTBEAT\n";
306      $response = <$sock>;
307 <    chop $response;
307 >    chop $response or return;
308      if (!$response eq "OK") {
309          close($sock);
310          print "Server gave wrong response to HEARTBEAT: $response\n";
# Line 332 | Line 313 | sub send_tcp_heartbeat() {
313      
314      print $sock "CONFIG\n";
315      $response = <$sock>;
316 <    chop $response;
316 >    chop $response or return;
317      if (!$response eq "OK") {
318          close($sock);
319          print "Server gave wrong response to CONFIG: $response\n";
# Line 341 | Line 322 | sub send_tcp_heartbeat() {
322  
323      print $sock "$file_list\n";
324      $response = <$sock>;
325 <    chop $response;
325 >    chop $response or return;
326      if (!$response eq "OK") {
327          close($sock);
328          print "Server gave wrong response to file list: $response\n";
# Line 350 | Line 331 | sub send_tcp_heartbeat() {
331      
332      print $sock "$last_modified\n";
333      $response = <$sock>;
334 <    chop $response;
334 >    chop $response or return;
335      if ($response eq "ERROR") {
336          close($sock);
337          &tcp_configure();
# Line 363 | Line 344 | sub send_tcp_heartbeat() {
344      }
345      
346      print $sock "ENDHEARTBEAT\n";
347 <    $response = <$sock>;
347 >    $response = <$sock> or return;
348      chop $response;
349      if (!$response eq "OK") {
350          close($sock);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines