Revert r484406, it was never approved.

Pointy hat:	mfechner
With hat:	portmgr

1 files changed, 29 insertions, 0 deletions

diff --git a/net/rtg/files/patch-etc-rtgtargmkr.pl.in b/net/rtg/files/patch-etc-rtgtargmkr.pl.in
new file mode 100644
index 000000000000..4664faecbacf
--- /dev/null
+++ b/net/rtg/files/patch-etc-rtgtargmkr.pl.in
@@ -0,0 +1,29 @@
+--- etc/rtgtargmkr.pl.in.orig	2016-11-04 16:36:53 UTC
++++ etc/rtgtargmkr.pl.in
+@@ -126,7 +126,7 @@ sub find_router_id {
+         &sql_insert($sql);
+         $rid = &find_router_id($router);
+         foreach $mib ( keys %mibs_of_interest ) {
+-          $sql = "CREATE TABLE $mib"."_$rid (id INT NOT NULL, dtime DATETIME NOT NULL, counter BIGINT NOT NULL, KEY $mib"."_$rid". "_idx (dtime))";
++          $sql = "CREATE TABLE $mib"."_$rid (id INT NOT NULL, dtime DATETIME NOT NULL, counter BIGINT NOT NULL, KEY $mib"."_$rid". "_idx (dtime), KEY id_dtime_idx (id,dtime))";
+           &sql_insert($sql);
+         }
+     }
+@@ -289,7 +289,7 @@ sub main {
+       $year + 1900, $hour, $min;
+     print CFG "# Host\tOID\tBits\tCommunity\tTable\tID\tDescription\n";
+ 
+-    foreach $router (@routers) {
++    POKE: foreach $router (@routers) {
+         $bits = $counterBits{$router};
+         # Sanity check bits
+         $bits = $defbits if ( ( $bits != 32 ) && ( $bits != 64 ) );
+@@ -304,7 +304,7 @@ sub main {
+         $system = join ( ' ', @result );
+         print "System: $system\n" if $DEBUG;
+         $session = SNMP_Session->open( $router, $communities{$router}, 161 )
+-          || die "Error opening SNMP session to $router";
++          || ( print "Error opening SNMP session to $router" and next POKE );
+         if ( $system =~ /.*Cisco.*WS-.*/ ) {
+             $system = "Catalyst";
+             $session->map_table( $catalyst, \&process );