diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-06-24 14:25:41 +0100 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2017-06-26 22:40:50 +0000 |
commit | 7466880e8a09aa7a9bb797b70fa44bca397881d9 (patch) | |
tree | 1634c5d6e433a4803ecd5543a4cb6420e7c886d7 /epan/dissectors/packet-mip6.c | |
parent | 3071f9dd7409bd5b0432dd8f1bebbeeee1b6c755 (diff) |
Parse enterprise-numbers at run time
"enterprise-numbers" is converted to tab-separated values and renamed
"enterprises". Unused fields are stripped.
PENs are stored in a hash table loaded at run-time.
User "enterprises" file is loaded from the personal config dir.
Misc make-sminmpec.pl improvements and fixes.
Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output.
Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2
Reviewed-on: https://code.wireshark.org/review/22246
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/dissectors/packet-mip6.c')
-rw-r--r-- | epan/dissectors/packet-mip6.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 9dcb633c55..7340d8b916 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -57,6 +57,7 @@ #include <epan/expert.h> #include <epan/ip_opts.h> #include <epan/sminmpec.h> +#include <epan/addr_resolv.h> #include <wsutil/str_util.h> @@ -2510,7 +2511,7 @@ dissect_mip6_opt_vsm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* proto_tree_add_item_ret_uint(opt_tree, hf_mip6_vsm_vid, tvb, offset, MIP6_VSM_VID_LEN, ENC_BIG_ENDIAN, &vendorid); - proto_item_append_text(ti, ": %s", val_to_str_ext_const(vendorid, &sminmpec_values_ext, "<unknown>")); + proto_item_append_text(ti, ": %s", enterprises_lookup(vendorid, "<unknown>")); offset += 4; next_tvb = tvb_new_subset_remaining(tvb, offset); @@ -4479,7 +4480,7 @@ proto_register_mip6(void) }, { &hf_mip6_vsm_vid, { "Vendor Id", "mip6.vsm.vendorId", - FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0, + FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0, NULL, HFILL } }, { &hf_mip6_vsm_subtype, |