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

MXS-2196: Pass client DCB to MXS_PROTOCOL::accept

Browse Source 
By doing the actual accepting of the new DCB in the core, the protocol
modules can only do the actual protocol level work. This removes some of
the redundant code that was in the protocol modules.
This commit is contained in:
Markus Mäkelä
2018-12-01 20:31:48 +02:00
parent 192562d930
commit 3791fdded7
7 changed files with 122 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ static void process_finish(void);
static int thread_init(void);
static void thread_finish(void);
static int gw_MySQLAccept(const SListener& listener);
static int gw_MySQLAccept(DCB*);
static int gw_read_client_event(DCB* dcb);
static int gw_write_client_event(DCB* dcb);
static int gw_MySQLWrite_client(DCB* dcb, GWBUF* queue);
@ -1390,16 +1390,9 @@ return_1:
* @return 0 in success, 1 in failure
*
*/
int gw_MySQLAccept(const SListener& listener)
int gw_MySQLAccept(DCB* client_dcb)
{
DCB* client_dcb;
while ((client_dcb = dcb_accept(listener)) != NULL)
{
gw_process_one_new_client(client_dcb);
} /**< while client_dcb != NULL */
/* Must have broken out of while loop or received NULL client_dcb */
gw_process_one_new_client(client_dcb);
return 1;
}