From Harald Welte:

[obnox/wireshark/wip.git] / epan / to_str.h

diff --git a/epan/to_str.h b/epan/to_str.h
index d1bb65f47ca17c6f75824494b3beea5bbab774e9..fb1cad998245db1d22dc668b638623fc5b32742a 100644 (file)
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -33,7 +33,10 @@
 
 #define GUID_STR_LEN 37
 #define MAX_IP_STR_LEN 16
+#define MAX_IP6_STR_LEN 40
 #define MAX_ADDR_STR_LEN 256
+#define VINES_ADDR_LEN 6
+#define EUI64_STR_LEN 24
 
 /*
  * These are utility functions which convert various types to strings,
@@ -49,16 +52,23 @@ extern gchar*       se_address_to_str(const address *);
 extern void     address_to_str_buf(const address *addr, gchar *buf, int buf_len);
 extern gchar*   bytestring_to_str(const guint8 *, const guint32, const char);
 extern gchar*  ether_to_str(const guint8 *);
+extern gchar*  tvb_ether_to_str(tvbuff_t *tvb, const gint offset);
 extern const gchar*    ip_to_str(const guint8 *);
+extern const gchar*    tvb_ip_to_str(tvbuff_t *tvb, const gint offset);
 extern void    ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len);
 extern gchar*  fc_to_str(const guint8 *);
 extern gchar*  fcwwn_to_str (const guint8 *);
+extern gchar*  tvb_fc_to_str(tvbuff_t *tvb, const gint offset);
+extern gchar*  tvb_fcwwn_to_str (tvbuff_t *tvb, const gint offset);
 extern gchar*  ip6_to_str(const struct e_in6_addr *);
+extern gchar*  tvb_ip6_to_str(tvbuff_t *tvb, const gint offset);
 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*  eui64_to_str(const guint64 ad);
+extern gchar*  tvb_eui64_to_str(tvbuff_t *tvb, const gint offset, const guint encoding);
 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);