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.44 by tdb, Tue Dec 18 04:07:17 2001 UTC vs.
Revision 1.47 by tdb, Thu Mar 21 17:57:13 2002 UTC

# Line 34 | Line 34 | use vars qw (
34               $pidfile
35               $retry_wait
36               $ostype
37 +             $key
38               @data
39              );
40  
# Line 61 | Line 62 | $pidfile .= "/.ihost.pid";
62   &write_pid();
63  
64   &tcp_configure();
65 + &send_tcp_heartbeat();
66   &send_udp_packet();
67  
68   $last_udp_time = time;
# Line 286 | Line 288 | sub send_udp_packet() {
288      push(@data, "packet.attributes.date $date");
289      push(@data, "packet.attributes.type data");
290      push(@data, "packet.attributes.ip $ip");
291 +    push(@data, "packet.attributes.key $key");
292      
293      # sort the data
294      @data = sort(grep(!/^$/, grep(/^packet\./, @data)));
# Line 374 | Line 377 | sub send_tcp_heartbeat() {
377          return;
378      }
379      
380 +    print $sock "KEY\n";
381 +    $key = <$sock>;
382 +    
383      print $sock "ENDHEARTBEAT\n";
384      $response = <$sock>;
385      if (!$response eq "OK\n") {
# Line 429 | Line 435 | sub make_xml() {
435                  $xmltemp .= &make_xml("$curlevel$curtag", $curline);
436              }
437              my($nextline) = $data[0]; chomp $nextline if defined $nextline;
438 <            if((defined $nextline) && ($nextline =~ /^$curlevel$curtag/)) {
438 >            $curtag =~ s/(.*)\./$1/;
439 >            if((defined $nextline) && ($nextline =~ /^$curlevel$curtag\./)) {
440                  $curline = "";
441              }
442              else {
436                $curtag =~ s/(.*)\./$1/;
443                  $xmltemp = "<$curtag$attributes>$xmltemp</$curtag>" unless $curtag eq "";
444                  return $xmltemp;
445              }
# Line 451 | Line 457 | sub make_xml() {
457                  return $xmltemp;
458              }
459          }
460 +        # dealing with a null value
461 +        elsif($curline =~ /^$curlevel([^\.\s]+)$/) {
462 +            # simply adding a space makes the above elsif deal with it :)
463 +            # just level with an empty tag in the XML
464 +            $curline .= " ";
465 +        }
466 +        # failing all that, skip the line
467 +        else {
468 +            $curline = "";
469 +        }
470      }
471   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines