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

support *i_untagged in Bridge.pm to work on other platforms (falls back to *i_vlan)

Browse Source
This commit is contained in:
Oliver Gorwits
2013-11-02 23:53:13 +00:00
parent e3e289a27c
commit c21ca2062e
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Info/Bridge.pm
View File

@@ -308,6 +308,8 @@ sub i_vlan {
return $i_vlan;
}
sub i_untagged { goto &i_vlan }
sub i_vlan_membership {
my $bridge = shift;
my $partial = shift;
@@ -365,6 +367,8 @@ sub set_i_vlan {
return;
}
sub set_i_untagged { goto &set_i_vlan }
sub set_add_i_vlan_tagged {
my $bridge = shift;
@@ -597,6 +601,10 @@ to a hash.
Returns a mapping between C<ifIndex> and the PVID or default VLAN.
=item $vtp->i_untagged()
An alias for C<i_vlan>.
=item $bridge->i_vlan_membership()
Returns reference to hash of arrays: key = C<ifIndex>, value = array of VLAN
@@ -893,6 +901,10 @@ operations.
Currently unsupported. Throws an error and returns.
=item $bridge->set_i_untagged(vlan, ifIndex)
An alias for C<set_i_vlan>.
=item $bridge->set_i_pvid(pvid, ifIndex)
Currently unsupported. Throws an error and returns.

26
Info/CiscoVTP.pm
View File

@@ -143,9 +143,6 @@ sub v_index {
return \%v_index;
}
sub i_pvid { goto &i_vlan }
sub i_untagged { goto &i_vlan }
sub i_vlan {
my $vtp = shift;
my $partial = shift;
@@ -194,6 +191,22 @@ sub i_vlan {
return \%i_vlans;
}
sub i_untagged {
my $vtp = shift;
my ( $ifindex ) = @_;
# cannot defer to i_vlan - vtp_trunk_dyn_stat is not useful for down ports
# so we use vtp_trunk_dyn as a hint to use i_pvid
my $trunking = eval { $vtp->vtp_trunk_dyn($ifindex)->{$ifindex} };
if ($trunking and (($trunking eq 'on') or ($trunking eq 'onNoNegotiate'))) {
return $vtp->i_pvid(@_);
}
else {
return $vtp->i_vlan(@_);
}
}
sub i_vlan_membership {
my $vtp = shift;
my $partial = shift;
@@ -313,6 +326,9 @@ sub set_i_untagged {
my $vtp = shift;
my ( $vlan_id, $ifindex ) = @_;
# cannot defer to i_vlan - vtp_trunk_dyn_stat is not useful for down ports
# so we use vtp_trunk_dyn as a hint to use i_pvid
my $trunking = eval { $vtp->vtp_trunk_dyn($ifindex)->{$ifindex} };
if ($trunking and (($trunking eq 'on') or ($trunking eq 'onNoNegotiate'))) {
return $vtp->set_i_pvid(@_);
@@ -556,10 +572,6 @@ Your device will only implement a subset of these methods.
Returns a mapping between C<ifIndex> and assigned VLAN ID for access ports
and the default VLAN ID for trunk ports.
=item $vtp->i_pvid()
An alias for C<i_vlan>.
=item $vtp->i_untagged()
An alias for C<i_vlan>.