pcap: make sure thread count is 1 if config is missing for a device.

remotes/origin/HEAD
Victor Julien 13 years ago
parent bc6cf43840
commit c0ac64e58c

@ -685,7 +685,6 @@ void FlowForceReassemblySetup(void)
stream_pseudo_pkt_detect_TV = NULL;
}
SCMutexLock(&tv_root_lock);
ThreadVars *tv = tv_root[TVT_PPT];
int done = 0;

@ -102,6 +102,7 @@ void *ParsePcapConfig(const char *iface)
return NULL;
}
memset(aconf, 0x00, sizeof(*aconf));
strlcpy(aconf->iface, iface, sizeof(aconf->iface));
aconf->buffer_size = 0;
@ -120,6 +121,7 @@ void *ParsePcapConfig(const char *iface)
SC_ATOMIC_INIT(aconf->ref);
SC_ATOMIC_ADD(aconf->ref, 1);
aconf->DerefFunc = PcapDerefConfig;
aconf->threads = 1;
/* Find initial node */
pcap_node = ConfGetNode("pcap");

Loading…
Cancel
Save