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

make-manuf.py: Add back our user agent. 

Change-Id: I39c54fa38c791f3244075b03a0045babc4f249ec
Reviewed-on: https://code.wireshark.org/review/29706
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-09-17 11:17:21 -07:00
parent bc6154aff9
commit 7b65208ef3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/make-manuf.py
View File

@ -30,7 +30,7 @@ if sys.version_info[0] >= 3:
import urllib.request, urllib.error, urllib.parse
import codecs
else:
import urllib
import urllib2
have_icu = False
try:
@ -47,12 +47,15 @@ def exit_msg(msg=None, status=1):
sys.exit(status)
def open_url(url):
req_headers = { 'User-Agent': 'Wireshark make-manuf' }
try:
if sys.version_info[0] >= 3:
req = urllib.request.urlopen(url)
url_fd = codecs.getreader('utf8')(req)
req = urllib.request.Request(url, headers=req_headers)
url_fo = urllib.request.urlopen(req)
url_fd = codecs.getreader('utf8')(url_fo)
else:
url_fd = urllib.urlopen(url)
req = urllib2.Request(url, headers=req_headers)
url_fd = urllib2.urlopen(req)
except:
exit_msg('Error opening ' + url)