From 324bfeb5e255e490809e91ccd615d7d9b538984c Mon Sep 17 00:00:00 2001 From: wmeier Date: Sat, 15 Oct 2011 18:46:26 +0000 Subject: Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-dhcp-failover.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-dhcp-failover.c') diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index c4fdb31821..6968253011 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -600,7 +600,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case DHCP_FO_PD_FTDDNS: proto_tree_add_item(option_tree, hf_dhcpfo_ftddns, tvb, - offset, option_length, ENC_BIG_ENDIAN); + offset, option_length, ENC_ASCII|ENC_NA); break; case DHCP_FO_PD_REJECT_REASON: @@ -624,7 +624,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case DHCP_FO_PD_MESSAGE: proto_tree_add_item(option_tree, hf_dhcpfo_message, tvb, - offset, option_length, ENC_BIG_ENDIAN); + offset, option_length, ENC_ASCII|ENC_NA); break; case DHCP_FO_PD_MCLT: @@ -883,7 +883,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(option_tree, hf_dhcpfo_message_digest, tvb, offset+1, - option_length-1, ENC_BIG_ENDIAN); + option_length-1, ENC_ASCII|ENC_NA); break; case DHCP_FO_PD_PROTOCOL_VERSION: -- cgit v1.2.3