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-mpls-echo.c | |
| parent | 3071f9dd7409bd5b0432dd8f1bebbeeee1b6c755 (diff) | |
| download | wireshark-7466880e8a09aa7a9bb797b70fa44bca397881d9.tar.gz | |
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-mpls-echo.c')
| -rw-r--r-- | epan/dissectors/packet-mpls-echo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 1acdd0a2df..fa203a1922 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -33,7 +33,7 @@ #include "config.h" #include <epan/packet.h> -#include <epan/sminmpec.h> +#include <epan/addr_resolv.h> #include <epan/expert.h> #include <epan/to_str.h> @@ -2121,7 +2121,7 @@ proto_register_mpls_echo(void) }, { &hf_mpls_echo_tlv_vendor, { "Vendor Id", "mpls_echo.tlv.vendor_id", - FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0, "MPLS ECHO Vendor Id", HFILL} + FT_UINT32, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0x0, "MPLS ECHO Vendor Id", HFILL} }, { &hf_mpls_echo_tlv_ilso_addr_type, { "Address Type", "mpls_echo.tlv.ilso.addr_type", |