| 33 |
|
$fqdn |
| 34 |
|
$pidfile |
| 35 |
|
$retry_wait |
| 36 |
+ |
$ostype |
| 37 |
+ |
$key |
| 38 |
|
@data |
| 39 |
|
); |
| 40 |
|
|
| 48 |
|
$seq_no = 1; |
| 49 |
|
$retry_wait = 60; |
| 50 |
|
|
| 51 |
+ |
# work out our platform, if we can. |
| 52 |
+ |
$ostype = `uname -s`; |
| 53 |
+ |
chomp $ostype; |
| 54 |
+ |
$ostype = "unknown" if not defined $ostype; |
| 55 |
+ |
|
| 56 |
|
# write our PID to a file |
| 57 |
|
# use home dir by default |
| 58 |
|
#$pidfile = $ENV{"HOME"}; |
| 62 |
|
&write_pid(); |
| 63 |
|
|
| 64 |
|
&tcp_configure(); |
| 65 |
+ |
&send_tcp_heartbeat(); |
| 66 |
|
&send_udp_packet(); |
| 67 |
|
|
| 68 |
|
$last_udp_time = time; |
| 274 |
|
opendir PLUGINS, $plugins_dir; |
| 275 |
|
my(@plugins) = readdir PLUGINS; |
| 276 |
|
foreach my $plugin (@plugins) { |
| 277 |
< |
push @data, `$plugins_dir/$plugin` if -x "$plugins_dir/$plugin" && -f "$plugins_dir/$plugin"; |
| 277 |
> |
push @data, `$plugins_dir/$plugin $ostype` if -x "$plugins_dir/$plugin" && -f "$plugins_dir/$plugin"; |
| 278 |
|
} |
| 279 |
|
|
| 280 |
|
# get some extra data |
| 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))); |
| 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") { |
| 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 { |
| 430 |
– |
$curtag =~ s/(.*)\./$1/; |
| 443 |
|
$xmltemp = "<$curtag$attributes>$xmltemp</$curtag>" unless $curtag eq ""; |
| 444 |
|
return $xmltemp; |
| 445 |
|
} |
| 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 |
|
} |