diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-17 04:51:21 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-17 04:51:21 +0000 |
| commit | 484c4cbaff87ad754967db29f62c49b4885abc3f (patch) | |
| tree | 154454d44e42507215001b8a89a7bc65486dccbb /epan/dissectors/packet-radius.c | |
| parent | e39f1dbccc47c0f6d67e3735623421546e7797f6 (diff) | |
Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34143 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-radius.c')
| -rw-r--r-- | epan/dissectors/packet-radius.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 0605bffda9..db08795e00 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -955,7 +955,7 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, if (vendor) { vendor_str = vendor->name; } else { - vendor_str = val_to_str(vendor_id, sminmpec_values, "Unknown"); + vendor_str = val_to_str_ext_const(vendor_id, &sminmpec_values_ext, "Unknown"); vendor = &no_vendor; } proto_item_append_text(avp_item, " v=%s(%u)", vendor_str, @@ -1776,7 +1776,9 @@ extern void radius_register_avp_dissector(guint32 vendor_id, guint32 attribute_i if ( ! vendor ) { vendor = g_malloc(sizeof(radius_vendor_info_t)); - vendor->name = g_strdup_printf("%s-%u",val_to_str(vendor_id, sminmpec_values, "Unknown"),vendor_id); + vendor->name = g_strdup_printf("%s-%u", + val_to_str_ext_const(vendor_id, &sminmpec_values_ext, "Unknown"), + vendor_id); vendor->code = vendor_id; vendor->attrs_by_id = g_hash_table_new(g_direct_hash,g_direct_equal); vendor->ett = no_vendor.ett; |