diff options
Diffstat (limited to 'epan/dissectors/packet-l2tp.c')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 5268728f83..ce80b97dcf 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -61,6 +61,7 @@ #include <epan/packet.h> #include <epan/ipproto.h> #include <epan/sminmpec.h> +#include <epan/addr_resolv.h> #include <epan/prefs.h> #include <epan/conversation.h> #include <epan/expert.h> @@ -1526,7 +1527,7 @@ static int dissect_l2tp_cisco_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ l2tp_avp_tree = proto_tree_add_subtree_format(tree, tvb, offset, avp_len, ett_l2tp_avp, NULL, "Vendor %s: %s AVP", - val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), + enterprises_lookup_format(wmem_packet_scope(), avp_vendor_id, "Unknown (%u)"), val_to_str(avp_type, cisco_avp_type_vals, "Unknown (%u)")); proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_mandatory, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1634,7 +1635,7 @@ static int dissect_l2tp_broadband_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pr l2tp_avp_tree = proto_tree_add_subtree_format(tree, tvb, offset, avp_len, ett_l2tp_avp, NULL, "Vendor %s: %s AVP", - val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), + enterprises_lookup_format(wmem_packet_scope(), avp_vendor_id, "Unknown (%u)"), val_to_str(avp_type, broadband_avp_type_vals, "Unknown (%u)")); proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_mandatory, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1816,7 +1817,7 @@ static int dissect_l2tp_ericsson_avps(tvbuff_t *tvb, packet_info *pinfo _U_, pro l2tp_avp_tree = proto_tree_add_subtree_format(tree, tvb, offset, avp_len, ett_l2tp_avp, NULL, "Vendor %s: %s AVP", - val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), + enterprises_lookup_format(wmem_packet_scope(), avp_vendor_id, "Unknown (%u)"), val_to_str(avp_type, ericsson_avp_type_vals, "Unknown (%u)")); proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_mandatory, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -1905,7 +1906,7 @@ dissect_l2tp_vnd_cablelabs_avps(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre l2tp_avp_tree = proto_tree_add_subtree_format(tree, tvb, offset, avp_len, ett_l2tp_avp, NULL, "Vendor %s: %s AVP", - val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), + enterprises_lookup_format(wmem_packet_scope(), avp_vendor_id, "Unknown (%u)"), val_to_str(avp_type, cablelabs_avp_type_vals, "Unknown (%u)")); proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_mandatory, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -2037,7 +2038,7 @@ static void process_control_avps(tvbuff_t *tvb, if (!dissector_try_uint_new(l2tp_vendor_avp_dissector_table, avp_vendor_id, avp_tvb, pinfo, l2tp_tree, FALSE, l2tp_cntrl_data)){ l2tp_avp_tree = proto_tree_add_subtree_format(l2tp_tree, tvb, idx, avp_len, ett_l2tp_avp, NULL, "Vendor %s AVP Type %u", - val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), + enterprises_lookup_format(wmem_packet_scope(), avp_vendor_id, "Unknown (%u)"), avp_type); proto_tree_add_item(l2tp_avp_tree, hf_l2tp_avp_mandatory, tvb, idx, 2, ENC_BIG_ENDIAN); @@ -3274,7 +3275,7 @@ proto_register_l2tp(void) NULL, HFILL }}, { &hf_l2tp_avp_vendor_id, - { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, + { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_ENTERPRISES, STRINGS_ENTERPRISES, 0, "AVP Vendor ID", HFILL }}, { &hf_l2tp_avp_type, |