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.18 by pjm2, Tue Feb 27 19:26:51 2001 UTC vs.
Revision 1.23 by pjm2, Thu Mar 1 18:53:42 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($machine_name) = hostname();
213 <    my($ip) = inet_ntoa(scalar(gethostbyname($machine_name)) || '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 218 | 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 265 | 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 294 | 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 305 | Line 304 | sub send_tcp_heartbeat() {
304  
305      print $sock "HEARTBEAT\n";
306      $response = <$sock>;
307 +    return if (!defined $response);
308      chop $response;
309      if (!$response eq "OK") {
310          close($sock);
# Line 314 | Line 314 | sub send_tcp_heartbeat() {
314      
315      print $sock "CONFIG\n";
316      $response = <$sock>;
317 +    return if (!defined $response);
318      chop $response;
319      if (!$response eq "OK") {
320          close($sock);
# Line 323 | Line 324 | sub send_tcp_heartbeat() {
324  
325      print $sock "$file_list\n";
326      $response = <$sock>;
327 +    return if (!defined $response);
328      chop $response;
329      if (!$response eq "OK") {
330          close($sock);
# Line 332 | Line 334 | sub send_tcp_heartbeat() {
334      
335      print $sock "$last_modified\n";
336      $response = <$sock>;
337 +    return if (!defined $response);
338      chop $response;
339      if ($response eq "ERROR") {
340          close($sock);
# Line 346 | Line 349 | sub send_tcp_heartbeat() {
349      
350      print $sock "ENDHEARTBEAT\n";
351      $response = <$sock>;
352 +    return if (!defined $response);
353      chop $response;
354      if (!$response eq "OK") {
355          close($sock);

Diff Legend

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