Use proto_tree_add_item() instead of proto_tree_add_xxx() with a pointer into

the TVB.

Introduce and start using tvb_get_manuf_name() and tvb_get_manuf_name_if_known()
which do the same as the non-tvb versions but take a tvb and an offset instead
of (commonly) a pointer into a TVB.

svn path=/trunk/; revision=37317

1 files changed, 12 insertions, 1 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index d8f0421e37..fcab4bb5a2 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -3032,6 +3032,11 @@ get_manuf_name(const guint8 *addr)
 
 } /* get_manuf_name */
 
+extern const gchar *
+tvb_get_manuf_name(tvbuff_t *tvb, gint offset)
+{
+	return get_manuf_name(tvb_get_ptr(tvb, offset, 3));
+}
 
 const gchar *
 get_manuf_name_if_known(const guint8 *addr)
@@ -3052,12 +3057,18 @@ get_manuf_name_if_known(const guint8 *addr)
 } /* get_manuf_name_if_known */
 
 extern const gchar *
+tvb_get_manuf_name_if_known(tvbuff_t *tvb, gint offset)
+{
+	return get_manuf_name_if_known(tvb_get_ptr(tvb, offset, 3));
+}
+
+extern const gchar *
 get_eui64_name(const guint64 addr_eui64)
 {
   gchar *cur;
   hashmanuf_t  *mtp;
   guint8 *addr = ep_alloc(8);
-  
+
   /* Copy and convert the address to network byte order. */
   *(guint64 *)(void *)(addr) = pntoh64(&(addr_eui64));