1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
--- plgrenouille.pl.orig Mon Mar 17 15:52:56 2003
+++ plgrenouille.pl Wed Apr 30 22:56:55 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -Tw
+#!%%PERL%% -Tw
# plgrenouille 0.61
# version 0.4 by momtchev, <momtchev@fil.univ-lille1.fr>
# modified by Pierre Etchemaite, <petchema@concept-micro.com>
@@ -18,7 +18,7 @@
use Net::Ping qw();
use Net::FTP qw();
-$ENV{'PATH'} = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin';
+$ENV{'PATH'} = '%%PREFIX%%/sbin:%%PREFIX%%/bin:/usr/sbin:/usr/bin:/sbin:/bin';
my(%VERSION) = ( 'client' => 'plgrenouille',
'version' => 0.61,
@@ -28,17 +28,20 @@
# where anyone can fork his own version
'system' => $^O );
-my $MYRC ||= '/etc/grenouillerc';
-my $DATAPATH ||= '/var/spool/plgrenouille';
+my $PREFIX ||= '%%PREFIX%%';
+my $MYRC ||= "$PREFIX/etc/grenouillerc";
+my $DATAPATH ||= '%%SPOOL_DIR%%';
my $DOWNLOADFILE ||= "$DATAPATH/downloadfile";
my $UPLOADFILE ||= "$DATAPATH/uploadfile";
my $QUEUEFILE ||= "$DATAPATH/queued_results.txt";
my $LASTCONFIGFILE ||= "$DATAPATH/last_configuration.txt";
my $LASTVERSIONFILE ||= "$DATAPATH/last_known_version.txt";
-my $PIDFILE ||= "/var/run/plgrenouille.pid";
-my $LOGFILE ||= "/var/log/plgrenouille.log";
+my $PIDFILE ||= "%%RUN_DIR%%/plgrenouille.pid";
+my $LOGFILE ||= "%%LOG_DIR%%/plgrenouille.log";
+my $NETSTAT ||= '/usr/bin/netstat';
+my $IFCONFIG ||= '/sbin/ifconfig';
-my $USER ||= 'daemon';
+my $USER ||= '%%SPOOL_USER%%';
# what features do we want to debug ?
my(%DEBUG) = ( 'protocol' => 0, 'scheduler' => 0 );
@@ -61,6 +64,7 @@
sub usage($) {
my($exitcode) = @_;
+ display_version();
print <<"EOUSAGE";
Usage: $VERSION{'client'} [-c|--configure] [-b|--background] [-h|-?|--help]
[[-l |--log=]priorit�] [[-v |--verbose=]priorit�]
@@ -109,7 +113,7 @@
# for milliseconds; otherwise would use built-in time.
-my $SYS_gettimeofday ||= 78;
+my $SYS_gettimeofday ||= 116;
sub microtime() {
my ($timeval, $timezone, $sec, $usec);
@@ -205,36 +209,21 @@
die "Priorit� $level inconnue" unless $DISPLAY_LEVEL;
}
-# parse /proc/net/dev (Linux)
+# parse netstat -ib (FreeBSD)
sub get_traffic_counters($) {
my ($if_device) = @_;
- # Sometimes fails with EOVERFLOW ("Value too large for defined data type")
- # on my box, maybe some LFS bug in /proc ? (kernel 2.4.5)
- open(PROC_NET_DEV, '</proc/net/dev') or
- die "Can't read /proc/net/dev: $!";
- while (<PROC_NET_DEV>) {
- if (/^\s*$if_device:\s*(.*)$/) {
+ open(NETSTAT_PIPE, '-|') or exec($NETSTAT, '-ib') or die "netstat: $!";
+ while (<NETSTAT_PIPE>) {
+ if (/^($if_device.*<Link.*)/) {
my(@counters) = split(/\s+/, $1);
- close(PROC_NET_DEV);
- if(scalar @counters == 16) {
- # linux >2.1.90
- return { 'rx' => $counters[0],
- 'tx' => $counters[8] };
- }
- if(scalar @counters == 14) {
- # linux 2.1.0..2.1.90
- return { 'rx' => $counters[0],
- 'tx' => $counters[6] };
- }
- if(scalar @counters == 11) {
- die 'D�sol�, les noyaux ant�rieurs � 2.1.0 ne sont pas support�s';
- }
- die 'Format de /proc/net/dev non reconnu, envoyer un exemple au mainteneur SVP';
+ close(NETSTAT_PIPE);
+ return { 'rx' => $counters[6],
+ 'tx' => $counters[9] };
}
}
- close(PROC_NET_DEV);
+ close(NETSTAT_PIPE);
die "Pas d'interface $if_device ?";
}
@@ -350,6 +339,7 @@
}
sub load_preferences() {
+ swap_privileges();
eval {
if (open(CONFIG, "<$MYRC")) {
while (<CONFIG>) {
@@ -360,6 +350,7 @@
close(CONFIG);
}
};
+ swap_privileges();
die if $@;
}
@@ -442,7 +433,7 @@
sub get_preferences() {
load_preferences();
- die "plgrenouille n'a pas �t� totalement param�tr�, lancez plgrenouille --config ou modifiez /etc/grenouillerc"
+ die "plgrenouille n'a pas �t� totalement param�tr�, lancez plgrenouille --config ou modifiez $MYRC"
if not defined $preferences{'user'} or
not defined $preferences{'pass'} or
not defined $preferences{'email'} or
@@ -456,20 +447,20 @@
# plgrenouille uses the default route interface
sub autodetect_interface() {
$vars{'ip'} = '';
- open(ROUTE, '-|') or exec('/bin/netstat', '-r') or die "netstat: $!";
- while (<ROUTE>) {
- if (/^default.*((?:eth|ppp|sl)[0-9]+)$/) {
+ open(ROUTE_PIPE, '-|') or exec($NETSTAT, '-r') or die "netstat: $!";
+ while (<ROUTE_PIPE>) {
+ if (/^default.* ([^ ]+[0-9]+)$/) {
$preferences{'interface'} = $1;
- }
+ }
}
- close(ROUTE);
- open(IFCONFIG, '-|') or exec('/sbin/ifconfig', $preferences{'interface'}) or die "ifconfig: $!";
- while(<IFCONFIG>) {
- if (/inet add?r:([.0-9]+)/) {
+ close(ROUTE_PIPE);
+ open(IFCONFIG_PIPE, '-|') or exec($IFCONFIG, $preferences{'interface'}) or die "ifconfig: $!";
+ while(<IFCONFIG_PIPE>) {
+ if (/inet ([.0-9]+)/) {
$vars{'ip'} = $1;
}
}
- close IFCONFIG;
+ close(IFCONFIG_PIPE);
display_and_log('NOTICE', "$preferences{'interface'} sera utilis� pour les mesures") if $preferences{'interface'};
}
@@ -1182,8 +1173,6 @@
# --------------------------- MAIN ----------------------------
-display_version();
-
Getopt::Long::Configure('bundling'); # 'no_ignore_case'
eval {
GetOptions(\%params,
@@ -1191,6 +1180,7 @@
'verbose|v=s', \&set_verbose_level,
'configure|setup|c',
'background|b',
+ 'version|V',
'help|h|?');
};
if ($@) {
@@ -1199,6 +1189,10 @@
}
usage(1) if scalar @ARGV;
usage(0) if $params{'help'};
+if($params{'version'}) {
+ display_version();
+ exit(0);
+}
open_log();
init_grenouille();
|
