osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

MySQL: Fix COM_QUERY response dissector when CLIENT_DEPRECATE_EOF is set 

When CLIENT_DEPRECATE_EOF is set, no EOF packet between field packets and row
packets. See
https://dev.mysql.com/doc/internals/en/com-query-response.html#text-resultset
This commit is contained in:
Kaige Ye 2021-08-19 21:59:53 +08:00 committed by Wireshark GitLab Utility
parent d679564d7b
commit 487445c596
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/dissectors/packet-mysql.c
View File

@ -1201,6 +1201,7 @@ typedef struct mysql_conn_data {
gboolean is_mariadb_client; /* set to 1, if connected from a MariaDB client */
guint32 mariadb_server_ext_caps;
guint32 mariadb_client_ext_caps;
guint64 remaining_field_packet_count;
} mysql_conn_data_t;
struct mysql_frame_data {
@ -1375,6 +1376,21 @@ static void mysql_set_conn_state(packet_info *pinfo, mysql_conn_data_t *conn_dat
}
}
static guint64 mysql_get_remaining_field_packet_count(mysql_conn_data_t *conn_data)
{
return conn_data->remaining_field_packet_count;
}
static void mysql_dec_remaining_field_packet_count(mysql_conn_data_t *conn_data)
{
conn_data->remaining_field_packet_count--;
}
static void mysql_set_remaining_field_packet_count(mysql_conn_data_t *conn_data, guint64 num_fields)
{
conn_data->remaining_field_packet_count = num_fields;
}
static int
mysql_dissect_greeting(tvbuff_t *tvb, packet_info *pinfo, int offset,
proto_tree *tree, mysql_conn_data_t *conn_data)
@ -2288,6 +2304,10 @@ mysql_dissect_response(tvbuff_t *tvb, packet_info *pinfo, int offset,
case RESPONSE_PREPARE:
case PREPARED_PARAMETERS:
offset = mysql_dissect_field_packet(tvb, offset, tree, conn_data);
mysql_dec_remaining_field_packet_count(conn_data);
if ((conn_data->clnt_caps_ext & MYSQL_CAPS_DE) && (mysql_get_remaining_field_packet_count(conn_data) == 0)) {
mysql_set_conn_state(pinfo, conn_data, ROW_PACKET);
}
break;
case ROW_PACKET:
@ -2592,6 +2612,7 @@ mysql_dissect_result_header(tvbuff_t *tvb, packet_info *pinfo, int offset,
if (num_fields) {
mysql_set_conn_state(pinfo, conn_data, FIELD_PACKET);
mysql_set_remaining_field_packet_count(conn_data, num_fields);
} else {
mysql_set_conn_state(pinfo, conn_data, ROW_PACKET);
}