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-maccontrol.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-maccontrol.c')
| -rw-r--r-- | epan/dissectors/packet-maccontrol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index f4132e82cc..bc529b4cf4 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -187,14 +187,14 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Assigned Port */ proto_tree_add_item(macctrl_tree, hf_reg_port, tvb, - 6, 2, ENC_NA); + 6, 2, ENC_BIG_ENDIAN); /* Flags */ proto_tree_add_item(macctrl_tree, hf_reg_flags, tvb, 8, 1, ENC_NA); /* Synch Time */ proto_tree_add_item(macctrl_tree, hf_reg_time, tvb, - 9, 2, ENC_NA); + 9, 2, ENC_BIG_ENDIAN); /* Echoed Pending Grants */ proto_tree_add_item(macctrl_tree, hf_reg_grants, tvb, @@ -209,11 +209,11 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Echoed Assigned Port */ proto_tree_add_item(macctrl_tree, hf_reg_ack_port, tvb, - 7, 2, ENC_NA); + 7, 2, ENC_BIG_ENDIAN); /* Echoed Synch Time */ proto_tree_add_item(macctrl_tree, hf_reg_ack_time, tvb, - 9, 2, ENC_NA); + 9, 2, ENC_BIG_ENDIAN); break; case MACCTRL_CLASS_BASED_FLOW_CNTRL_PAUSE: |