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

stream: clean up pseudo packet counting

Browse Source 
Increment the counter from StreamTcpPseudoPacketCreateStreamEndPacket.
pull/1173/head
Victor Julien 11 years ago
parent 8c09648ad0
commit e4c8084a75
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -101,7 +101,7 @@ void StreamTcpReturnStreamSegments (TcpStream *);
void StreamTcpInitConfig(char); void StreamTcpInitConfig(char);
int StreamTcpGetFlowState(void *); int StreamTcpGetFlowState(void *);
void StreamTcpSetOSPolicy(TcpStream*, Packet*); void StreamTcpSetOSPolicy(TcpStream*, Packet*);
void StreamTcpPseudoPacketCreateStreamEndPacket(Packet *, TcpSession *, PacketQueue *); void StreamTcpPseudoPacketCreateStreamEndPacket(ThreadVars *tv, StreamTcpThread *stt, Packet *p, TcpSession *ssn, PacketQueue *pq);
static int StreamTcpValidateTimestamp(TcpSession * , Packet *); static int StreamTcpValidateTimestamp(TcpSession * , Packet *);
static int StreamTcpHandleTimestamp(TcpSession * , Packet *); static int StreamTcpHandleTimestamp(TcpSession * , Packet *);
@ -2171,8 +2171,7 @@ static int StreamTcpPacketStateEstablished(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
if (PKT_IS_TOSERVER(p)) { if (PKT_IS_TOSERVER(p)) {
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
@ -2509,8 +2508,7 @@ static int StreamTcpPacketStateFinWait1(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -2970,8 +2968,7 @@ static int StreamTcpPacketStateFinWait2(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -3281,8 +3278,7 @@ static int StreamTcpPacketStateClosing(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -3464,8 +3460,7 @@ static int StreamTcpPacketStateCloseWait(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -3759,8 +3754,7 @@ static int StreamTcpPacketStateLastAck(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -3887,8 +3881,7 @@ static int StreamTcpPacketStateTimeWait(ThreadVars *tv, Packet *p,
return -1; return -1;
/* force both streams to reassemble, if necessary */ /* force both streams to reassemble, if necessary */
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
StreamTcpPacketSetState(p, ssn, TCP_CLOSED); StreamTcpPacketSetState(p, ssn, TCP_CLOSED);
ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED; ssn->server.flags |= STREAMTCP_STREAM_FLAG_CLOSE_INITIATED;
@ -3985,7 +3978,7 @@ static int StreamTcpPacketStateTimeWait(ThreadVars *tv, Packet *p,
"%" PRIu32 "", ssn, ssn->client.next_seq, "%" PRIu32 "", ssn, ssn->client.next_seq,
ssn->server.last_ack); ssn->server.last_ack);
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
} else { } else {
SCLogDebug("ssn %p: pkt (%" PRIu32 ") is to client: SEQ " SCLogDebug("ssn %p: pkt (%" PRIu32 ") is to client: SEQ "
"%" PRIu32 ", ACK %" PRIu32 "", ssn, p->payload_len, "%" PRIu32 ", ACK %" PRIu32 "", ssn, p->payload_len,
@ -4037,7 +4030,7 @@ static int StreamTcpPacketStateTimeWait(ThreadVars *tv, Packet *p,
"%" PRIu32 "", ssn, ssn->server.next_seq, "%" PRIu32 "", ssn, ssn->server.next_seq,
ssn->client.last_ack); ssn->client.last_ack);
StreamTcpPseudoPacketCreateStreamEndPacket(p, ssn, pq); StreamTcpPseudoPacketCreateStreamEndPacket(tv, stt, p, ssn, pq);
} }
} else { } else {
@ -5480,7 +5473,7 @@ static void StreamTcpPseudoPacketSetupHeader(Packet *np, Packet *p)
* \param p real packet * \param p real packet
* \param pq packet queue to store the new pseudo packet in * \param pq packet queue to store the new pseudo packet in
*/ */
void StreamTcpPseudoPacketCreateStreamEndPacket(Packet *p, TcpSession *ssn, PacketQueue *pq) void StreamTcpPseudoPacketCreateStreamEndPacket(ThreadVars *tv, StreamTcpThread *stt, Packet *p, TcpSession *ssn, PacketQueue *pq)
{ {
SCEnter(); SCEnter();
@ -5530,6 +5523,7 @@ void StreamTcpPseudoPacketCreateStreamEndPacket(Packet *p, TcpSession *ssn, Pack
PacketEnqueue(pq, np); PacketEnqueue(pq, np);
SCPerfCounterIncr(stt->counter_tcp_pseudo, tv->sc_perf_pca);
SCReturn; SCReturn;
} }

Write Preview
Loading…
Cancel
Save