diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-08-28 21:13:15 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-08-29 19:36:43 +0000 |
| commit | 9d9a873d9a4b71b12623afeff1bd46fbfa7eb211 (patch) | |
| tree | 50d6199c3df2794c22c2da1a42b1537d81271028 /epan/proto.c | |
| parent | 389339cab294b1200ce9139e34c517150bb1cd9c (diff) | |
Make AT_VINES a built-in type
Change-Id: I5c11cf4c7bee1b2b7072a6a0db5344a6b8a569ac
Reviewed-on: https://code.wireshark.org/review/29326
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/epan/proto.c b/epan/proto.c index 3364c37e8b..923e15420c 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -390,9 +390,6 @@ static void save_same_name_hfinfo(gpointer data) same_name_hfinfo = (header_field_info*)data; } -/* Cached value for VINES address type (used for FT_VINES) */ -static int vines_address_type = -1; - /* Points to the first element of an array of bits, indexed by a subtree item type; that array element is TRUE if subtrees of an item of that type are to be expanded. */ @@ -493,9 +490,6 @@ proto_init(GSList *register_all_protocols_list, ((void (*)(register_cb, gpointer))l->data)(cb, client_data); } - /* Now that the VINES dissector has registered it's address - type, grab the value for the field type */ - vines_address_type = address_type_get_by_name("AT_VINES"); #ifdef HAVE_PLUGINS /* Now call the registration routines for all disssector plugins. */ @@ -8425,7 +8419,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) break; case FT_VINES: - addr.type = vines_address_type; + addr.type = AT_VINES; addr.len = VINES_ADDR_LEN; addr.data = (guint8 *)fvalue_get(&fi->value); |