aboutsummaryrefslogtreecommitdiffstats
path: root/epan/to_str.h
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2011-02-11 03:13:24 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2011-02-11 03:13:24 +0000
commit0f59bc7c4521cc6139dfe44d9775d06d99b8a583 (patch)
treea26cae2ece217ef1faadaabb707931125b649b7a /epan/to_str.h
parentd8659693eff66f7e89c53871776c455cd11b4cae (diff)
Rename vines_to_str() to tvb_vines_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB. Move most of the contents of packet-vines.h into packet-vines.c: the moved content is only needed in that file. svn path=/trunk/; revision=35912
Diffstat (limited to 'epan/to_str.h')
-rw-r--r--epan/to_str.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/to_str.h b/epan/to_str.h
index 3fc560cf1f..5526f8b5d0 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -34,6 +34,7 @@
#define GUID_STR_LEN 37
#define MAX_IP_STR_LEN 16
#define MAX_ADDR_STR_LEN 256
+#define VINES_ADDR_LEN 6
/*
* These are utility functions which convert various types to strings,
@@ -63,7 +64,7 @@ extern void ip6_to_str_buf(const struct e_in6_addr *, gchar *);
extern gchar* ipx_addr_to_str(const guint32, const guint8 *);
extern gchar* ipxnet_to_string(const guint8 *ad);
extern gchar* ipxnet_to_str_punct(const guint32 ad, const char punct);
-extern gchar* vines_addr_to_str(const guint8 *addrp);
+extern gchar* tvb_vines_addr_to_str(tvbuff_t *tvb, const gint offset);
extern gchar* time_secs_to_str(const gint32 time_val);
extern gchar* time_secs_to_str_unsigned(const guint32);
extern gchar* time_msecs_to_str(gint32 time_val);