|
Packit |
667938 |
diff -u ../xxx/SNMP_util.pm ./SNMP_util.pm
|
|
Packit |
667938 |
--- ../xxx/SNMP_util.pm Tue Feb 23 23:01:32 1999
|
|
Packit |
667938 |
+++ ./SNMP_util.pm Fri Mar 12 14:00:46 1999
|
|
Packit |
667938 |
@@ -53,6 +53,7 @@
|
|
Packit |
667938 |
#frame relay stuff ... see the docs for explanations
|
|
Packit |
667938 |
'frInOctets' => '1.3.6.1.2.1.10.32.2.1.9',
|
|
Packit |
667938 |
'frOutOctets' => '1.3.6.1.2.1.10.32.2.1.7',
|
|
Packit |
667938 |
+ 'ipRouteifIndex' => '1.3.6.1.2.1.4.21.1.2',
|
|
Packit |
667938 |
# squid mib
|
|
Packit |
667938 |
'cacheServerRequests' => '1.3.6.1.4.1.3495.1.3.2.1.10',
|
|
Packit |
667938 |
'cacheServerErrors' => '1.3.6.1.4.1.3495.1.3.2.1.11',
|
|
Packit |
667938 |
Only in .: diff
|
|
Packit |
667938 |
diff -u ../xxx/mrtg ./mrtg
|
|
Packit |
667938 |
--- ../xxx/mrtg Tue Feb 23 23:01:32 1999
|
|
Packit |
667938 |
+++ ./mrtg Fri Mar 12 14:02:35 1999
|
|
Packit |
667938 |
@@ -616,8 +616,18 @@
|
|
Packit |
667938 |
$target{$targ}{'oid1'} = "ifInOctets.$port";
|
|
Packit |
667938 |
$target{$targ}{'oid2'} = "ifOutOctets.$port";
|
|
Packit |
667938 |
} else {
|
|
Packit |
667938 |
+ if (!$01 && !$02 && $port) {
|
|
Packit |
667938 |
+ $target{$targ}{'port'} = "ipRouteifIndex.$port";
|
|
Packit |
667938 |
+ ($port)=
|
|
Packit |
667938 |
+ &snmpget($target{$targ}{'community'}."@".$target{$targ}{'router'},
|
|
Packit |
667938 |
+ $target{$targ}{'port'});
|
|
Packit |
667938 |
+
|
|
Packit |
667938 |
+ $target{$targ}{'oid1'} = "ifInOctets.$port";
|
|
Packit |
667938 |
+ $target{$targ}{'oid2'} = "ifOutOctets.$port";
|
|
Packit |
667938 |
+ } else {
|
|
Packit |
667938 |
my($o1, $o2) = split(/\&/, $port,2);
|
|
Packit |
667938 |
- if (!$o1 || !$o2) {
|
|
Packit |
667938 |
+
|
|
Packit |
667938 |
+ if (!$o1 || !$o2) {
|
|
Packit |
667938 |
warn ("\nERROR: If specifying the full OID, you must specify\n".
|
|
Packit |
667938 |
"2 full OID's separated by '&'. Error found with\n".
|
|
Packit |
667938 |
"\"$&\" in \"Target[$rou]\"\n");
|
|
Packit |
667938 |
@@ -625,6 +635,7 @@
|
|
Packit |
667938 |
}
|
|
Packit |
667938 |
$target{$targ}{'oid1'} = $o1;
|
|
Packit |
667938 |
$target{$targ}{'oid2'} = $o2;
|
|
Packit |
667938 |
+ }
|
|
Packit |
667938 |
}
|
|
Packit |
667938 |
}
|
|
Packit |
667938 |
|