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-mysql.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-mysql.c')
| -rw-r--r-- | epan/dissectors/packet-mysql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 40e6147ff0..1087767558 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -980,7 +980,7 @@ mysql_dissect_login(tvbuff_t *tvb, packet_info *pinfo, int offset, int length; lenfle = tvb_get_fle(tvb, offset, &connattrs_length, NULL); - tf = proto_tree_add_item(login_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(login_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_NA); connattrs_tree = proto_item_add_subtree(tf, ett_connattrs); proto_tree_add_uint64(connattrs_tree, hf_mysql_connattrs_length, tvb, offset, lenfle, connattrs_length); offset += lenfle; @@ -1308,7 +1308,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, int length; lenfle = tvb_get_fle(tvb, offset, &connattrs_length, NULL); - tf = proto_tree_add_item(req_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_ASCII|ENC_NA); + tf = proto_tree_add_item(req_tree, hf_mysql_connattrs, tvb, offset, (guint32)connattrs_length, ENC_NA); connattrs_tree = proto_item_add_subtree(tf, ett_connattrs); proto_tree_add_uint64(connattrs_tree, hf_mysql_connattrs_length, tvb, offset, lenfle, connattrs_length); offset += lenfle; @@ -1447,7 +1447,7 @@ mysql_dissect_request(tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree_add_item(req_tree, hf_mysql_binlog_position, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - proto_tree_add_item(req_tree, hf_mysql_binlog_flags, tvb, offset, 2, ENC_NA); + proto_tree_add_item(req_tree, hf_mysql_binlog_flags, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; proto_tree_add_item(req_tree, hf_mysql_binlog_server_id, tvb, offset, 4, ENC_LITTLE_ENDIAN); |