summaryrefslogtreecommitdiff
path: root/epan/proto.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-02-07 22:15:55 -0500
committerMichael Mann <mmann78@netscape.net>2015-02-09 01:12:01 +0000
commit4497bb48fd3439474049f7c5e86b4ffa1df35828 (patch)
treef325f4a4ea7bfa485644527bc126cf6d7e216fc7 /epan/proto.c
parent3b81c360ded5b81d9affe324435f358590220341 (diff)
downloadwireshark-4497bb48fd3439474049f7c5e86b4ffa1df35828.tar.gz
Add address type registration.
Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 0a568a3019..eea584f8c5 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -39,6 +39,7 @@
#include "ptvcursor.h"
#include "strutil.h"
#include "addr_resolv.h"
+#include "address_types.h"
#include "oids.h"
#include "proto.h"
#include "epan_dissect.h"
@@ -464,6 +465,9 @@ proto_init(void (register_all_protocols_func)(register_cb cb, gpointer client_da
/* Initialize the ftype subsystem */
ftypes_initialize();
+ /* Initialize the addres type subsystem */
+ address_types_initialize();
+
/* Register one special-case FT_TEXT_ONLY field for use when
converting wireshark to new-style proto_tree. These fields
are merely strings on the GUI tree; they are not filterable */