aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small compilation fixes when debugging is disabled.

Browse Source
remotes/origin/master-1.0.x
Victor Julien 17 years ago
parent 6a53ab9c5a
commit 53977fded6
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File

18
src/stream-tcp-reassemble.c
Unescape Escape View File

@ -560,8 +560,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
if (new_seg == NULL) {
uint16_t idx = segment_pool_idx[packet_length];
SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
SCReturnInt(-1);
}
new_seg->payload_len = packet_length;
@ -623,8 +622,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
if (new_seg == NULL) {
uint16_t idx = segment_pool_idx[packet_length];
SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
SCReturnInt(-1);
}
@ -683,8 +681,7 @@ static int HandleSegmentStartsBeforeListSegment(TcpStream *stream,
TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
if (new_seg == NULL) {
uint16_t idx = segment_pool_idx[packet_length];
SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
SCReturnInt(-1);
}
new_seg->payload_len = packet_length;
@ -889,8 +886,7 @@ static int HandleSegmentStartsAtSameListSegment(TcpStream *stream,
TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
if (new_seg == NULL) {
uint16_t idx = segment_pool_idx[packet_length];
SCLogDebug("egment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("egment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
return -1;
}
new_seg->payload_len = packet_length;
@ -1073,8 +1069,7 @@ static int HandleSegmentStartsAfterListSegment(TcpStream *stream,
TcpSegment *new_seg = StreamTcpGetSegment(packet_length);
if (new_seg == NULL) {
uint16_t idx = segment_pool_idx[packet_length];
SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[packet_length]);
SCReturnInt(-1);
}
new_seg->payload_len = packet_length;
@ -1144,8 +1139,7 @@ int StreamTcpReassembleHandleSegmentHandleData(TcpSession *ssn,
TcpSegment *seg = StreamTcpGetSegment(p->payload_len);
if (seg == NULL) {
uint16_t idx = segment_pool_idx[p->payload_len];
SCLogDebug("segment_pool[%"PRIu16"] is empty", idx);
SCLogDebug("segment_pool[%"PRIu16"] is empty", segment_pool_idx[p->payload_len]);
SCReturnInt(-1);
}

2
src/stream-tcp.c
Unescape Escape View File

@ -340,7 +340,7 @@ void StreamTcpFreeConfig(char quiet)
SCLogError(SC_ERR_POOL_EMPTY, "ssn_pool is NULL");
exit(EXIT_FAILURE);
}
SCLogInfo("ssn_pool_cnt %"PRIu64"", ssn_pool_cnt);
SCLogDebug("ssn_pool_cnt %"PRIu64"", ssn_pool_cnt);
SCLogInfo("Max memuse of stream engine %"PRIu32" (in use %"PRIu32")", stream_memuse_max, stream_memuse);
SCMutexDestroy(&ssn_pool_mutex);

Write Preview
Loading…
Cancel
Save