diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-08-20 13:33:53 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-24 05:00:06 +0000 |
| commit | 274bbd5fab970c5a2048f9d00bb4e441cd68d04a (patch) | |
| tree | c01ecd63a2489fa1175c110fb94b459a126dace5 /epan/addr_resolv.h | |
| parent | e624445adff8aa10ca6663e653b13ecd5c7db8d2 (diff) | |
| download | wireshark-274bbd5fab970c5a2048f9d00bb4e441cd68d04a.tar.gz wireshark-274bbd5fab970c5a2048f9d00bb4e441cd68d04a.tar.bz2 wireshark-274bbd5fab970c5a2048f9d00bb4e441cd68d04a.zip | |
Extract the "long name" out of the manuf file and use it for some resolution
Some places (like MAC resolution) want to keep a fixed length, but for places
that want to display "full organization name", save the long name that is
treated as a comment in the manuf file.
Have make-manuf convert companies with all caps to mixed case so we're not
screaming the company name at the user.
Convert the manuf.tmpl to be tab delimited without a comment for the "long name"
so it can match the format now created by make-manuf.
Remove uint_get_manuf_name as it was unnecessary.
Bug: 3666
Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b
Reviewed-on: https://code.wireshark.org/review/23150
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/addr_resolv.h')
| -rw-r--r-- | epan/addr_resolv.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 2430fda003..8a76e2684c 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -239,12 +239,6 @@ extern const gchar *get_manuf_name(const guint8 *addr); WS_DLL_PUBLIC const gchar *get_manuf_name_if_known(const guint8 *addr); /* - * Given an integer containing a 24-bit OID, uint_get_manuf_name() - * returns the vendor name, or "%02x:%02x:%02x" if not known. - */ -extern const gchar *uint_get_manuf_name(const guint oid); - -/* * Given an integer containing a 24-bit OID, uint_get_manuf_name_if_known() * returns the vendor name, or NULL if not known. */ |