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

Reverted modutil_get_complete_packets changes

Browse Source 
The changes caused the binlogrouter to malfunction.
This commit is contained in:
Markus Makela
2016-04-29 16:31:20 +03:00
parent 017f5e56dd
commit c2706bab69
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
server/core/modutil.c
View File

@ -558,54 +558,65 @@ return_packetbuf:
* @param p_readbuf Buffer to split, set to NULL if no partial packets are left * @param p_readbuf Buffer to split, set to NULL if no partial packets are left
* @return Head of the chain of complete packets, all in a single, contiguous buffer * @return Head of the chain of complete packets, all in a single, contiguous buffer
*/ */
GWBUF* modutil_get_complete_packets(GWBUF **p_readbuf) GWBUF* modutil_get_complete_packets(GWBUF** p_readbuf)
{ {
GWBUF *complete_part = NULL; GWBUF *buff = NULL, *packet;
uint8_t *ptr; uint8_t *ptr;
uint32_t len, blen, total = 0; uint32_t len,blen,total = 0;
/** Give up if the parameter is not a pointer to a pointer or
* the total buffer length is less than the 3 bytes needed to
* hold a packet length. */
if (p_readbuf == NULL || (*p_readbuf) == NULL || if (p_readbuf == NULL || (*p_readbuf) == NULL ||
(blen = gwbuf_length(*p_readbuf)) < 3) gwbuf_length(*p_readbuf) < 3)
{ {
return NULL; return NULL;
} }
*p_readbuf = gwbuf_make_contiguous(*p_readbuf); packet = gwbuf_make_contiguous(*p_readbuf);
ptr = (uint8_t*)(*p_readbuf)->start; packet->next = NULL;
*p_readbuf = packet;
ptr = (uint8_t*)packet->start;
len = gw_mysql_get_byte3(ptr) + 4;
blen = gwbuf_length(packet);
/** We need at least 3 bytes of the packet header to know how long the next if (len == blen)
* packet is going to be, if we are going to cycle round again. */ {
while (total + (len = gw_mysql_get_byte3(ptr) + 4) < (blen - 3)) *p_readbuf = NULL;
return packet;
}
else if (len > blen)
{
return NULL;
}
while (total + len < blen)
{ {
ptr += len; ptr += len;
total += len; total += len;
/** We need at least 3 bytes of the packet header to know how long the whole
* packet is going to be. */
if (total + 3 >= blen)
{
break;
}
len = gw_mysql_get_byte3(ptr) + 4;
} }
total += len; /** Full packets only, return original */
/* If total has overshot the buffer(s) return null, this is an error. */ if (total + len == blen)
if (total > blen)
{ {
return NULL;
}
/** Full packets only, return original and null the passed buffer */
if (total == blen)
{
GWBUF *packet = *p_readbuf;
*p_readbuf = NULL; *p_readbuf = NULL;
return packet; return packet;
} }
/** The next packet is a partial, split into complete and partial packets */ /** The next packet is a partial, split into complete and partial packets */
if ((complete_part = gwbuf_clone_portion(*p_readbuf, 0, total)) == NULL) if ((buff = gwbuf_clone_portion(packet, 0, total)) == NULL)
{ {
MXS_ERROR("Failed to partially clone buffer while extracting complete packets."); MXS_ERROR("Failed to partially clone buffer.");
return NULL; return NULL;
} }
*p_readbuf = gwbuf_consume(*p_readbuf, total); gwbuf_consume(packet,total);
return complete_part; return buff;
} }
/** /**