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

Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter).

Browse Source
This commit is contained in:
counterpoint
2015-07-10 15:12:22 +01:00
parent 015cb890d4
commit 4f5de063eb
7 changed files with 52 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/protocol/mysql_client.c
View File

@ -515,7 +515,7 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF **buf) {
* is not requesting SSL and the rest of the auth packet is still
* waiting in the socket. We need to read the data from the socket
* to find out the username of the connecting client. */
int bytes = dcb_read(dcb,&queue);
int bytes = dcb_read(dcb,&queue, 0);
queue = gwbuf_make_contiguous(queue);
client_auth_packet = GWBUF_DATA(queue);
client_auth_packet_size = gwbuf_length(queue);
@ -723,12 +723,12 @@ int gw_read_client_event(
* read only enough of the auth packet to know if the client is
* requesting SSL. If the client is not requesting SSL the rest of
the auth packet will be read later. */
rc = dcb_read_n(dcb, &read_buffer,(4 + 4 + 4 + 1 + 23));
rc = dcb_read(dcb, &read_buffer,(4 + 4 + 4 + 1 + 23));
}
else
{
/** Normal non-SSL connection */
rc = dcb_read(dcb, &read_buffer);
rc = dcb_read(dcb, &read_buffer, 0);
}
if (rc < 0)