aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-dhcpv6.c2
-rw-r--r--epan/dissectors/packet-ged125.c6
-rw-r--r--epan/dissectors/packet-ncp.c2
-rw-r--r--epan/dissectors/packet-smpp.c10
4 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 282d94643c..3e9e0ef312 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -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,
diff --git a/epan/dissectors/packet-ged125.c b/epan/dissectors/packet-ged125.c
index db56d556ab..69541d74a3 100644
--- a/epan/dissectors/packet-ged125.c
+++ b/epan/dissectors/packet-ged125.c
@@ -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,
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index a855a3d4a5..d813663969 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -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,
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