OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e732b22
)
Don't fail if getting SO_BINDTODEVICE is not yet supported.
author
Lorenzo Colitti
<lorenzo@google.com>
Wed, 6 Jan 2016 07:25:34 +0000
(16:25 +0900)
committer
Lorenzo Colitti
<lorenzo@google.com>
Wed, 6 Jan 2016 07:32:31 +0000
(16:32 +0900)
This makes sock_diag_test pass on android-3.4.
Change-Id: Iba2afc09b62e59e03c1368e9d1772da685ab0300
tests/net_test/sock_diag.py
patch
|
blob
|
history
diff --git
a/tests/net_test/sock_diag.py
b/tests/net_test/sock_diag.py
index
8089947
..
58faccf
100755
(executable)
--- a/
tests/net_test/sock_diag.py
+++ b/
tests/net_test/sock_diag.py
@@
-195,7
+195,10
@@
class SockDiag(netlink.NetlinkSocket):
"""Creates an InetDiagReqV2 that matches the specified socket."""
family = s.getsockopt(net_test.SOL_SOCKET, net_test.SO_DOMAIN)
protocol = s.getsockopt(net_test.SOL_SOCKET, net_test.SO_PROTOCOL)
- iface = s.getsockopt(SOL_SOCKET, net_test.SO_BINDTODEVICE)
+ if net_test.LINUX_VERSION >= (3, 8):
+ iface = s.getsockopt(SOL_SOCKET, net_test.SO_BINDTODEVICE)
+ else:
+ iface = 0
src, sport = s.getsockname()[:2]
try:
dst, dport = s.getpeername()[:2]