diff --git a/src/app-layer-detect-proto.c b/src/app-layer-detect-proto.c index b05ea0b0d6..2558c5daee 100644 --- a/src/app-layer-detect-proto.c +++ b/src/app-layer-detect-proto.c @@ -311,11 +311,6 @@ void AlpProtoFinalizeGlobal(AlpProtoDetectCtx *ctx) { exit(EXIT_FAILURE); #endif - /* tell the stream reassembler, that initially we only want chunks of size - min_len */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, ctx->toclient.min_len); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, ctx->toserver.min_len); - /* allocate and initialize the mapping between pattern id and signature */ ctx->map = (AlpProtoSignature **)SCMalloc(ctx->sigs * sizeof(AlpProtoSignature *)); if (ctx->map == NULL) { @@ -602,9 +597,6 @@ void *AppLayerDetectProtoThread(void *td) /* get the stream msg queue for this thread */ StreamMsgQueue *stream_q = StreamMsgQueueGetByPort(0); - /* set the minimum size we expect */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, INSPECT_BYTES); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, INSPECT_BYTES); TmThreadsSetFlag(tv, THV_INIT_DONE); diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 65771aaf27..ffe473093d 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -1736,54 +1736,28 @@ static int StreamTcpReassembleRawCheckLimit(TcpSession *ssn, TcpStream *stream, /* check if we have enough data to send to L7 */ if (p->flowflags & FLOW_PKT_TOCLIENT) { - SCLogDebug("StreamMsgQueueGetMinInitChunkLen(STREAM_TOSERVER) %"PRIu32, - StreamMsgQueueGetMinInitChunkLen(STREAM_TOSERVER)); SCLogDebug("StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER) %"PRIu32, StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER)); - if (stream->ra_raw_base_seq == stream->isn) { - if (StreamMsgQueueGetMinInitChunkLen(STREAM_TOSERVER) > - (stream->last_ack - stream->ra_raw_base_seq)) { - SCLogDebug("toserver min init chunk len not yet reached: " - "last_ack %"PRIu32", ra_raw_base_seq %"PRIu32", len " - "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, - StreamMsgQueueGetMinInitChunkLen(STREAM_TOSERVER)); - SCReturnInt(0); - } - } else { - if (StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER) > - (stream->last_ack - stream->ra_raw_base_seq)) { - SCLogDebug("toserver min chunk len not yet reached: " - "last_ack %"PRIu32", ra_raw_base_seq %"PRIu32", len " - "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, - StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER)); - SCReturnInt(0); - } + if (StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER) > + (stream->last_ack - stream->ra_raw_base_seq)) { + SCLogDebug("toserver min chunk len not yet reached: " + "last_ack %"PRIu32", ra_raw_base_seq %"PRIu32", len " + "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, + StreamMsgQueueGetMinChunkLen(STREAM_TOSERVER)); + SCReturnInt(0); } } else { - SCLogDebug("StreamMsgQueueGetMinInitChunkLen(STREAM_TOCLIENT) %"PRIu32, - StreamMsgQueueGetMinInitChunkLen(STREAM_TOCLIENT)); SCLogDebug("StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT) %"PRIu32, StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT)); - if (stream->ra_raw_base_seq == stream->isn) { - if (StreamMsgQueueGetMinInitChunkLen(STREAM_TOCLIENT) > - (stream->last_ack - stream->ra_raw_base_seq)) { - SCLogDebug("toclient min init chunk len not yet reached: " - "last_ack %"PRIu32", ra_base_seq %"PRIu32", len " - "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, - StreamMsgQueueGetMinInitChunkLen(STREAM_TOCLIENT)); - SCReturnInt(0); - } - } else { - if (StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT) > - (stream->last_ack - stream->ra_raw_base_seq)) { - SCLogDebug("toclient min chunk len not yet reached: " - "last_ack %"PRIu32", ra_base_seq %"PRIu32", len " - "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, - StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT)); - SCReturnInt(0); - } + if (StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT) > + (stream->last_ack - stream->ra_raw_base_seq)) { + SCLogDebug("toclient min chunk len not yet reached: " + "last_ack %"PRIu32", ra_base_seq %"PRIu32", len " + "%"PRIu32"", stream->last_ack, stream->ra_raw_base_seq, + StreamMsgQueueGetMinChunkLen(STREAM_TOCLIENT)); + SCReturnInt(0); } } @@ -3051,7 +3025,7 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx, { SCEnter(); SCLogDebug("start p %p", p); - +#if 0 if (PKT_IS_TOSERVER(p) && !(ssn->flags & STREAMTCP_FLAG_TOSERVER_REASSEMBLY_STARTED)) { @@ -3059,7 +3033,7 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx, "skipping reassembling at the moment for to_client"); SCReturnInt(0); } - +#endif if (stream->seg_list == NULL) { /* send an empty EOF msg if we have no segments but TCP state * is beyond ESTABLISHED */ @@ -3089,14 +3063,14 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx, " reassembling at the moment"); SCReturnInt(0); } - +#if 0 if (ssn->state <= TCP_ESTABLISHED && !(ssn->flags & STREAMTCP_FLAG_APPPROTO_DETECTION_COMPLETED)) { SCLogDebug("only starting raw reassembly after app layer protocol " "detection has completed."); SCReturnInt(0); } - +#endif /* check if we have enough data */ if (StreamTcpReassembleRawCheckLimit(ssn,stream,p) == 0) { SCLogDebug("not yet reassembling"); @@ -3670,8 +3644,6 @@ static int StreamTcpReassembleStreamTest(TcpStream *stream) { TcpReassemblyThreadCtx *ra_ctx = StreamTcpReassembleInitThreadCtx(); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); PacketQueue pq; @@ -4032,8 +4004,6 @@ static int StreamTcpTestStartsBeforeListSegment(TcpStream *stream) { TcpReassemblyThreadCtx *ra_ctx = StreamTcpReassembleInitThreadCtx(); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); PacketQueue pq; @@ -4153,8 +4123,6 @@ static int StreamTcpTestStartsAtSameListSegment(TcpStream *stream) { memset(&pq,0,sizeof(PacketQueue)); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -4271,8 +4239,6 @@ static int StreamTcpTestStartsAfterListSegment(TcpStream *stream) { memset(&pq,0,sizeof(PacketQueue)); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5243,8 +5209,6 @@ static int StreamTcpReassembleTest28 (void) { StreamMsgQueue *q = ra_ctx->stream_q; StreamTcpInitConfig(TRUE); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5605,8 +5569,6 @@ static int StreamTcpReassembleTest32(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5691,8 +5653,6 @@ static int StreamTcpReassembleTest33(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5774,8 +5734,6 @@ static int StreamTcpReassembleTest34(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5858,8 +5816,6 @@ static int StreamTcpReassembleTest35(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 10); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 10); @@ -5929,8 +5885,6 @@ static int StreamTcpReassembleTest36(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 10); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 10); @@ -6000,8 +5954,6 @@ static int StreamTcpReassembleTest37(void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 10); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 10); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 10); @@ -6105,8 +6057,6 @@ static int StreamTcpReassembleTest38 (void) { memset(&tv, 0, sizeof (ThreadVars)); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 0); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 0); @@ -6803,8 +6753,6 @@ static int StreamTcpReassembleTest41 (void) { uint8_t httpbuf2[] = "HTTP/1.0 200 OK\r\nServer: VictorServer/1.0\r\n\r\n"; uint32_t httplen2 = sizeof(httpbuf2) - 1; /* minus the \0 */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 0); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 0); @@ -7180,22 +7128,6 @@ static int StreamTcpReassembleTest43 (void) { ssn.client.last_ack = 600; f.alproto = ALPROTO_UNKNOWN; - /* Check the minimum init smsg length. It should be equal to the min length - of given signature in toserver direction. */ - if (StreamMsgQueueGetMinInitChunkLen(FLOW_PKT_TOSERVER) != 2) { - printf("the min init length should be equal to 2, not %"PRIu16": ", - StreamMsgQueueGetMinInitChunkLen(FLOW_PKT_TOSERVER)); - goto end; - } - - /* Check the minimum init smsg length. It should be equal to the min length - of given signature in toclient direction. */ - if (StreamMsgQueueGetMinInitChunkLen(FLOW_PKT_TOCLIENT) != 2) { - printf("the min init length should be equal to 2, not %"PRIu16": ", - StreamMsgQueueGetMinInitChunkLen(FLOW_PKT_TOCLIENT)); - goto end; - } - inet_pton(AF_INET, "1.2.3.4", &in); src.family = AF_INET; src.addr_data32[0] = in.s_addr; @@ -7701,8 +7633,6 @@ static int StreamTcpReassembleTest47 (void) { memset(&tv, 0, sizeof (ThreadVars)); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 0); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 0); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 0); diff --git a/src/stream-tcp.c b/src/stream-tcp.c index be535270a1..5fc4f6bc2f 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -4556,8 +4556,6 @@ static int StreamTcpTest05 (void) { StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -4722,8 +4720,6 @@ static int StreamTcpTest07 (void) { stream_config.midstream = TRUE; /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -4814,8 +4810,6 @@ static int StreamTcpTest08 (void) { stream_config.midstream = TRUE; /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -4903,8 +4897,6 @@ static int StreamTcpTest09 (void) { stream_config.midstream = TRUE; //prevent L7 from kicking in - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5490,8 +5482,6 @@ static int StreamTcpTest14 (void) { SCHInfoAddHostOSInfo(os_policy_name, ip_addr, -1); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -5890,8 +5880,6 @@ static int StreamTcpTest15 (void) { SCHInfoAddHostOSInfo(os_policy_name, ip_addr, -1); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -6062,8 +6050,6 @@ static int StreamTcpTest16 (void) { SCHInfoAddHostOSInfo(os_policy_name, ip_addr, -1); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -6235,8 +6221,6 @@ static int StreamTcpTest17 (void) { SCHInfoAddHostOSInfo(os_policy_name, ip_addr, -1); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -6643,8 +6627,6 @@ static int StreamTcpTest23(void) StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -6727,8 +6709,6 @@ static int StreamTcpTest24(void) StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -6832,8 +6812,6 @@ static int StreamTcpTest25(void) { p->flowflags = FLOW_PKT_TOSERVER; /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOSERVER, 4096); StreamMsgQueueSetMinChunkLen(FLOW_PKT_TOCLIENT, 4096); @@ -7173,8 +7151,6 @@ static int StreamTcpTest29(void) StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); ssn.client.os_policy = OS_POLICY_BSD; p.src.family = AF_INET; @@ -7319,8 +7295,6 @@ static int StreamTcpTest30(void) StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); ssn.client.os_policy = OS_POLICY_BSD; p.src.family = AF_INET; @@ -7460,8 +7434,6 @@ static int StreamTcpTest31(void) StreamTcpInitConfig(TRUE); /* prevent L7 from kicking in */ - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOSERVER, 4096); - StreamMsgQueueSetMinInitChunkLen(FLOW_PKT_TOCLIENT, 4096); ssn.client.os_policy = OS_POLICY_LINUX; p.src.family = AF_INET; diff --git a/src/stream.c b/src/stream.c index 4aff699076..89e63a1389 100644 --- a/src/stream.c +++ b/src/stream.c @@ -35,10 +35,8 @@ static uint64_t stream_pool_memuse = 0; static uint64_t stream_pool_memcnt = 0; /* per queue setting */ -static uint16_t toserver_min_init_chunk_len = 0; -static uint16_t toserver_min_chunk_len = 0; -static uint16_t toclient_min_init_chunk_len = 0; -static uint16_t toclient_min_chunk_len = 0; +static uint16_t toserver_min_chunk_len = 2560; +static uint16_t toclient_min_chunk_len = 2560; static Pool *stream_msg_pool = NULL; static SCMutex stream_msg_pool_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -191,14 +189,6 @@ StreamMsgQueue *StreamMsgQueueGetByPort(uint16_t port) { return NULL;//&stream_q; } -void StreamMsgQueueSetMinInitChunkLen(uint8_t dir, uint16_t len) { - if (dir == FLOW_PKT_TOSERVER) { - toserver_min_init_chunk_len = len; - } else { - toclient_min_init_chunk_len = len; - } -} - void StreamMsgQueueSetMinChunkLen(uint8_t dir, uint16_t len) { if (dir == FLOW_PKT_TOSERVER) { toserver_min_chunk_len = len; @@ -207,14 +197,6 @@ void StreamMsgQueueSetMinChunkLen(uint8_t dir, uint16_t len) { } } -uint16_t StreamMsgQueueGetMinInitChunkLen(uint8_t dir) { - if (dir == FLOW_PKT_TOSERVER) { - return toserver_min_init_chunk_len; - } else { - return toclient_min_init_chunk_len; - } -} - uint16_t StreamMsgQueueGetMinChunkLen(uint8_t dir) { if (dir == FLOW_PKT_TOSERVER) { return toserver_min_chunk_len; diff --git a/src/stream.h b/src/stream.h index 3e9e177a50..543e5937fd 100644 --- a/src/stream.h +++ b/src/stream.h @@ -82,9 +82,7 @@ StreamMsgQueue *StreamMsgQueueGetNew(void); void StreamMsgQueueFree(StreamMsgQueue *); StreamMsgQueue *StreamMsgQueueGetByPort(uint16_t); -void StreamMsgQueueSetMinInitChunkLen(uint8_t, uint16_t); void StreamMsgQueueSetMinChunkLen(uint8_t dir, uint16_t len); -uint16_t StreamMsgQueueGetMinInitChunkLen(uint8_t); uint16_t StreamMsgQueueGetMinChunkLen(uint8_t); void StreamMsgReturnListToPool(void *);