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

MXS-2196: Pass Listener into dcb_accept

Browse Source 
Modified the functions to use a listener instead of a DCB in the accepting
process. This removes some of the dependenices that the listeners have on
the DCB system.
This commit is contained in:
Markus Mäkelä
2018-11-30 12:56:18 +02:00
parent 9c679edea6
commit ccc91df0c7
8 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/protocol/CDC/cdc.cc
View File

@ -285,7 +285,7 @@ static int cdc_accept(DCB* listener)
int n_connect = 0;
DCB* client_dcb;
while ((client_dcb = dcb_accept(listener)) != NULL)
while ((client_dcb = dcb_accept(listener->listener)) != NULL)
{
CDC_session* client_data = NULL;
CDC_protocol* protocol = NULL;

2
server/modules/protocol/HTTPD/httpd.cc
View File

@ -363,7 +363,7 @@ static int httpd_accept(DCB* listener)
int n_connect = 0;
DCB* client_dcb;
while ((client_dcb = dcb_accept(listener)) != NULL)
while ((client_dcb = dcb_accept(listener->listener)) != NULL)
{
HTTPD_session* client_data = NULL;

2
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1397,7 +1397,7 @@ int gw_MySQLAccept(DCB* listener)
{
DCB* client_dcb;
while ((client_dcb = dcb_accept(listener)) != NULL)
while ((client_dcb = dcb_accept(listener->listener)) != NULL)
{
gw_process_one_new_client(client_dcb);
} /**< while client_dcb != NULL */

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

@ -352,7 +352,7 @@ static int maxscaled_accept(DCB* listener)
socklen_t len = sizeof(struct ucred);
struct ucred ucred;
while ((client_dcb = dcb_accept(listener)) != NULL)
while ((client_dcb = dcb_accept(listener->listener)) != NULL)
{
MAXSCALED* maxscaled_protocol = (MAXSCALED*)calloc(1, sizeof(MAXSCALED));

2
server/modules/protocol/telnetd/telnetd.cc
View File

@ -281,7 +281,7 @@ static int telnetd_accept(DCB* listener)
int n_connect = 0;
DCB* client_dcb;
while ((client_dcb = dcb_accept(listener)) != NULL)
while ((client_dcb = dcb_accept(listener->listener)) != NULL)
{
TELNETD* telnetd_protocol = NULL;