diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-11-15 14:07:16 -0800 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-11-15 22:21:14 +0000 |
| commit | 01d5e8ee513cd17f2f86bcb1a2b76384e272428e (patch) | |
| tree | 71d87306dbbea269965996acefe673677f5531a8 /tools/make-usb.py | |
| parent | 39050a72de622ff571451c63b8bc1fcb28770ec2 (diff) | |
Tools: Update the usb.ids URL in make-usb.py.
The canonical location for the usb.ids file is
http://www.linux-usb.org/usb.ids. Unfortunately that site isn't
accessible over HTTPS so we were using https://usb-ids.gowdy.us/usb.ids
instead. *That* site is down, so switch to the Linux USB project's
SourceForge repository URL, which appears to house the assets for
www.linux-usb.org, including the usb.ids file.
Diffstat (limited to 'tools/make-usb.py')
| -rwxr-xr-x | tools/make-usb.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/make-usb.py b/tools/make-usb.py index 9a8371aada..5011213ac4 100755 --- a/tools/make-usb.py +++ b/tools/make-usb.py @@ -13,14 +13,16 @@ import urllib.request, urllib.error, urllib.parse MODE_IDLE = 0 MODE_VENDOR_PRODUCT = 1 -MIN_VENDORS = 2900 # 2948 as of 2015-06-28 -MIN_PRODUCTS = 15000 # 15415 as of 2015-06-28 +MIN_VENDORS = 3400 # 3409 as of 2020-11-15 +MIN_PRODUCTS = 20000 # 20361 as of 2020-11-15 mode = MODE_IDLE -# Grab from linux-usb.org +# The canonical location for the usb.ids file is http://www.linux-usb.org/usb.ids. +# As of November 2020 that site isn't available over HTTPS. Use what appears to +# be the source code repository for the site. req_headers = { 'User-Agent': 'Wireshark make-usb' } -req = urllib.request.Request('https://usb-ids.gowdy.us/usb.ids', headers=req_headers) +req = urllib.request.Request('https://sourceforge.net/p/linux-usb/repo/HEAD/tree/trunk/htdocs/usb.ids?format=raw', headers=req_headers) response = urllib.request.urlopen(req) lines = response.read().decode('UTF-8', 'replace').splitlines() |