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

MXS-2196: Take Listener into use

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-30 11:43:33 +02:00
parent 330719c8f9
commit a10b6c2e89
16 changed files with 93 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/ssl.cc
View File

@ -54,7 +54,7 @@ int ssl_authenticate_client(DCB* dcb, bool is_capable)
const char* remote = dcb->remote ? dcb->remote : "";
const char* service = (dcb->service && dcb->service->name) ? dcb->service->name : "";
if (NULL == dcb->listener || NULL == dcb->listener->ssl)
if (NULL == dcb->listener || NULL == dcb->listener->ssl())
{
/* Not an SSL connection on account of listener configuration */
return SSL_AUTH_CHECKS_OK;
@ -134,7 +134,7 @@ bool ssl_is_connection_healthy(DCB* dcb)
* more to be done.
*/
return NULL == dcb->listener
|| NULL == dcb->listener->ssl
|| NULL == dcb->listener->ssl()
|| dcb->ssl_state == SSL_ESTABLISHED;
}
@ -171,7 +171,7 @@ bool ssl_check_data_to_process(DCB* dcb)
*/
bool ssl_required_by_dcb(DCB* dcb)
{
return NULL != dcb->listener && NULL != dcb->listener->ssl;
return NULL != dcb->listener && NULL != dcb->listener->ssl();
}
/**
@ -187,7 +187,7 @@ bool ssl_required_by_dcb(DCB* dcb)
bool ssl_required_but_not_negotiated(DCB* dcb)
{
return NULL != dcb->listener
&& NULL != dcb->listener->ssl
&& NULL != dcb->listener->ssl()
&& SSL_HANDSHAKE_UNKNOWN == dcb->ssl_state;
}