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

MXS-2196: Remove listen entry point from protocol

Browse Source 
The entry point was useless as all of the modules called the same
function.
This commit is contained in:
Markus Mäkelä
2018-11-30 11:32:05 +02:00
parent ae3763da92
commit a6063b5e85
11 changed files with 21 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/modules/protocol/maxscaled/maxscaled.cc
View File

@ -63,7 +63,6 @@ static int maxscaled_error(DCB* dcb);
static int maxscaled_hangup(DCB* dcb);
static int maxscaled_accept(DCB* dcb);
static int maxscaled_close(DCB* dcb);
static int maxscaled_listen(DCB* dcb, char* config);
static char* mxsd_default_auth();
static bool authenticate_unix_socket(MAXSCALED* protocol, DCB* dcb)
@ -181,7 +180,6 @@ extern "C"
maxscaled_accept, /**< Accept */
NULL, /**< Connect */
maxscaled_close, /**< Close */
maxscaled_listen, /**< Create a listener */
NULL, /**< Authentication */
mxsd_default_auth, /**< Default authenticator */
NULL, /**< Connection limit reached */
@ -417,27 +415,3 @@ static int maxscaled_close(DCB* dcb)
return 0;
}
/**
* Maxscale daemon listener entry point
*
* @param listener The Listener DCB
* @param config Configuration (ip:port)
* @return 0 on failure, 1 on success
*/
static int maxscaled_listen(DCB* listener, char* config)
{
const char* socket_path = NULL;
/* check for default UNIX socket */
if (strncmp(config, MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG, MAXADMIN_CONFIG_DEFAULT_SOCKET_TAG_LEN) == 0)
{
socket_path = MAXADMIN_DEFAULT_SOCKET;
}
else
{
socket_path = config;
}
return (dcb_listen(listener, socket_path, "MaxScale Admin") < 0) ? 0 : 1;
}