MySQL: is_ssl -> is_tls rename
Change-Id: I9782334ce8f16996f31d932d40b569228f7aa4a3 Reviewed-on: https://code.wireshark.org/review/30472 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
parent
dde5c53446
commit
24370eae41
|
@ -2247,7 +2247,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
|
||||||
conversation_t *conversation;
|
conversation_t *conversation;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
guint packet_number;
|
guint packet_number;
|
||||||
gboolean is_response, is_ssl = FALSE;
|
gboolean is_response, is_tls = FALSE;
|
||||||
mysql_conn_data_t *conn_data;
|
mysql_conn_data_t *conn_data;
|
||||||
#ifdef CTDEBUG
|
#ifdef CTDEBUG
|
||||||
mysql_state_t conn_state_in, conn_state_out, frame_state;
|
mysql_state_t conn_state_in, conn_state_out, frame_state;
|
||||||
|
@ -2334,7 +2334,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
is_ssl = proto_is_frame_protocol(pinfo->layers, "tls");
|
is_tls = proto_is_frame_protocol(pinfo->layers, "tls");
|
||||||
|
|
||||||
if (is_response) {
|
if (is_response) {
|
||||||
if (packet_number == 0 && mysql_frame_data_p->state == UNDEFINED) {
|
if (packet_number == 0 && mysql_frame_data_p->state == UNDEFINED) {
|
||||||
|
@ -2345,7 +2345,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
|
||||||
offset = mysql_dissect_response(tvb, pinfo, offset, mysql_tree, conn_data, mysql_frame_data_p->state);
|
offset = mysql_dissect_response(tvb, pinfo, offset, mysql_tree, conn_data, mysql_frame_data_p->state);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (mysql_frame_data_p->state == LOGIN && (packet_number == 1 || (packet_number == 2 && is_ssl))) {
|
if (mysql_frame_data_p->state == LOGIN && (packet_number == 1 || (packet_number == 2 && is_tls))) {
|
||||||
col_set_str(pinfo->cinfo, COL_INFO, "Login Request");
|
col_set_str(pinfo->cinfo, COL_INFO, "Login Request");
|
||||||
offset = mysql_dissect_login(tvb, pinfo, offset, mysql_tree, conn_data);
|
offset = mysql_dissect_login(tvb, pinfo, offset, mysql_tree, conn_data);
|
||||||
if (conn_data->srv_caps & MYSQL_CAPS_CP) {
|
if (conn_data->srv_caps & MYSQL_CAPS_CP) {
|
||||||
|
|
Loading…
Reference in New Issue