diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-09-17 04:51:21 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-09-17 04:51:21 +0000 |
| commit | 7219ee2a49ac2da22f3dcf77b0f343a9b0d61b9c (patch) | |
| tree | 154454d44e42507215001b8a89a7bc65486dccbb /epan/dissectors/packet-l2tp.c | |
| parent | d643e0366ade6d97ef936deb67bb0cf55a4c765d (diff) | |
| download | wireshark-7219ee2a49ac2da22f3dcf77b0f343a9b0d61b9c.tar.gz | |
Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;
svn path=/trunk/; revision=34143
Diffstat (limited to 'epan/dissectors/packet-l2tp.c')
| -rw-r--r-- | epan/dissectors/packet-l2tp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 908ad87998..c3b0188e13 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -629,12 +629,12 @@ static void process_control_avps(tvbuff_t *tvb, } else if (avp_vendor_id == VENDOR_CISCO) { /* Vendor-Specific AVP */ tf = proto_tree_add_text(l2tp_tree, tvb, idx, avp_len, "Vendor %s: %s AVP", - val_to_str(avp_vendor_id, sminmpec_values, "Unknown (%u)"), + val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), val_to_str(avp_type, cisco_avp_type_vals, "Unknown (%u)")); } else { /* Vendor-Specific AVP */ tf = proto_tree_add_text(l2tp_tree, tvb, idx, avp_len, "Vendor %s AVP Type %u", - val_to_str(avp_vendor_id, sminmpec_values, "Unknown (%u)"), + val_to_str_ext(avp_vendor_id, &sminmpec_values_ext, "Unknown (%u)"), avp_type); } @@ -2020,7 +2020,7 @@ proto_register_l2tp(void) "AVP Length", HFILL }}, { &hf_l2tp_avp_vendor_id, - { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_DEC, VALS(sminmpec_values), 0, + { "Vendor ID", "l2tp.avp.vendor_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, "AVP Vendor ID", HFILL }}, { &hf_l2tp_avp_type, |