![Gerald Combs](/assets/img/avatar_default.png)
Instead of forcing developers to generate sminmpec.c (which will have different results depending on the presence or absence of a working Internet connection) add sminmpec.c back to the repository. I'll add it to the weekly update-numbers script so that it will be updated at the same time as manuf, services, enterprise-numbers, and usb.c. Change the Autotools, CMake, and Nmake sminmpec.c target name to "update-sminmpec". Remove the mtime check from make-sminmpec.pl. Update enterprise-numbers and sminmpec.c while we're here. Tested with an in-tree Autotools build and an out-of-tree CMake build. Change-Id: Iecc332ce2731e3e98ab0205a56c78807e599a026 Reviewed-on: https://code.wireshark.org/review/1516 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
136 lines
4.1 KiB
Python
Executable file
136 lines
4.1 KiB
Python
Executable file
#!/usr/bin/env python
|
|
#
|
|
# make-usb - Creates a file containing vendor and product ids.
|
|
# It use the databases at
|
|
# http://www.linux-usb.org/usb.ids
|
|
# to create our file epan/dissectors/usb.c
|
|
#
|
|
# It also uses the values culled out of libgphoto2 using usb-ptp-extract-models.pl
|
|
|
|
import re
|
|
import sys
|
|
|
|
if sys.version_info[0] < 3:
|
|
import urllib
|
|
else:
|
|
import urllib.request, urllib.error, urllib.parse
|
|
|
|
MODE_IDLE = 0
|
|
MODE_VENDOR_PRODUCT = 1
|
|
|
|
|
|
mode = MODE_IDLE
|
|
|
|
# Grab from linux-usb.org
|
|
if sys.version_info[0] < 3:
|
|
response = urllib.urlopen('http://www.linux-usb.org/usb.ids')
|
|
else:
|
|
response = urllib.request.urlopen('http://www.linux-usb.org/usb.ids')
|
|
lines = response.read().splitlines()
|
|
|
|
vendors = dict()
|
|
products = dict()
|
|
vendors_str="static const value_string usb_vendors_vals[] = {\n"
|
|
products_str="static const value_string usb_products_vals[] = {\n"
|
|
|
|
|
|
for line in lines:
|
|
line = line.rstrip()
|
|
|
|
if line == "# Vendors, devices and interfaces. Please keep sorted.":
|
|
mode = MODE_VENDOR_PRODUCT
|
|
continue
|
|
elif line == "# List of known device classes, subclasses and protocols":
|
|
mode = MODE_IDLE
|
|
continue
|
|
|
|
if mode == MODE_VENDOR_PRODUCT:
|
|
if re.match("^[0-9a-f]{4}", line):
|
|
last_vendor=line[:4]
|
|
vendors[last_vendor] = re.sub("\"", "\\\"", re.sub("\?+", "?", repr(line[4:].strip())[1:-1].replace("\\", "\\\\")))
|
|
elif re.match("^\t[0-9a-f]{4}", line):
|
|
line = line.strip()
|
|
product = "%s%s"%(last_vendor, line[:4])
|
|
products[product] = re.sub("\"", "\\\"", re.sub("\?+", "?", repr(line[4:].strip())[1:-1].replace("\\", "\\\\")))
|
|
|
|
|
|
# Grab from libgphoto (indirectly through tools/usb-ptp-extract-models.pl)
|
|
u = open('tools/usb-ptp-extract-models.txt','r')
|
|
for line in u.readlines():
|
|
fields=line.split()
|
|
products[fields[0]]= ' '.join(fields[1:])
|
|
|
|
|
|
for v in sorted(vendors):
|
|
vendors_str += " { 0x%s, \"%s\" },\n"%(v,vendors[v])
|
|
|
|
vendors_str += """ { 0, NULL }\n};
|
|
value_string_ext ext_usb_vendors_vals = VALUE_STRING_EXT_INIT(usb_vendors_vals);
|
|
"""
|
|
|
|
for p in sorted(products):
|
|
products_str += " { 0x%s, \"%s\" },\n"%(p,products[p])
|
|
|
|
products_str += """ { 0, NULL }\n};
|
|
value_string_ext ext_usb_products_vals = VALUE_STRING_EXT_INIT(usb_products_vals);
|
|
"""
|
|
|
|
header="""/* usb.c
|
|
* USB vendor id and product ids
|
|
* This file was generated by running python ./tools/make-usb.py
|
|
* Don't change it directly.
|
|
*
|
|
* Copyright 2012, Michal Labedzki for Tieto Corporation
|
|
*
|
|
* Other values imported from libghoto2/camlibs/ptp2/library.c, music-players.h
|
|
*
|
|
* Copyright (C) 2001-2005 Mariusz Woloszyn <emsi@ipartners.pl>
|
|
* Copyright (C) 2003-2013 Marcus Meissner <marcus@jet.franken.de>
|
|
* Copyright (C) 2005 Hubert Figuiere <hfiguiere@teaser.fr>
|
|
* Copyright (C) 2009 Axel Waggershauser <awagger@web.de>
|
|
* Copyright (C) 2005-2007 Richard A. Low <richard@wentnet.com>
|
|
* Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
|
|
* Copyright (C) 2007 Ted Bullock
|
|
* Copyright (C) 2012 Sony Mobile Communications AB
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
/*
|
|
* XXX We should probably parse a USB ID file at program start instead
|
|
* of generating this file.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include <epan/packet.h>
|
|
"""
|
|
|
|
f = open('epan/dissectors/usb.c', 'w')
|
|
f.write(header)
|
|
f.write("\n")
|
|
f.write(vendors_str)
|
|
f.write("\n\n")
|
|
f.write(products_str)
|
|
f.write("\n")
|
|
f.close()
|
|
|
|
print("Success!")
|
|
|
|
|