diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-13 15:53:30 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-13 15:53:30 +0000 |
| commit | a167206685d96ec2f601ddca81529e60a5822810 (patch) | |
| tree | ab37d05388aa0483bd3c43e36ad614f9fee2863f /epan/to_str.h | |
| parent | d9520dc09c237743a11275c28d0c0c76ec051dc3 (diff) | |
Introduce, and start using, tvb_ip_to_str() and tvb_ip6_to_str(). These
do the same as the non-tvb equivalents but take a TVB and an offset instead
of a pointer to an array of bytes.
Their purpose is to prevent (many) dissectors from doing:
ip_to_str(tvb_get_ptr(...)).
(About the names and the location: I like the names as they are but the names
imply that they should live in tvbuff.c. That would make some sense but
I didn't want to pull to_str.h into tvbuff.c...)
svn path=/trunk/; revision=35519
Diffstat (limited to 'epan/to_str.h')
| -rw-r--r-- | epan/to_str.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/to_str.h b/epan/to_str.h index d1bb65f47c..c4528910d8 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -50,10 +50,12 @@ 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 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* 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); |