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

Added missing command types that possibly receive multiple packets to tee.c.

Browse Source
This commit is contained in:
Markus Makela
2015-01-13 22:10:47 +02:00
parent b4c01cf956
commit df2297aa6c
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/filter/tee.c
View File

@ -162,6 +162,7 @@ typedef struct {
int active; /* filter is active? */ int active; /* filter is active? */
bool use_ok; bool use_ok;
bool multipacket; bool multipacket;
unsigned char command;
bool waiting[2]; /* if the client is waiting for a reply */ bool waiting[2]; /* if the client is waiting for a reply */
int eof[2]; int eof[2];
int replies[2]; /* Number of queries received */ int replies[2]; /* Number of queries received */
@ -803,10 +804,24 @@ unsigned char command = *((unsigned char*)queue->start + 4);
ss_dassert(my_session->tee_replybuf == NULL); ss_dassert(my_session->tee_replybuf == NULL);
switch(command)
{
case 0x03:
case 0x16:
case 0x17:
case 0x04:
case 0x0a:
my_session->multipacket = true;
break;
default:
my_session->multipacket = false;
break;
}
memset(my_session->replies,0,2*sizeof(int)); memset(my_session->replies,0,2*sizeof(int));
memset(my_session->eof,0,2*sizeof(int)); memset(my_session->eof,0,2*sizeof(int));
memset(my_session->waiting,1,2*sizeof(bool)); memset(my_session->waiting,1,2*sizeof(bool));
my_session->multipacket = command == 0x03 || command == 0x16 || command == 0x17; my_session->command = command;
rval = my_session->down.routeQuery(my_session->down.instance, rval = my_session->down.routeQuery(my_session->down.instance,
my_session->down.session, my_session->down.session,
queue); queue);
@ -892,8 +907,9 @@ clientReply (FILTER* instance, void *session, GWBUF *reply)
{ {
eof = modutil_count_signal_packets(reply,my_session->use_ok,my_session->eof[branch] > 0); eof = modutil_count_signal_packets(reply,my_session->use_ok,my_session->eof[branch] > 0);
my_session->eof[branch] += eof;
if((my_session->eof[branch] += eof) >= 2) if(my_session->eof[branch] >= 2 ||
(my_session->command == 0x04 && my_session->eof[branch] > 0))
{ {
ss_dassert(my_session->eof[branch] < 3) ss_dassert(my_session->eof[branch] < 3)
my_session->waiting[branch] = false; my_session->waiting[branch] = false;