diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-05-20 21:44:17 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-05-20 21:44:17 +0000 |
| commit | d2233711d902fc8312cb0fa74606df25467dde52 (patch) | |
| tree | 58069b448a1d2f1a5c421f9407a699933eac088e | |
| parent | 3bb534f338c96981b2a47d9f20f23c7c332e63a3 (diff) | |
add get_manuf_name_if_known (returns NULL if unknown) in addition to get_manuf_name
svn path=/trunk/; revision=14405
| -rw-r--r-- | epan/addr_resolv.c | 17 | ||||
| -rw-r--r-- | epan/addr_resolv.h | 3 | ||||
| -rw-r--r-- | epan/libethereal.def | 1 |
3 files changed, 21 insertions, 0 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 7bf210fd45..8f4b7bc3b7 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -2130,6 +2130,23 @@ extern const gchar *get_manuf_name(const guint8 *addr) } /* get_manuf_name */ +const gchar *get_manuf_name_if_known(const guint8 *addr) +{ + hashmanuf_t *manufp; + + if (!eth_resolution_initialized) { + initialize_ethers(); + eth_resolution_initialized = 1; + } + + if ((manufp = manuf_name_lookup(addr)) == NULL) { + return NULL; + } + + return manufp->name; + +} /* get_manuf_name_if_known */ + /* Translate a string, assumed either to be a dotted-quad IP address or * a host name, to a numeric IP address. Return TRUE if we succeed and diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index d760fc2e35..b9e3690789 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -135,6 +135,9 @@ extern gchar *get_ether_name_if_known(const guint8 *addr); /* get_manuf_name returns the vendor name or "%02x:%02x:%02x" if not known */ extern const gchar *get_manuf_name(const guint8 *addr); +/* get_manuf_name returns the vendor name or NULL if not known */ +extern const gchar *get_manuf_name_if_known(const guint8 *addr); + /* get_ipxnet_name returns the logical name if found in an ipxnets file, * or a string formatted with "%X" if not */ extern const gchar *get_ipxnet_name(const guint32 addr); diff --git a/epan/libethereal.def b/epan/libethereal.def index 28b178738e..7b1aeb7fb9 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -285,6 +285,7 @@ get_dissector_table_ui_name get_ether_name get_hostname get_hostname6 +get_manuf_name_if_known get_persconffile_path get_plugins_global_dir get_plugins_pers_dir |