48 |
|
$last_udp_time = time; |
49 |
|
$last_tcp_time = time; |
50 |
|
while (1) { |
51 |
< |
if (time >= $last_udp_time + $udp_update_time) { |
51 |
> |
my($time) = time; |
52 |
> |
if ($time >= $last_udp_time + $udp_update_time) { |
53 |
|
&send_udp_packet(); |
54 |
< |
$last_udp_time = time; |
54 |
> |
$last_udp_time = $time; |
55 |
|
} |
56 |
< |
if (time >= $last_tcp_time + $tcp_update_time) { |
56 |
> |
if ($time >= $last_tcp_time + $tcp_update_time) { |
57 |
|
&send_tcp_heartbeat(); |
58 |
< |
$last_tcp_time = time; |
58 |
> |
$last_tcp_time = $time; |
59 |
|
} |
60 |
< |
`sleep 1`; |
60 |
> |
my($next_udp) = $udp_update_time - $time + $last_udp_time; |
61 |
> |
my($next_tcp) = $tcp_update_time - $time + $last_tcp_time; |
62 |
> |
my($delay); |
63 |
> |
if ($next_udp < $next_tcp) { |
64 |
> |
$delay = $next_udp |
65 |
> |
} |
66 |
> |
else { |
67 |
> |
$delay = $next_tcp; |
68 |
> |
} |
69 |
> |
`sleep $delay`; |
70 |
|
} |
71 |
|
|
72 |
|
exit(0); |
98 |
|
chop $response; |
99 |
|
$last_modified = $response; |
100 |
|
|
101 |
< |
print "Config last modified: ". scalar localtime $last_modified . "\n"; |
101 |
> |
print "Config last modified: ". (scalar localtime $last_modified/1000) . "\n"; |
102 |
|
|
103 |
|
print $sock "FILELIST\n"; |
104 |
|
$response = <$sock>; |
117 |
|
chop $response; |
118 |
|
$tcp_update_time = $response; |
119 |
|
|
120 |
< |
print "UDP packet period: $udp_update_time seconds.\nTCP heartbeat period: $tcp_update_time.\n"; |
120 |
> |
print "UDP packet period: $udp_update_time seconds.\nTCP heartbeat period: $tcp_update_time seconds.\n"; |
121 |
|
|
122 |
|
print $sock "ENDCONFIG\n"; |
123 |
|
$response = <$sock>; |
180 |
|
|
181 |
|
my($hostname) = hostname(); |
182 |
|
$hostname =~ s/\..*$//g; |
183 |
< |
my($domainname) = `cat /etc/resolv.conf`; |
184 |
< |
$domainname =~ s/domain\s*([^\s]*?)/$1/; |
183 |
> |
`cat /etc/resolv.conf` =~ /domain\s+([^\s]+)/; |
184 |
> |
my($domainname) = $1; |
185 |
|
my($machine_name) = "$hostname.$domainname"; |
186 |
|
my($ip) = inet_ntoa(scalar(gethostbyname($hostname)) || 'localhost'); |
187 |
|
|
201 |
|
<platform>$packet{"packet.os.platform"}</platform> |
202 |
|
<sysname>$packet{"packet.os.sysname"}</sysname> |
203 |
|
<version>$packet{"packet.os.version"}</version> |
204 |
+ |
<uptime>$packet{"packet.os.uptime"}</uptime> |
205 |
|
</os> |
206 |
|
<users> |
207 |
|
<count>$packet{"packet.users.count"}</count> |