Commit 5854d495 authored by Robert Ricci's avatar Robert Ricci

Fix a dumb bug.

Also, allow cisco switch types to be called 'catalyst', since that is
technically a more correct name (ie. there are non-cat Ciscos.)
parent 3aa18589
...@@ -97,7 +97,7 @@ foreach my $switchref (@switches) { ...@@ -97,7 +97,7 @@ foreach my $switchref (@switches) {
my ($snmpversion, $useindexing, $switchtype); my ($snmpversion, $useindexing, $switchtype);
SWITCH: SWITCH:
for ($type) { for ($type) {
(/^cisco/) && do { $snmpversion = "2c"; $useindexing = 1; (/^cisco/ || /^catalyst/) && do { $snmpversion = "2c"; $useindexing = 1;
$switchtype = "cisco"; last;}; $switchtype = "cisco"; last;};
(/^intel/) && do { $snmpversion = "1"; $useindexing = 0; (/^intel/) && do { $snmpversion = "1"; $useindexing = 0;
$switchtype = "intel"; last;}; $switchtype = "intel"; last;};
...@@ -300,7 +300,7 @@ SWITCH: ...@@ -300,7 +300,7 @@ SWITCH:
# #
my $modport; my $modport;
if ($switchtype eq "cisco") { if ($switchtype eq "cisco") {
my ($modport) = $device->convertPortFormat(2, $ifIndex); ($modport) = $device->convertPortFormat(2, $ifIndex);
} else { } else {
$modport = "1.$ifIndex"; $modport = "1.$ifIndex";
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment