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.45 by tdb, Tue Dec 18 06:07:00 2001 UTC vs.
Revision 1.48 by tdb, Sat May 11 17:20:07 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 140 | Line 142 | sub tcp_configure() {
142      
143          print $sock "LASTMODIFIED\n";
144          $response = <$sock>;
145 <        if (!$response) {
146 <            print "The i-scream server did not return anything for the LASTMODIFIED command.\n";
145 >        if (!$response || $response eq "ERROR\n") {
146 >            print "The i-scream server did not provide the LASTMODIFIED value.\n";
147              close($sock);
148              wait_then_retry();
149              next;
150          }
151 <        chop $response;
151 >        chomp $response;
152          $last_modified = $response;
153      
154          print "Config last modified: ". (scalar localtime $last_modified/1000) . "\n";
155  
156          print $sock "FILELIST\n";
157          $response = <$sock>;
158 <        if (!$response) {
158 >        if (!$response || $response eq "ERROR\n") {
159              print "The i-scream server did not provide a configuration file list.\n";
160              close($sock);
161              wait_then_retry();
162              next;
163          }
164 <        chop $response;
164 >        chomp $response;
165          $file_list = $response;
166  
167          print "File list obtained: $file_list\n";
168  
169          print $sock "FQDN\n";
170          $response = <$sock>;
171 <        if (!$response) {
171 >        if (!$response || $response eq "ERROR\n") {
172              print "The i-scream server did not tell us our FQDN.\n";
173              close($sock);
174              wait_then_retry();
175              next;
176          }
177 <        chop $response;
177 >        chomp $response;
178          $fqdn = $response;
179  
180          print "FQDN returned: $fqdn\n";
181  
182          print $sock "UDPUpdateTime\n";
183          $response = <$sock>;
184 <        if (!$response) {
184 >        if (!$response || $response eq "ERROR\n") {
185              print "The i-scream server did not give us a UDPUpdateTime.\n";
186              close($sock);
187              wait_then_retry();
188              next;
189          }
190 <        chop $response;
190 >        chomp $response;
191          $udp_update_time = $response;
192  
193          print $sock "TCPUpdateTime\n";
194          $response = <$sock>;
195 <        if (!$response) {
195 >        if (!$response || $response eq "ERROR\n") {
196              print "The i-scream server did not give us a TCPUpdateTime.\n";
197              close($sock);
198              wait_then_retry();
199              next;
200          }
201 <        chop $response;
201 >        chomp $response;
202          $tcp_update_time = $response;
203      
204          print "UDP packet period: $udp_update_time seconds.\nTCP heartbeat period: $tcp_update_time seconds.\n";
# Line 220 | Line 222 | sub tcp_configure() {
222              wait_then_retry();
223              next;
224          }
225 <        chop $response;
224 <        $response =~ /^(.*);(.*);(.*)/;
225 >        chomp $response;
226          if ($response eq "ERROR") {
227              print "There are no active configured filters for your host.\n";
228              close($sock);
229              wait_then_retry();
230              next;
231          }
232 +        $response =~ /^(.*);(.*);(.*)/;
233          ($filter_addr, $udp_port, $tcp_port) = ($1, $2, $3);
234          unless (defined($filter_addr) && defined($udp_port) && defined($tcp_port)) {
235              print "Failed: Filter address response from server did not make sense: $response\n";
# 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 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