osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Bill Meier 2014-12-03 15:22:39 -05:00
parent f8c0bff6b8
commit 6e5d84f1e1
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-dhcpv6.c
View File

@ -2269,7 +2269,7 @@ proto_register_dhcpv6(void)
{ &hf_capabilities_encoding_bytes,
{ "Value", "dhcpv6.cccV6.tlv5.suboption.value", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_capabilities_encoding_number,
{ "Value", "dhcpv6.cccV6.tlv5.suboption.value", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ "Value", "dhcpv6.cccV6.tlv5.suboption.value_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_packetcable_cccV6_pri_dss,
{ "Primary SSID", "dhcpv6.packetcable.cccV6.pri_dss", FT_STRINGZ, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_packetcable_cccV6_sec_dss,

6
epan/dissectors/packet-ged125.c
View File

@ -1522,15 +1522,15 @@ proto_register_ged125 (void)
"A bit mask that is a logical OR of the Service Control features supported by the VRU", HFILL }},
{ &hf_ged125_floating_payload_strg,
{ "Floating Payload", "ged125.floating_payload",
{ "Floating Payload", "ged125.floating_payload.strg",
FT_STRING, FT_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_ged125_floating_payload_uint,
{ "Floating Payload", "ged125.floating_payload",
{ "Floating Payload", "ged125.floating_payload.uint",
FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_ged125_floating_payload_bool,
{ "Floating Payload", "ged125.floating_payload",
{ "Floating Payload", "ged125.floating_payload.bool",
FT_BOOLEAN, 32, NULL, 0x01, NULL, HFILL }},
{ &hf_ged125_floating_payload_ECC_tag,

2
epan/dissectors/packet-ncp.c
View File

@ -1075,7 +1075,7 @@ proto_register_ncp(void)
FT_UINT32, BASE_HEX, VALS(burst_command), 0x0,
"Packet Burst Command", HFILL }},
{ &hf_ncp_burst_file_handle,
{ "Burst File Handle", "ncp.file_handle",
{ "Burst File Handle", "ncp.burst_file_handle",
FT_UINT32, BASE_HEX, NULL, 0x0,
"Packet Burst File Handle", HFILL }},
{ &hf_ncp_burst_reserved,

10
epan/dissectors/packet-smpp.c
View File

@ -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

2
tools/ncp2222.py
View File

@ -8217,7 +8217,7 @@ proto_register_ncp2222(void)
{ "Set Parameter Value", "ncp.srvr_param_string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_srvr_param_number,
{ "Set Parameter Value", "ncp.srvr_param_string", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ "Set Parameter Value", "ncp.srvr_param_number", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_srvr_param_boolean,
{ "Set Parameter Value", "ncp.srvr_param_boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},