summaryrefslogtreecommitdiff
path: root/net/rtg/files/patch-etc_report.pl
blob: 2256ca9b620a975365f02ab1b89ae4804e338003 (plain) (blame)
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
--- etc/report.pl.orig	2018-04-02 20:14:41 UTC
+++ etc/report.pl
@@ -30,7 +30,7 @@ $pass="rtgdefault";
 $onedaysec=60*60*24;
 
 # Default locations to find RTG configuration file
-@configs = ("rtg.conf", "/usr/local/rtg/etc/rtg.conf", "/etc/rtg.conf");
+@configs = ("rtg.conf", "%%PREFIX%%/etc/rtg/rtg.conf", "/usr/local/rtg/etc/rtg.conf", "/etc/rtg.conf");
 foreach $conf (@configs) {
   if (open CONF, "<$conf") {
     print "Reading [$conf].\n" if $DEBUG;
@@ -192,13 +192,13 @@ print "Period: [", format_dt($startdate)
 write;
 ($router,$name,$bytesin, $bytesout, $ratein, $rateout, $utilin, $utilout, $maxratein, $maxrateout, $maxutilin, $maxutilout) = ("","Connection", "MBytes", "MBytes", "Mbps", "Mbps", "In %", "Out%",  "Mbps", "Mbps", "In%", "Out%");
 write;
-print "----------------------------------------------------------------------------------------------------------\n";
+print "------------------------------------------------------------------------------------------------------------------------------\n";
 
 $dbh= DBI->connect("DBI:mysql:$db:host=$host", $user, $pass);
 $dbh2= DBI->connect("DBI:mysql:$db:host=$host", $user, $pass);
-$range="dtime>$startdate and dtime<=$enddate";
+$range="`dtime`>$startdate and `dtime`<=$enddate";
 
-$statement="SELECT id FROM interface WHERE description LIKE \"%$cust%\"";
+$statement="SELECT `id` FROM `interface` WHERE `description` LIKE \"%$cust%\"";
 $sth = $dbh->prepare($statement)
         or die "Can't prepare $statement: $dbh->errstr\n";
 $rv = $sth->execute
@@ -209,19 +209,19 @@ while (@row = $sth->fetchrow_array ())
 }
 
 foreach $interface (@interfaces) {
-  $statement="SELECT rid, name, speed FROM interface WHERE id=$interface";
+  $statement="SELECT `rid`, `name`, `speed` FROM `interface` WHERE `id`=$interface";
   &run_query($statement);
   ($rid, $name, $speed) = @row;
 
-  $statement="SELECT rid, name FROM router WHERE rid=$rid";
+  $statement="SELECT `rid`, `name` FROM `router` WHERE `rid`=$rid";
   &run_query($statement);
   ($rid, $router) = @row;
 
-  $statement="SELECT counter, UNIX_TIMESTAMP(dtime), dtime FROM ifInOctets_".$rid." WHERE $range AND id=$interface ORDER BY dtime"; 
+  $statement="SELECT `counter`, UNIX_TIMESTAMP(`dtime`), `dtime` FROM `ifInOctets_".$rid."` WHERE $range AND `id`=$interface ORDER BY `dtime`"; 
   ($intbytes_in, $maxin, $avgin) = &interface_stats($statement);
   $bytesin = int($intbytes_in/1000000 + .5);
 
-  $statement="SELECT counter, UNIX_TIMESTAMP(dtime), dtime FROM ifOutOctets_".$rid." WHERE $range AND id=$interface ORDER BY dtime"; 
+  $statement="SELECT `counter`, UNIX_TIMESTAMP(`dtime`), `dtime` FROM `ifOutOctets_".$rid."` WHERE $range AND `id`=$interface ORDER BY `dtime`"; 
   ($intbytes_out, $maxout, $avgout) = &interface_stats($statement);
   $bytesout = int($intbytes_out/1000000 + .5);
 
@@ -267,6 +267,6 @@ $rc = $dbh->disconnect;
 exit;
 
 format STDOUT = 
-@<<<<<<<<<<< @<<<<<<<<<<< @>>>>>>> @>>>>>>> @>>>>>> @>>>>>> @>>>>> @>>>>> @>>>>>> @>>>>>> @>>>>> @>>>>>
+@<<<<<<<<<<<<<<<<<<<<< @<<<<<<<<<<<<<<<<<<<<< @>>>>>>> @>>>>>>> @>>>>>> @>>>>>> @>>>>> @>>>>> @>>>>>> @>>>>>> @>>>>> @>>>>>
 $name,$router,&commify($bytesin), &commify($bytesout), $ratein, $rateout, $utilin, $utilout, $maxratein, $maxrateout, $maxutilin, $maxutilout  
 .