Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nemu3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
nemu3
Commits
93f5a398
Commit
93f5a398
authored
Jul 29, 2010
by
Martín Ferrari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Link: Fix destroy issues. Propagate up and mtu changes to slave interfaces
parent
86079c84
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
11 deletions
+19
-11
src/netns/interface.py
src/netns/interface.py
+19
-11
No files found.
src/netns/interface.py
View file @
93f5a398
# vim:ts=4:sw=4:et:ai:sts=4
import
os
import
os
,
weakref
import
netns.iproute
__all__
=
[
'NodeInterface'
,
'P2PInterface'
,
'ForeignInterface'
,
...
...
@@ -275,10 +275,9 @@ class ForeignInterface(ExternalInterface):
# FIXME: register somewhere for destruction!
def
destroy
(
self
):
# override: restore as much as possible
if
self
.
_slave
:
if
self
.
index
in
self
.
_slave
.
get_if_data
():
if
self
.
_original_state
:
netns
.
iproute
.
set_if
(
self
.
_original_state
)
self
.
_slav
e
=
None
self
.
_original_stat
e
=
None
# Link is just another interface type
...
...
@@ -295,7 +294,7 @@ class Link(ExternalInterface):
iface
=
netns
.
iproute
.
create_bridge
(
self
.
_gen_br_name
())
super
(
Link
,
self
).
__init__
(
iface
.
index
)
self
.
_ports
=
set
()
self
.
_ports
=
weakref
.
WeakValueDictionary
()
# FIXME: is this correct/desirable/etc?
self
.
stp
=
False
self
.
forward_delay
=
0
...
...
@@ -309,33 +308,42 @@ class Link(ExternalInterface):
if
name
[
0
]
==
'_'
:
# forbid anything that doesn't start with a _
super
(
Link
,
self
).
__setattr__
(
name
,
value
)
return
# Set ports
if
name
in
(
'up'
,
'mtu'
):
for
i
in
self
.
_ports
.
values
():
setattr
(
i
,
name
,
value
)
# Set bridge
iface
=
netns
.
iproute
.
bridge
(
index
=
self
.
index
)
setattr
(
iface
,
name
,
value
)
return
netns
.
iproute
.
set_bridge
(
iface
)
netns
.
iproute
.
set_bridge
(
iface
)
def
__del__
(
self
):
self
.
destroy
()
def
destroy
(
self
):
for
p
in
self
.
_ports
:
if
not
self
.
index
:
return
self
.
up
=
False
for
p
in
self
.
_ports
.
values
():
try
:
self
.
disconnect
(
p
)
except
:
pass
self
.
up
=
False
self
.
_ports
.
clear
()
netns
.
iproute
.
del_bridge
(
self
.
index
)
self
.
_idx
=
None
def
connect
(
self
,
iface
):
assert
iface
.
control
.
index
not
in
self
.
_ports
netns
.
iproute
.
add_bridge_port
(
self
.
index
,
iface
.
control
.
index
)
# FIXME: up/down, mtu, etc should be automatically propagated?
iface
.
control
.
up
=
True
self
.
_ports
.
add
(
iface
.
control
.
index
)
self
.
_ports
[
iface
.
control
.
index
]
=
iface
.
control
def
disconnect
(
self
,
iface
):
assert
iface
.
control
.
index
in
self
.
_ports
netns
.
iproute
.
del_bridge_port
(
self
.
index
,
iface
.
control
.
index
)
self
.
_ports
.
remove
(
iface
.
control
.
index
)
del
self
.
_ports
[
iface
.
control
.
index
]
# don't look after this :-)
...
...
Write
Preview
Markdown
is supported
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