1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
From 5ff17673eec7fc200a16552e3686015e99d10b5e Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Tue, 16 Apr 2019 16:08:15 +0200
Subject: [PATCH 1/2] BPF: fix get_working_ifaces()
It was broken when an interface name did not end by a digit.
It was also incorrect when an interface name ended by more than one
digit.
---
scapy/arch/bpf/core.py | 46 ++++++++++++++++++++++++------------------
test/bpf.uts | 6 ++----
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git scapy/arch/bpf/core.py scapy/arch/bpf/core.py
index cc4732f52..4c9e9470a 100644
--- scapy/arch/bpf/core.py
+++ scapy/arch/bpf/core.py
@@ -5,22 +5,22 @@
"""
from __future__ import absolute_import
-from scapy.config import conf
-from scapy.error import Scapy_Exception, warning
-from scapy.data import ARPHDR_LOOPBACK, ARPHDR_ETHER
-from scapy.arch.common import get_if, compile_filter
-from scapy.consts import LOOPBACK_NAME
-
-from scapy.arch.bpf.consts import BIOCSETF, SIOCGIFFLAGS, BIOCSETIF
+from ctypes import cdll, cast, pointer
+from ctypes import c_int, c_ulong, c_char_p
+from ctypes.util import find_library
+import fcntl
import os
+import re
import socket
-import fcntl
import struct
-from ctypes import cdll, cast, pointer
-from ctypes import c_int, c_ulong, c_char_p
-from ctypes.util import find_library
+from scapy.arch.bpf.consts import BIOCSETF, SIOCGIFFLAGS, BIOCSETIF
+from scapy.arch.common import get_if, compile_filter
+from scapy.config import conf
+from scapy.consts import LOOPBACK_NAME
+from scapy.data import ARPHDR_LOOPBACK, ARPHDR_ETHER
+from scapy.error import Scapy_Exception, warning
from scapy.modules.six.moves import range
@@ -126,6 +126,9 @@ def get_if_list():
return interfaces
+_IFNUM = re.compile("([0-9]*)([ab]?)$")
+
+
def get_working_ifaces():
"""
Returns an ordered list of interfaces that could be used with BPF.
@@ -156,24 +159,27 @@ def get_working_ifaces():
if ifflags & 0x1: # IFF_UP
# Get a BPF handle
- fd, _ = get_dev_bpf()
+ fd = get_dev_bpf()[0]
if fd is None:
raise Scapy_Exception("No /dev/bpf are available !")
# Check if the interface can be used
try:
- fcntl.ioctl(fd, BIOCSETIF, struct.pack("16s16x", ifname.encode())) # noqa: E501
- interfaces.append((ifname, int(ifname[-1])))
+ fcntl.ioctl(fd, BIOCSETIF, struct.pack("16s16x",
+ ifname.encode()))
except IOError:
pass
-
- # Close the file descriptor
- os.close(fd)
+ else:
+ ifnum, ifab = _IFNUM.search(ifname).groups()
+ interfaces.append((ifname, int(ifnum) if ifnum else -1, ifab))
+ finally:
+ # Close the file descriptor
+ os.close(fd)
# Sort to mimic pcap_findalldevs() order
- interfaces.sort(key=lambda elt: elt[1])
+ interfaces.sort(key=lambda elt: (elt[1], elt[2], elt[0]))
- return interfaces
+ return [iface[0] for iface in interfaces]
def get_working_if():
@@ -183,4 +189,4 @@ def get_working_if():
if not ifaces:
# A better interface will be selected later using the routing table
return LOOPBACK_NAME
- return ifaces[0][0]
+ return ifaces[0]
diff --git test/bpf.uts test/bpf.uts
index 19e06bb14..45d36fd83 100644
--- test/bpf.uts
+++ test/bpf.uts
@@ -47,12 +47,10 @@ len(iflist) > 0
= Get working network interfaces
~ needs_root
-from scapy.arch.bpf.core import get_working_ifaces
+from scapy.arch.bpf.core import get_working_if, get_working_ifaces
ifworking = get_working_ifaces()
assert len(ifworking)
-
-from scapy.arch.bpf.core import get_working_if
-assert len(ifworking) and get_working_if() == ifworking[0][0]
+assert get_working_if() == ifworking[0]
= Misc functions
From afa5776ecf83f7a427fc1af763005fe249f450f9 Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Wed, 17 Apr 2019 10:22:16 +0200
Subject: [PATCH 2/2] BPF: test get_working_ifaces()
---
test/bpf.uts | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git test/bpf.uts test/bpf.uts
index 45d36fd83..23022530e 100644
--- test/bpf.uts
+++ test/bpf.uts
@@ -53,6 +53,33 @@ assert len(ifworking)
assert get_working_if() == ifworking[0]
+= Get working network interfaces order
+
+import mock
+from scapy.arch.bpf.core import get_working_ifaces
+
+@mock.patch("scapy.arch.bpf.core.os.close")
+@mock.patch("scapy.arch.bpf.core.fcntl.ioctl")
+@mock.patch("scapy.arch.bpf.core.get_dev_bpf")
+@mock.patch("scapy.arch.bpf.core.get_if")
+@mock.patch("scapy.arch.bpf.core.get_if_list")
+@mock.patch("scapy.arch.bpf.core.os.getuid")
+def test_get_working_ifaces(mock_getuid, mock_get_if_list, mock_get_if,
+ mock_get_dev_bpf, mock_ioctl, mock_close):
+ mock_getuid.return_value = 0
+ mock_get_if_list.return_value = ['igb0', 'em0', 'msk0', 'epair0a', 'igb1',
+ 'vlan20', 'igb10', 'igb2']
+ mock_get_if.return_value = (b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
+ b'\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00'
+ b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+ mock_get_dev_bpf.return_value = (31337,)
+ mock_ioctl.return_value = 0
+ mock_close.return_value = 0
+ return get_working_ifaces()
+
+assert test_get_working_ifaces() == ['em0', 'igb0', 'msk0', 'epair0a', 'igb1',
+ 'igb2', 'igb10', 'vlan20']
+
= Misc functions
~ needs_root
|
