diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-12-03 15:22:39 -0500 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-12-04 03:44:45 +0000 |
commit | 6e5d84f1e1ce5cb468f585c0bdb26d555254d107 (patch) | |
tree | 82870a9909f5e70a19c4061d5b9d22f9ef2958d5 /epan/dissectors/packet-smpp.c | |
parent | f8c0bff6b813698be87ef0d407bbd0c2f2fa357b (diff) |
Rename some filter names to fix cases of duplicate filter names.
Note: Use of most of these filter names could have caused a Wireshark crash.
Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae
Reviewed-on: https://code.wireshark.org/review/5610
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-smpp.c')
-rw-r--r-- | epan/dissectors/packet-smpp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index b92abc8cd9..f5ee60cae6 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -206,7 +206,7 @@ static int hf_smpp_display_time = -1; static int hf_smpp_sms_signal = -1; static int hf_smpp_ms_validity = -1; static int hf_smpp_alert_on_message_delivery_null = -1; -static int hf_smpp_alert_on_message_delivery = -1; +static int hf_smpp_alert_on_message_delivery_type = -1; static int hf_smpp_its_reply_type = -1; static int hf_smpp_its_session_number = -1; static int hf_smpp_its_session_sequence = -1; @@ -1757,7 +1757,7 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) tvb, *offset, length, ENC_NA); } else { smpp_handle_int1(sub_tree, tvb, - hf_smpp_alert_on_message_delivery, offset); + hf_smpp_alert_on_message_delivery_type, offset); } break; case 0x1380: /* its_reply_type */ @@ -3383,14 +3383,14 @@ proto_register_smpp(void) } }, { &hf_smpp_alert_on_message_delivery_null, - { "Alert on delivery", "smpp.alert_on_message_delivery", + { "Alert on delivery", "smpp.alert_on_message_delivery_null", FT_NONE, BASE_NONE, NULL, 0x00, "Instructs the handset to alert user on message delivery.", HFILL } }, - { &hf_smpp_alert_on_message_delivery, - { "Alert on delivery", "smpp.alert_on_message_delivery", + { &hf_smpp_alert_on_message_delivery_type, + { "Alert on delivery", "smpp.alert_on_message_delivery_type", FT_UINT8, BASE_DEC, VALS(vals_alert_on_message_delivery), 0x00, "Instructs the handset to alert user on message delivery.", HFILL |