Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
system_extras
Commits
9e73f5af
Commit
9e73f5af
authored
9 years ago
by
Lorenzo Colitti
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Teach iproute how to dump IP addresses as well."
parents
21ac023d
45020cfb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
tests/net_test/iproute.py
tests/net_test/iproute.py
+8
-1
No files found.
tests/net_test/iproute.py
View file @
9e73f5af
...
...
@@ -118,6 +118,7 @@ RTACacheinfo = cstruct.Struct(
# Interface address attributes.
IFA_ADDRESS
=
1
IFA_LOCAL
=
2
IFA_LABEL
=
3
IFA_CACHEINFO
=
6
# Address flags.
...
...
@@ -280,7 +281,8 @@ class IPRoute(netlink.NetlinkSocket):
"RTA_GATEWAY"
,
"RTA_PREFSRC"
,
"RTA_UID"
,
"NDA_DST"
]:
data
=
socket
.
inet_ntop
(
msg
.
family
,
nla_data
)
elif
name
in
[
"FRA_IIFNAME"
,
"FRA_OIFNAME"
,
"IFLA_IFNAME"
,
"IFLA_QDISC"
]:
elif
name
in
[
"FRA_IIFNAME"
,
"FRA_OIFNAME"
,
"IFLA_IFNAME"
,
"IFLA_QDISC"
,
"IFA_LABEL"
]:
data
=
nla_data
.
strip
(
"
\x00
"
)
elif
name
==
"RTA_METRICS"
:
data
=
self
.
_ParseAttributes
(
-
RTA_METRICS
,
msg
.
family
,
None
,
nla_data
)
...
...
@@ -424,6 +426,11 @@ class IPRoute(netlink.NetlinkSocket):
ifinfomsg
=
IfinfoMsg
((
0
,
0
,
0
,
0
,
0
,
0
))
return
self
.
_Dump
(
RTM_GETLINK
,
ifinfomsg
,
IfinfoMsg
,
""
)
def
DumpAddresses
(
self
,
version
):
family
=
self
.
_AddressFamily
(
version
)
ifaddrmsg
=
IfAddrMsg
((
family
,
0
,
0
,
0
,
0
))
return
self
.
_Dump
(
RTM_GETADDR
,
ifaddrmsg
,
IfAddrMsg
,
""
)
def
_Address
(
self
,
version
,
command
,
addr
,
prefixlen
,
flags
,
scope
,
ifindex
):
"""Adds or deletes an IP address."""
family
=
self
.
_AddressFamily
(
version
)
...
...
This diff is collapsed.
Click to expand it.
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