stream: move state queue code into util func

pull/8529/head
Victor Julien 4 years ago
parent fc376f8145
commit 288086af3f

@ -204,6 +204,20 @@ void StreamTcpStreamCleanup(TcpStream *stream)
} }
} }
static void StreamTcp3wsFreeQueue(TcpSession *ssn)
{
TcpStateQueue *q, *q_next;
q = ssn->queue;
while (q != NULL) {
q_next = q->next;
SCFree(q);
q = q_next;
StreamTcpDecrMemuse((uint64_t)sizeof(TcpStateQueue));
}
ssn->queue = NULL;
ssn->queue_len = 0;
}
/** /**
* \brief Session cleanup function. Does not free the ssn. * \brief Session cleanup function. Does not free the ssn.
* \param ssn tcp session * \param ssn tcp session
@ -211,23 +225,13 @@ void StreamTcpStreamCleanup(TcpStream *stream)
void StreamTcpSessionCleanup(TcpSession *ssn) void StreamTcpSessionCleanup(TcpSession *ssn)
{ {
SCEnter(); SCEnter();
TcpStateQueue *q, *q_next;
if (ssn == NULL) if (ssn == NULL)
return; return;
StreamTcpStreamCleanup(&ssn->client); StreamTcpStreamCleanup(&ssn->client);
StreamTcpStreamCleanup(&ssn->server); StreamTcpStreamCleanup(&ssn->server);
StreamTcp3wsFreeQueue(ssn);
q = ssn->queue;
while (q != NULL) {
q_next = q->next;
SCFree(q);
q = q_next;
StreamTcpDecrMemuse((uint64_t)sizeof(TcpStateQueue));
}
ssn->queue = NULL;
ssn->queue_len = 0;
SCReturn; SCReturn;
} }

Loading…
Cancel
Save