aboutsummaryrefslogtreecommitdiffstats
path: root/epan/address_types.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-08 16:36:07 -0500
committerMichael Mann <mmann78@netscape.net>2015-02-09 03:48:53 +0000
commit2875cd382fdc0efd5d949f674a0328ecf918b7e9 (patch)
tree82d03e2b9ed1288dce651d3f1df3f930677f1fe4 /epan/address_types.c
parent2042385ac9eaa7e512b1a0b9af2f916324314e63 (diff)
Eliminate the hf member out of the address structure.
Using the new address type registration, dissectors can create their own address types with their own (column) filters attached to them, eliminating the need for an address to keep track of a hf_ field. Change-Id: I2bbec256a056f403a7ac9880d5d76a0b2a21b221 Ping-Bug: 7728 Reviewed-on: https://code.wireshark.org/review/7037 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/address_types.c')
-rw-r--r--epan/address_types.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/address_types.c b/epan/address_types.c
index 7c7c9783a2..48b0e26b74 100644
--- a/epan/address_types.c
+++ b/epan/address_types.c
@@ -57,7 +57,7 @@ struct _address_type_t {
/* XXX - Include functions for name resolution? ***/
};
-#define MAX_DISSECTOR_ADDR_TYPE 15
+#define MAX_DISSECTOR_ADDR_TYPE 20
#define MAX_ADDR_TYPE_VALUE (AT_END_OF_LIST+MAX_DISSECTOR_ADDR_TYPE)
static int num_dissector_addr_type;
@@ -119,13 +119,13 @@ int address_type_dissector_register(const char* name, const char* pretty_name,
/******************************************************************************
* AT_NONE
******************************************************************************/
-static gboolean none_addr_to_str(const address* addr _U_, gchar *buf, int buf_len _U_)
+gboolean none_addr_to_str(const address* addr _U_, gchar *buf, int buf_len _U_)
{
buf[0] = '\0';
return TRUE;
}
-static int none_addr_str_len(const address* addr _U_)
+int none_addr_str_len(const address* addr _U_)
{
return 1; /* NULL character for empty string */
}
@@ -133,14 +133,14 @@ static int none_addr_str_len(const address* addr _U_)
/******************************************************************************
* AT_ETHER
******************************************************************************/
-static gboolean ether_to_str(const address* addr, gchar *buf, int buf_len _U_)
+gboolean ether_to_str(const address* addr, gchar *buf, int buf_len _U_)
{
bytes_to_hexstr_punct(buf, (const guint8*)addr->data, 6, ':');
buf[17] = '\0';
return TRUE;
}
-static int ether_str_len(const address* addr _U_)
+int ether_str_len(const address* addr _U_)
{
return 18;
}