Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
6385f62a
Commit
6385f62a
authored
Aug 22, 2017
by
Leigh B Stoller
Browse files
Add spanning-tree fix from Kirk (filter bpdu packets on control port).
Also clean up silly code.
parent
5e6333f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
tbsetup/libosload_switch.pm.in
View file @
6385f62a
...
...
@@ -1379,9 +1379,7 @@ sub generateConfig($$) {
}
my $card = $interface->card();
my $port = $interface->port();
my @alpha = ("","A","B","C","D","E","F","G","H","I",
"J","K","L","M","N","O");
my $portname = $alpha[$card] . $port;
my $portname = _translatePort($card, $port);
#
# A trunk has to be in at least one vlan in tagged mode, for
...
...
@@ -1412,6 +1410,9 @@ sub generateConfig($$) {
push @cnetlines, "vlan 999";
push @cnetlines, " name \"EmulabControlPort\"";
push @cnetlines, " untagged $cnetport";
# Prevent the upstream control switch from becoming STP root.
# Kirk firgured this out for me!
push @cnetlines, " spanning-tree $cnetport bpdu-filter";
if (defined($cnetip) && $cnetip ne '') {
push @cnetlines, " ip address ${cnetip} ${cnetmask}";
push @cnetlines, "exit";
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment