diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-05-11 07:38:59 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-05-11 07:38:59 +0000 |
| commit | 77ae45d3b6e0f6ac9fbaf093680178d92e17aec9 (patch) | |
| tree | e4d8ef3f04a46a2a64a0fc6a81b745ec0a905d0d /asn1/x2ap | |
| parent | a01546ad7e337a29dd568b0b66f754125feaf4c8 (diff) | |
| download | wireshark-77ae45d3b6e0f6ac9fbaf093680178d92e17aec9.tar.gz | |
Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.
Fix a field that was presumably intended to be of type FT_IPv6.
svn path=/trunk/; revision=42564
Diffstat (limited to 'asn1/x2ap')
| -rw-r--r-- | asn1/x2ap/packet-x2ap-template.c | 2 | ||||
| -rw-r--r-- | asn1/x2ap/x2ap.cnf | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index 877fe934f0..630747cb83 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -143,7 +143,7 @@ void proto_register_x2ap(void) { NULL, HFILL }}, { &hf_x2ap_transportLayerAddressIPv6, { "transportLayerAddress(IPv6)", "x2ap.transportLayerAddressIPv6", - FT_IPv4, BASE_NONE, NULL, 0, + FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }}, #include "packet-x2ap-hfarr.c" diff --git a/asn1/x2ap/x2ap.cnf b/asn1/x2ap/x2ap.cnf index 2b4b1c2008..7f0d7eafda 100644 --- a/asn1/x2ap/x2ap.cnf +++ b/asn1/x2ap/x2ap.cnf @@ -120,11 +120,11 @@ ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC STRINGS = VALS(x2ap_Prot subtree = proto_item_add_subtree(actx->created_item, ett_x2ap_TransportLayerAddress); if (tvb_len==4){ /* IPv4 */ - proto_tree_add_item(subtree, hf_x2ap_transportLayerAddressIPv4, parameter_tvb, 0, tvb_len, FALSE); + proto_tree_add_item(subtree, hf_x2ap_transportLayerAddressIPv4, parameter_tvb, 0, tvb_len, ENC_BIG_ENDIAN); } if (tvb_len==16){ /* IPv6 */ - proto_tree_add_item(subtree, hf_x2ap_transportLayerAddressIPv6, parameter_tvb, 0, tvb_len, FALSE); + proto_tree_add_item(subtree, hf_x2ap_transportLayerAddressIPv6, parameter_tvb, 0, tvb_len, ENC_NA); } #.FN_BODY RRC-Context VAL_PTR = ¶meter_tvb |