diff options
| author | Bill Meier <wmeier@newsguy.com> | 2014-09-18 21:18:34 -0400 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-09-19 01:38:08 +0000 |
| commit | 18d72987cb44eb3594b054a8509c447dbc709b46 (patch) | |
| tree | b987bbcf662d0bbff0251b64f212ac70d2f45726 /epan/dissectors/packet-ipv6.c | |
| parent | 4bdf5145129a2b9dbae3d927a761d9be5cecacd5 (diff) | |
Do encoding-arg changes (all benign)
For:
- FT_BYTES: Always use just ENC_NA
- integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN
Also:
- FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...)
- Change one case of incorrect '||' to '|'
Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0
Reviewed-on: https://code.wireshark.org/review/4184
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-ipv6.c')
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index ce20b64b44..063da8af1f 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1186,8 +1186,8 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)"), tvb_get_guint8(tvb, offset), ttl_diff); offset += 1; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_NA); - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } else if (function == QS_RATE_REPORT) { proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_rate, tvb, offset, 1, ENC_NA); @@ -1196,8 +1196,8 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info * pinfo, c val_to_str_ext(rate, &qs_rate_vals_ext, "Unknown (%u)")); proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_unused, tvb, offset, 1, ENC_NA); offset += 1; - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_NA); - proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_NA); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_nonce, tvb, offset, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_ipv6_opt_qs_reserved, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; } |