Fix 2 compilation issues.

remotes/origin/HEAD
Victor Julien 15 years ago
parent c0a2cbd478
commit e581ec7dff

@ -110,6 +110,8 @@ error:
int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Signature *s, SigMatch *m)
{
DetectTagData *td = (DetectTagData *) m->ctx;
DetectTagDataEntry tde;
memset(&tde, 0, sizeof(DetectTagDataEntry));
switch (td->type) {
case DETECT_TAG_TYPE_HOST:
@ -117,8 +119,6 @@ int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Si
BUG_ON(!(td->direction == DETECT_TAG_DIR_SRC || td->direction == DETECT_TAG_DIR_DST));
#endif
DetectTagDataEntry tde;
memset(&tde, 0, sizeof(DetectTagDataEntry));
tde.sid = s->id;
tde.gid = s->gid;
tde.last_ts = tde.first_ts = p->ts.tv_sec;
@ -135,8 +135,6 @@ int DetectTagMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Packet *p, Si
case DETECT_TAG_TYPE_SESSION:
if (p->flow != NULL) {
/* If it already exists it will be updated */
DetectTagDataEntry tde;
memset(&tde, 0, sizeof(DetectTagDataEntry));
tde.sid = s->id;
tde.gid = s->gid;
tde.last_ts = tde.first_ts = p->ts.tv_usec;

@ -255,8 +255,8 @@ void HostShutdown(void)
SC_ATOMIC_SUB(host_memuse, host_config.hash_size * sizeof(HostHashRow));
HostQueueDestroy(&host_spare_q);
SC_ATOMIC_DESTROY(flow_prune_idx);
SC_ATOMIC_DESTROY(flow_memuse);
SC_ATOMIC_DESTROY(host_prune_idx);
SC_ATOMIC_DESTROY(host_memuse);
//SC_ATOMIC_DESTROY(flow_flags);
return;
}

Loading…
Cancel
Save