hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2196: Rename session states

Browse Source 
Minor renaming of the session state enum values. Also exposed the session
state stringification function in the public header and removed the
stringification macro.
This commit is contained in:
Markus Mäkelä
2018-12-05 14:34:45 +02:00
parent 7aaadfc550
commit 20fe9b9dca
15 changed files with 39 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/protocol/MySQL/mysql_common.cc
View File

@ -595,15 +595,15 @@ bool gw_get_shared_session_auth_info(DCB* dcb, MYSQL_session* session)
mxb_assert(dcb->data);
memcpy(session, dcb->data, sizeof(MYSQL_session));
}
else if (dcb->session->state != SESSION_STATE_ALLOC)
else if (dcb->session->state != SESSION_STATE_CREATED)
{
memcpy(session, dcb->session->client_dcb->data, sizeof(MYSQL_session));
}
else
{
mxb_assert(false);
MXS_ERROR("Couldn't get session authentication info. Session in a wrong state %s.",
STRSESSIONSTATE(dcb->session->state));
MXS_ERROR("Couldn't get session authentication info. Session in wrong state: %s.",
session_state_to_string(dcb->session->state));
rval = false;
}
@ -970,8 +970,8 @@ mxs_auth_state_t gw_send_backend_auth(DCB* dcb)
mxs_auth_state_t rval = MXS_AUTH_STATE_FAILED;
if (dcb->session == NULL
|| (dcb->session->state != SESSION_STATE_READY
&& dcb->session->state != SESSION_STATE_ROUTER_READY)
|| (dcb->session->state != SESSION_STATE_CREATED
&& dcb->session->state != SESSION_STATE_STARTED)
|| (dcb->server->server_ssl
&& dcb->ssl_state == SSL_HANDSHAKE_FAILED))
{