@@ -3,6 +3,7 @@

 #include <stdint.h>

 #include <inttypes.h>

 #include <string.h>

+#include <signal.h>

 #include <pcap.h>

 #include <time.h>

@@ -41,6 +42,31 @@ static uint64_t st_packet_num = 0;

 //~ static pcap_t *st_hdl_out_pcap = NULL;

 //~ static pcap_dumper_t *st_hdl_out_pcapdumper = NULL;

 static FILE *st_hdl_out_mypcap = NULL;

+static pcap_t *st_hdl_capture = NULL;

+

+static void handle_sigint(int signo)

+{

+	(void)signo;

+	if (st_hdl_capture != NULL) {

+		pcap_breakloop(st_hdl_capture);

+	}

+}

+

+static void close_output_files(void)

+{

+	for (inodelist_t *node = inodelist_get_head(); node != NULL; node = node->next) {

+		if (node->data.mydumper != NULL) {

+			mypcap_flush(node->data.mydumper);

+			mypcap_close(node->data.mydumper);

+			node->data.mydumper = NULL;

+		}

+	}

+	if (st_hdl_out_mypcap != NULL) {

+		mypcap_flush(st_hdl_out_mypcap);

+		mypcap_close(st_hdl_out_mypcap);

+		st_hdl_out_mypcap = NULL;

+	}

+}

 static void print_capture_progress(void)

 {

@@ -220,21 +246,31 @@ int32_t main(int argc, char **argv )

 		mask = 0;

 	}

-	pcap_t *pcap = pcap_open_live(st_device, MAX_CAPLEN, 0, 1000, errbuff);

-	if (pcap == NULL) {

+	st_hdl_capture = pcap_open_live(st_device, MAX_CAPLEN, 0, 1000, errbuff);

+	if (st_hdl_capture == NULL) {

 		fprintf(stderr, "ERROR: Cannot open %s for capture\n", st_device);

 		exit(3);

 	}

+	struct sigaction sigint_action;

+	memset(&sigint_action, 0, sizeof(sigint_action));

+	sigint_action.sa_handler = handle_sigint;

+	sigemptyset(&sigint_action.sa_mask);

+	if (sigaction(SIGINT, &sigint_action, NULL) == -1) {

+		perror("ERROR: Cannot install SIGINT handler");

+		pcap_close(st_hdl_capture);

+		return 8;

+	}

-	if (pcap_compile(pcap, &fp, st_filter, 0, net) == -1) {

-		fprintf(stderr, "ERROR: Couldn't parse filter [%s]: %s\n", st_filter, pcap_geterr(pcap));

+	if (pcap_compile(st_hdl_capture, &fp, st_filter, 0, net) == -1) {

+		fprintf(stderr, "ERROR: Couldn't parse filter [%s]: %s\n", st_filter, pcap_geterr(st_hdl_capture));

 		exit(4);

 	}

-	if (pcap_setfilter(pcap, &fp) == -1) {

-		fprintf(stderr, "ERROR: Couldn't install filter [%s]: %s\n", st_filter, pcap_geterr(pcap));

+	if (pcap_setfilter(st_hdl_capture, &fp) == -1) {

+		fprintf(stderr, "ERROR: Couldn't install filter [%s]: %s\n", st_filter, pcap_geterr(st_hdl_capture));

 		exit(5);

 	}

+	pcap_freecode(&fp);

 	//Set file output prefix

 	time_t     now;

@@ -254,7 +290,7 @@ int32_t main(int argc, char **argv )

 	st_hdl_out_mypcap=mypcap_open(complete_dump_path, "w+");

 	if (st_hdl_out_mypcap == NULL) {

 		fprintf(stderr, "ERROR: Cannot create %s\n", complete_dump_path);

-		pcap_close(pcap);

+		pcap_close(st_hdl_capture);

 		return 7;

 	}

@@ -267,18 +303,21 @@ int32_t main(int argc, char **argv )

 	printf("listening on %s, capture size %d bytes\n",st_device,MAX_CAPLEN);

 	printf("filtering on [%s]\n",st_filter);

 	printf("complete dump file : %s\n",complete_dump_path);

-	if (pcap_datalink(pcap) != DLT_EN10MB) {

+	if (pcap_datalink(st_hdl_capture) != DLT_EN10MB) {

 		fprintf(stderr, "ERROR: No Ethernet headers - not supported\n");

+		close_output_files();

+		pcap_close(st_hdl_capture);

 		exit(6);

 	} else {

 		printf("link-type EN10MB (Ethernet)\n");

 	}

-	

-	pcap_loop(pcap, 0, pcap_loop_cb, NULL );

-	pcap_loop(pcap, 100, pcap_loop_cb, NULL );

-

-	mypcap_close(st_hdl_out_mypcap);

-	pcap_close( pcap );

+	int loop_result = pcap_loop(st_hdl_capture, 0, pcap_loop_cb, NULL);

+	if (loop_result == -1) {

+		fprintf(stderr, "ERROR: Capture failed: %s\n", pcap_geterr(st_hdl_capture));

+	}

+	printf("\n");

+	close_output_files();

+	pcap_close(st_hdl_capture);

 #ifdef _DEBUG

 	printf("\n");