Preston_PLB
/
sngrep
forked from Mirrors/sngrep
1
0
Fork 0
Code Pull Requests Activity

capture: fix crash while saving offline capture

This commit is contained in:
Kaian 2017-09-17 10:40:33 +02:00
parent 5a06bb581b
commit a3b24b6e19
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/capture.c
View File

@ -800,6 +800,8 @@ capture_launch_thread(capture_info_t *capinfo)
// Start all captures threads
vector_iter_t it = vector_iterator(capture_cfg.sources);
while ((capinfo = vector_iterator_next(&it))) {
// Mark capture as running
capinfo->running = true;
if (pthread_create(&capinfo->capture_t, &attr, (void *) capture_thread, capinfo)) {
return 1;
}
@ -817,7 +819,7 @@ capture_thread(void *info)
// Parse available packets
pcap_loop(capinfo->handle, -1, parse_packet, (u_char *) capinfo);
pcap_close(capinfo->handle);
capinfo->handle = NULL;
capinfo->running = false;
}
int
@ -838,7 +840,7 @@ capture_is_running()
capture_info_t *capinfo;
vector_iter_t it = vector_iterator(capture_cfg.sources);
while ((capinfo = vector_iterator_next(&it))) {
if (capinfo->handle)
if (capinfo->running)
return 1;
}
return 0;

2
src/capture.h
View File

@ -147,6 +147,8 @@ struct capture_config {
*/
struct capture_info
{
//! Flag to determine if capture is running
bool running;
//! libpcap link type
int link;
//! libpcap link header size