135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- [ 1663699 ] Implement vmVoiceVlanId in i_vlan_membership()

Browse Source 
- Trunk VLANs only exist on ports which are trunking
This commit is contained in:
Eric Miller
2007-11-24 03:23:13 +00:00
parent 60cb2b8c20
commit 149e97c2d6
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Info/CiscoVTP.pm
View File

@@ -191,6 +191,7 @@ sub i_vlan_membership {
my $ports_vlans_2k = $vtp->vtp_trunk_vlans_2k($partial) || {}; my $ports_vlans_2k = $vtp->vtp_trunk_vlans_2k($partial) || {};
my $ports_vlans_3k = $vtp->vtp_trunk_vlans_3k($partial) || {}; my $ports_vlans_3k = $vtp->vtp_trunk_vlans_3k($partial) || {};
my $ports_vlans_4k = $vtp->vtp_trunk_vlans_4k($partial) || {}; my $ports_vlans_4k = $vtp->vtp_trunk_vlans_4k($partial) || {};
my $voice_vlans = $vtp->i_voice_vlan($partial) || {};
my $vtp_vlans = $vtp->v_state(); my $vtp_vlans = $vtp->v_state();
my $i_vlan = $vtp->i_vlan2($partial) || {}; my $i_vlan = $vtp->i_vlan2($partial) || {};
my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {}; my $trunk_dyn_stat = $vtp->vtp_trunk_dyn_stat($partial) || {};
@@ -202,11 +203,20 @@ sub i_vlan_membership {
my $vlan = $i_vlan->{$port}; my $vlan = $i_vlan->{$port};
next unless defined $vlan; next unless defined $vlan;
my $stat = $trunk_dyn_stat->{$port}; my $stat = $trunk_dyn_stat->{$port};
unless ( defined $stat and $stat =~ /^trunking/ ) { if ( defined $stat and $stat =~ /notTrunking/ ) {
push(@{$i_vlan_membership->{$port}}, $vlan); push(@{$i_vlan_membership->{$port}}, $vlan);
} }
} }
# Get special voice VLANs (0 and 4096)
foreach my $port (keys %$voice_vlans) {
my $vlan = $voice_vlans->{$port};
next unless defined $vlan;
# Going to assume we would catch regular VLANs with the other methods
next unless ($vlan == 0 or $vlan == 4096);
push(@{$i_vlan_membership->{$port}}, $vlan);
}
# Get trunk ports # Get trunk ports
my %oper_vlans; my %oper_vlans;
@@ -224,30 +234,18 @@ sub i_vlan_membership {
} }
foreach my $port (keys %$ports_vlans) { foreach my $port (keys %$ports_vlans) {
my $vlanlist = [split(//, unpack("B*", $ports_vlans->{$port}))]; my $stat = $trunk_dyn_stat->{$port};
foreach my $vlan (keys %oper_vlans) { if ( defined $stat and $stat =~ /^trunking/ ) {
push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan]); my $k = 0;
} foreach my $list ("$ports_vlans->{$port}", "$ports_vlans_2k->{$port}",
} "$ports_vlans_3k->{$port}", "$ports_vlans_4k->{$port}") {
my $vlanlist = [split(//, unpack("B*", $list))];
foreach my $port (keys %$ports_vlans_2k) { my $offset = 1024 * $k;
my $vlanlist = [split(//, unpack("B*", $ports_vlans_2k->{$port}))]; foreach my $vlan (keys %oper_vlans) {
foreach my $vlan (keys %oper_vlans) { push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan]-$offset);
push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan-1024]); }
} $k++;
} }
foreach my $port (keys %$ports_vlans_3k) {
my $vlanlist = [split(//, unpack("B*", $ports_vlans_3k->{$port}))];
foreach my $vlan (keys %oper_vlans) {
push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan-2048]);
}
}
foreach my $port (keys %$ports_vlans_4k) {
my $vlanlist = [split(//, unpack("B*", $ports_vlans_4k->{$port}))];
foreach my $vlan (keys %oper_vlans) {
push(@{$i_vlan_membership->{$port}}, $vlan) if (@$vlanlist[$vlan-3072]);
} }
} }