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

Rename GWPROTOCOL to MXS_PROTOCOL

Browse Source
This commit is contained in:
Johan Wikman
2017-01-05 10:28:24 +02:00
parent 19ce28a43a
commit 2abe956056
12 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/authenticator.c
View File

@ -92,7 +92,7 @@ bool authenticator_init(void** dest, const char *authenticator, const char *opti
const char* get_default_authenticator(const char *protocol)
{
char *rval = NULL;
GWPROTOCOL *protofuncs = (GWPROTOCOL*)load_module(protocol, MODULE_PROTOCOL);
MXS_PROTOCOL *protofuncs = (MXS_PROTOCOL*)load_module(protocol, MODULE_PROTOCOL);
if (protofuncs && protofuncs->auth_default)
{

10
server/core/dcb.c
View File

@ -637,7 +637,7 @@ DCB *
dcb_connect(SERVER *server, SESSION *session, const char *protocol)
{
DCB *dcb;
GWPROTOCOL *funcs;
MXS_PROTOCOL *funcs;
int fd;
int rc;
const char *user;
@ -679,7 +679,7 @@ dcb_connect(SERVER *server, SESSION *session, const char *protocol)
return NULL;
}
if ((funcs = (GWPROTOCOL *)load_module(protocol,
if ((funcs = (MXS_PROTOCOL *)load_module(protocol,
MODULE_PROTOCOL)) == NULL)
{
dcb->state = DCB_STATE_DISCONNECTED;
@ -689,7 +689,7 @@ dcb_connect(SERVER *server, SESSION *session, const char *protocol)
dcb);
return NULL;
}
memcpy(&(dcb->func), funcs, sizeof(GWPROTOCOL));
memcpy(&(dcb->func), funcs, sizeof(MXS_PROTOCOL));
dcb->protoname = MXS_STRDUP_A(protocol);
const char *authenticator = server->authenticator ?
@ -2915,7 +2915,7 @@ DCB *
dcb_accept(DCB *listener)
{
DCB *client_dcb = NULL;
GWPROTOCOL *protocol_funcs = &listener->func;
MXS_PROTOCOL *protocol_funcs = &listener->func;
int c_sock;
int sendbuf;
struct sockaddr_storage client_conn;
@ -2987,7 +2987,7 @@ dcb_accept(DCB *listener)
INET_ADDRSTRLEN);
}
}
memcpy(&client_dcb->func, protocol_funcs, sizeof(GWPROTOCOL));
memcpy(&client_dcb->func, protocol_funcs, sizeof(MXS_PROTOCOL));
if (listener->listener->authenticator)
{
authenticator_name = listener->listener->authenticator;

6
server/core/service.c
View File

@ -237,7 +237,7 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
size_t config_bind_len =
(port->address ? strlen(port->address) : ANY_IPV4_ADDRESS_LEN) + 1 + UINTLEN(port->port);
char config_bind[config_bind_len + 1]; // +1 for NULL
GWPROTOCOL *funcs;
MXS_PROTOCOL *funcs;
if (service == NULL || service->router == NULL || service->router_instance == NULL)
{
@ -264,7 +264,7 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
listener_init_SSL(port->ssl);
}
if ((funcs = (GWPROTOCOL *)load_module(port->protocol, MODULE_PROTOCOL)) == NULL)
if ((funcs = (MXS_PROTOCOL *)load_module(port->protocol, MODULE_PROTOCOL)) == NULL)
{
MXS_ERROR("Unable to load protocol module %s. Listener for service %s not started.",
port->protocol, service->name);
@ -272,7 +272,7 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
return 0;
}
memcpy(&(port->listener->func), funcs, sizeof(GWPROTOCOL));
memcpy(&(port->listener->func), funcs, sizeof(MXS_PROTOCOL));
const char *authenticator_name = "NullAuthDeny";