diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-04-24 08:27:26 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-04-24 06:48:35 +0000 |
| commit | bf2d8f96da54f0144fad0e457dc997aaa2897087 (patch) | |
| tree | a12a6b85b9fe59adf5e4bf948272581e5652a8f1 /epan/dissectors/packet-lisp.c | |
| parent | 993adc84d5a5be1ec2e69e8ed3db11fb220a4ad6 (diff) | |
Fix Warning: Found soft-deprecated APIs in epan/dissectors/packet-lisp.c: tvb_length
and also fix warning found by fix-encodings-args
Change-Id: I20193d9f2700e8ede439dcc848390ff7672239b3
Reviewed-on: https://code.wireshark.org/review/1318
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lisp.c')
| -rw-r--r-- | epan/dissectors/packet-lisp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index 2fbb8c55db..a14b979bbc 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -504,7 +504,7 @@ dissect_lcaf_afi_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, remaining -= INET_ADDRLEN; break; case AFNUM_INET6: - proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_ipv6, tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN); + proto_tree_add_item(lisp_afi_list_tree, hf_lisp_lcaf_afi_list_ipv6, tvb, offset, INET6_ADDRLEN, ENC_NA); proto_item_append_text(tir, " %d. IPv6 Address: %s", i, tvb_ip6_to_str(tvb, offset)); proto_item_set_len(tir, 2 + INET6_ADDRLEN); offset += INET6_ADDRLEN; @@ -1685,7 +1685,7 @@ dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree) proto_tree_add_item(lisp_tree, hf_lisp_info_res2, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - ti_prefix = proto_tree_add_item(lisp_tree, hf_lisp_info_prefix, tvb, offset, 3, ENC_BIG_ENDIAN); + ti_prefix = proto_tree_add_item(lisp_tree, hf_lisp_info_prefix, tvb, offset, 3, ENC_ASCII|ENC_NA); prefix_tree = proto_item_add_subtree(ti_prefix, ett_lisp_info_prefix); proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_masklen, tvb, offset, 1, ENC_NA); @@ -1709,7 +1709,7 @@ dissect_lisp_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree) proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_ipv4, tvb, offset, INET_ADDRLEN, ENC_BIG_ENDIAN); break; case AFNUM_INET6: - proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_ipv6, tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN); + proto_tree_add_item(prefix_tree, hf_lisp_info_prefix_ipv6, tvb, offset, INET6_ADDRLEN, ENC_NA); break; } @@ -1866,7 +1866,7 @@ dissect_lisp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ } /* Return the amount of data this dissector was able to dissect */ - return tvb_length(tvb); + return tvb_reported_length(tvb); } |