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

Rename MYSQL_GET_PACKET_LEN to MYSQL_GET_PAYLOAD_LEN

Browse Source 
The function returns the length of the payload, not the length of
the entire packet.
This commit is contained in:
Johan Wikman
2017-01-12 14:24:14 +02:00
parent 77aff88ed7
commit 2fa12f796b
12 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/routing/schemarouter/schemarouter.c
View File

@ -1792,7 +1792,7 @@ static int routeQuery(ROUTER* instance,
uint8_t* packet = GWBUF_DATA(querybuf);
unsigned char ptype = packet[4];
size_t len = MXS_MIN(GWBUF_LENGTH(querybuf),
MYSQL_GET_PACKET_LEN((unsigned char *)querybuf->start) - 1);
MYSQL_GET_PAYLOAD_LEN((unsigned char *)querybuf->start) - 1);
char* data = (char*)&packet[5];
char* contentstr = strndup(data, len);
char* qtypestr = qc_typemask_to_string(qtype);
@ -2403,8 +2403,8 @@ static void clientReply(ROUTER* instance,
{
uint8_t* buf = (uint8_t *) GWBUF_DATA((scur->scmd_cur_cmd->my_sescmd_buf));
uint8_t* replybuf = (uint8_t *) GWBUF_DATA(writebuf);
size_t len = MYSQL_GET_PACKET_LEN(buf);
size_t replylen = MYSQL_GET_PACKET_LEN(replybuf);
size_t len = MYSQL_GET_PAYLOAD_LEN(buf);
size_t replylen = MYSQL_GET_PAYLOAD_LEN(replybuf);
char* cmdstr = strndup(&((char *) buf)[5], len - 4);
char* err = strndup(&((char *) replybuf)[8], 5);
char* replystr = strndup(&((char *) replybuf)[13],