Commit Graph

18 Commits

Author SHA1 Message Date
Dario Lombardo fe71e26af2 spdx: more licenses converted.
Change-Id: I3861061ec261e63b23621799e020e811ed78a343
Reviewed-on: https://code.wireshark.org/review/26333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07 15:56:44 +00:00
João Valverde 279a2762dc Extend enterprises.tsv to accept spaces as separators
We can do so easily because the format is so simple. This makes it
more convenient for a user to hand-edit a dictionary in the personal
config folder. We still use tabs in the system file for a small space
gain.

Also add a brief description of the format as a comment.

Change-Id: If3f741bff16f1f42c8ef07d643dc6463caaad1a5
Reviewed-on: https://code.wireshark.org/review/22678
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-18 04:41:12 +00:00
Gerald Combs 76efb096d4 Rename enterprises to enterprises.tsv and ship it.
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more
obvious and so that double-clicking the file might do something useful.

Add it to the Windows packages.

Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463
Reviewed-on: https://code.wireshark.org/review/22616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-15 06:20:34 +00:00
João Valverde 7466880e8a Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed
"enterprises". Unused fields are stripped.

PENs are stored in a hash table loaded at run-time.

User "enterprises" file is loaded from the personal config dir.

Misc make-sminmpec.pl improvements and fixes.
Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output.

Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2
Reviewed-on: https://code.wireshark.org/review/22246
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26 22:40:50 +00:00
Gerald Combs 3f247a5cee Be less aggressive about rebuilding sminmpec.c.
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>
2014-05-09 09:03:24 +00:00
Gerald Combs 002cefc721 make-sminmpec.pl fixups.
Enforce a minimum number of entries and do our work in the epan
directory.

Change-Id: I69cc6ae3255b23706a2e67db890a9718e10568b2
Reviewed-on: https://code.wireshark.org/review/1398
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-30 16:35:55 +00:00
Jeff Morriss 82e2865739 Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention.

Don't regenerate anything now.

Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14 01:35:57 +00:00
Gerald Combs 1a279aca25 Update the enterprise-numbers URL.
svn path=/trunk/; revision=54694
2014-01-10 22:57:28 +00:00
Jeff Morriss 22b7086fb9 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=44997
2012-09-19 01:37:13 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Gerald Combs d5b3acebd1 Send a useful User-Agent header.
svn path=/trunk/; revision=42522
2012-05-09 19:17:48 +00:00
Gerald Combs 959135b215 Enable proxies in make-manuf and make-sminmpec.pl as well.
svn path=/trunk/; revision=38864
2011-09-02 16:07:36 +00:00
Ronnie Sahlberg 34c9bd4fe6 The array sminmpec_values should not be declated static since it is
referenced from several dissectors


svn path=/trunk/; revision=34269
2010-09-28 03:31:03 +00:00
Bill Meier 55620b5b75 Generate the value_string array sminmpec_values[] with "gaps"
filled in (using name "(Unknown)" so that direct (indexed)
access to the value_string is possible.

Note that this represents a slight API change in that
match_strval() on sminmpec_values  will no longer return NULL for
missing enterprise numbers (less than the maximum in the array)
but will return the string "(Unknown)".

AFAIKT this change does not materially affect existing Wireshark
use of the sminmpec value_string array.

svn path=/trunk/; revision=34218
2010-09-23 18:48:19 +00:00
Bill Meier 7219ee2a49 Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;

svn path=/trunk/; revision=34143
2010-09-17 04:51:21 +00:00
Kovarththanan Rajaratnam 2bb18bac8b Point to the correct perl script in the autogenerated file + correct tabs
svn path=/trunk/; revision=31984
2010-02-24 12:28:04 +00:00
Kovarththanan Rajaratnam b2f70634a7 Align value_string array properly
svn path=/trunk/; revision=30513
2009-10-11 15:03:57 +00:00
Kovarththanan Rajaratnam e6486705f7 Move make-sminmpec.pl to tools directory
svn path=/trunk/; revision=30511
2009-10-11 14:39:14 +00:00