osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Test: Fix default capture interface discovery. 

Change-Id: Id033a0e4e1e81ae9e84774b2d76f95049a2e2b3a
Reviewed-on: https://code.wireshark.org/review/27315
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-05-03 12:06:52 -07:00
parent 83b8c9c988
commit 751e9463ce
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/config.py
View File

@ -118,8 +118,12 @@ def getDefaultCaptureInterface():
if not sys.platform.startswith('win32'):
return
try:
dumpcap_d_blob = str(subprocess.check_output((cmd_dumpcap, '-D'), stderr=subprocess.PIPE))
for d_line in dumpcap_d_blob.splitlines():
dumpcap_d_data = subprocess.check_output((cmd_dumpcap, '-D'), stderr=subprocess.PIPE)
if sys.version_info[0] >= 3:
dumpcap_d_stdout = dumpcap_d_data.decode('UTF-8', 'replace')
else:
dumpcap_d_stdout = unicode(dumpcap_d_data, 'UTF-8', 'replace')
for d_line in dumpcap_d_stdout.splitlines():
iface_m = re.search('(\d+)\..*(Ethernet|Network Connection|VMware|Intel)', d_line)
if iface_m:
capture_interface = iface_m.group(1)