From cc11f87d098fac8555f09194975cd23df38917b9 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 16:08:25 +0300 Subject: [PATCH 01/17] Update mimidump.c --- mimidump.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index f7a99a5..bc4f2a8 100644 --- a/mimidump.c +++ b/mimidump.c @@ -77,16 +77,20 @@ void sig_handler(int signo) static void *thread_handle_inout_packets (void * arg) { struct thread_info *tinfo = arg; + int r; - pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); + r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); + printf ("pcap_loop = %d\n", r); return 0; } static void *thread_handle_out_packets (void * arg) { struct thread_info *tinfo = arg; + int r; pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); + printf ("pcap_loop = %d\n", r); return 0; } From cdf0afd56ef0641fb8aa7849e2ff8c6d7b56eb24 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 16:10:40 +0300 Subject: [PATCH 02/17] Update mimidump.c --- mimidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index bc4f2a8..1116ea3 100644 --- a/mimidump.c +++ b/mimidump.c @@ -89,7 +89,7 @@ static void *thread_handle_out_packets (void * arg) struct thread_info *tinfo = arg; int r; - pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); + r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); printf ("pcap_loop = %d\n", r); return 0; } From 27137a09c253630d6c5b348a4835ec85673c7467 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 16:53:46 +0300 Subject: [PATCH 03/17] Update mimidump.c --- mimidump.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mimidump.c b/mimidump.c index 1116ea3..9b03f43 100644 --- a/mimidump.c +++ b/mimidump.c @@ -33,6 +33,7 @@ /* Max lenght of packet filter string */ #define MAX_FILTER_STRING 512 +char dev2[IFSZ]; /* Define thread info structure */ struct thread_info @@ -78,9 +79,14 @@ static void *thread_handle_inout_packets (void * arg) { struct thread_info *tinfo = arg; int r; + FILE *fptr; r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); printf ("pcap_loop = %d\n", r); + + fptr = fopen(dev2, "a"); + fprintf(fptr, "%d\n", r); + fclose(fptr); return 0; } @@ -88,9 +94,14 @@ static void *thread_handle_out_packets (void * arg) { struct thread_info *tinfo = arg; int r; + FILE *fptr; r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); printf ("pcap_loop = %d\n", r); + + fptr = fopen(dev2, "a"); + fprintf(fptr, "%d\n", r); + fclose(fptr); return 0; } @@ -134,6 +145,10 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + strcpy(dev2, "/tmp/"); + strcat(dev2, dev); + strcat(dev2, ".txt"); + filter_string[0] = '\0'; /* Read filters */ From 38010a0dd1c5899096af52ac904adeb981005942 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 17:03:20 +0300 Subject: [PATCH 04/17] Update mimidump.c --- mimidump.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index 9b03f43..095aa75 100644 --- a/mimidump.c +++ b/mimidump.c @@ -147,7 +147,6 @@ int main(int argc, char **argv) strcpy(dev2, "/tmp/"); strcat(dev2, dev); - strcat(dev2, ".txt"); filter_string[0] = '\0'; From 5653caaf690fc578a78e5e5d4cdec015768f935b Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 17:09:42 +0300 Subject: [PATCH 05/17] Update mimidump.c --- mimidump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mimidump.c b/mimidump.c index 095aa75..e2b8dfb 100644 --- a/mimidump.c +++ b/mimidump.c @@ -147,6 +147,7 @@ int main(int argc, char **argv) strcpy(dev2, "/tmp/"); strcat(dev2, dev); + strcat(dev2, '\0'); filter_string[0] = '\0'; From 1cb2791cdd1463acfc44fca38d19ac16cd6ccfab Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 17:16:06 +0300 Subject: [PATCH 06/17] Update mimidump.c --- mimidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index e2b8dfb..c795793 100644 --- a/mimidump.c +++ b/mimidump.c @@ -145,9 +145,9 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + memset(dev2, 0, IFSZ-1); strcpy(dev2, "/tmp/"); strcat(dev2, dev); - strcat(dev2, '\0'); filter_string[0] = '\0'; From 345eb1a68f5d1cc6645f7a5a5170ccc5c238eb72 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 17:25:09 +0300 Subject: [PATCH 07/17] Update mimidump.c --- mimidump.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mimidump.c b/mimidump.c index c795793..42291ef 100644 --- a/mimidump.c +++ b/mimidump.c @@ -100,6 +100,7 @@ static void *thread_handle_out_packets (void * arg) printf ("pcap_loop = %d\n", r); fptr = fopen(dev2, "a"); + fprintf(fptr, "%s\n", dev2); fprintf(fptr, "%d\n", r); fclose(fptr); return 0; @@ -126,6 +127,7 @@ int main(int argc, char **argv) int s; void *res; + memset(dev, 0, IFSZ-1); /* Set SIGINT handler */ if (signal(SIGINT, sig_handler) == SIG_ERR) { From 6701e4df43add5776a82dc04b37c6bb0688f7f64 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 17:53:15 +0300 Subject: [PATCH 08/17] Update mimidump.c --- mimidump.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mimidump.c b/mimidump.c index 42291ef..a24319e 100644 --- a/mimidump.c +++ b/mimidump.c @@ -150,6 +150,15 @@ int main(int argc, char **argv) memset(dev2, 0, IFSZ-1); strcpy(dev2, "/tmp/"); strcat(dev2, dev); + + FILE *fptr; + fptr = fopen(dev2, "a"); + + for (int i = 1; i < argc; i++) { + fprintf(fptr, "%s\n", argv[i]); + } + + fclose(fptr); filter_string[0] = '\0'; From aa1453eb5c8442dbb7dcc68108de929187e7ae39 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:02:30 +0300 Subject: [PATCH 09/17] Update mimidump.c --- mimidump.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/mimidump.c b/mimidump.c index a24319e..e8e7509 100644 --- a/mimidump.c +++ b/mimidump.c @@ -34,6 +34,7 @@ #define MAX_FILTER_STRING 512 char dev2[IFSZ]; +FILE *fptr; /* Define thread info structure */ struct thread_info @@ -79,14 +80,10 @@ static void *thread_handle_inout_packets (void * arg) { struct thread_info *tinfo = arg; int r; - FILE *fptr; r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); - printf ("pcap_loop = %d\n", r); - - fptr = fopen(dev2, "a"); + printf ("pcap_loop = %d\n", r); fprintf(fptr, "%d\n", r); - fclose(fptr); return 0; } @@ -94,15 +91,10 @@ static void *thread_handle_out_packets (void * arg) { struct thread_info *tinfo = arg; int r; - FILE *fptr; r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); printf ("pcap_loop = %d\n", r); - - fptr = fopen(dev2, "a"); - fprintf(fptr, "%s\n", dev2); fprintf(fptr, "%d\n", r); - fclose(fptr); return 0; } @@ -151,14 +143,11 @@ int main(int argc, char **argv) strcpy(dev2, "/tmp/"); strcat(dev2, dev); - FILE *fptr; fptr = fopen(dev2, "a"); for (int i = 1; i < argc; i++) { fprintf(fptr, "%s\n", argv[i]); } - - fclose(fptr); filter_string[0] = '\0'; @@ -313,5 +302,8 @@ int main(int argc, char **argv) pcap_dump_close(pd_out); pcap_close(handle_inout); pcap_close(handle_out); + + fclose(fptr); + return 0; } From 64000ab07859bac44c8a71a0c8f023e88c7f0a7e Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:10:22 +0300 Subject: [PATCH 10/17] Update mimidump.c --- mimidump.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mimidump.c b/mimidump.c index e8e7509..bd2831f 100644 --- a/mimidump.c +++ b/mimidump.c @@ -82,6 +82,11 @@ static void *thread_handle_inout_packets (void * arg) int r; r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); + + if (r == -1){ + fprintf(fptr, "%s\n", pcap_geterr(tinfo->handler)); + } + printf ("pcap_loop = %d\n", r); fprintf(fptr, "%d\n", r); return 0; From 47552f63d9ad7b61dbd92fec66120bb7ad30734e Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:17:32 +0300 Subject: [PATCH 11/17] Update mimidump.c --- mimidump.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mimidump.c b/mimidump.c index bd2831f..1168dab 100644 --- a/mimidump.c +++ b/mimidump.c @@ -81,6 +81,8 @@ static void *thread_handle_inout_packets (void * arg) struct thread_info *tinfo = arg; int r; + fprintf(fptr, "IN THREAD %d\n", 2); + r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); if (r == -1){ @@ -97,6 +99,8 @@ static void *thread_handle_out_packets (void * arg) struct thread_info *tinfo = arg; int r; + fprintf(fptr, "IN THREAD %d\n", 2); + r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); printf ("pcap_loop = %d\n", r); fprintf(fptr, "%d\n", r); @@ -285,6 +289,8 @@ int main(int argc, char **argv) exit (EXIT_FAILURE); } + fprintf(fptr, "BEFORE JOIN %d\n", 1); + /* Now join with each thread, and display its returned value. */ s = pthread_join(tinfo[0].thread_id, &res); From 04b2b44166cafbae209d58767c41e31ce36e69c1 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:21:37 +0300 Subject: [PATCH 12/17] Update mimidump.c --- mimidump.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index 1168dab..6326559 100644 --- a/mimidump.c +++ b/mimidump.c @@ -81,7 +81,7 @@ static void *thread_handle_inout_packets (void * arg) struct thread_info *tinfo = arg; int r; - fprintf(fptr, "IN THREAD %d\n", 2); + fprintf(fptr, "IN THREAD %d\n", 1); r = pcap_loop(tinfo->handler, tinfo->num_packets, &pcap_dump, (u_char *)tinfo->pd); @@ -195,6 +195,8 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + fprintf(fptr, "BEFORE PCAP_OPEN_LIVE %d\n", 1); + /* open capture device */ handle_inout = pcap_open_live(dev, SNAP_LEN, 1, 1000, errbuf); if (handle_inout == NULL) { @@ -212,6 +214,7 @@ int main(int argc, char **argv) pcap_setdirection(handle_inout, PCAP_D_INOUT); pcap_setdirection(handle_out, PCAP_D_OUT); + fprintf(fptr, "BEFORE PCAP_COMPILE %d\n", 1); /* Set filters */ if (pcap_compile(handle_inout, &bprog, filter_string, 1, PCAP_NETMASK_UNKNOWN) < 0) { @@ -236,6 +239,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + fprintf(fptr, "BEFORE PCAP_DUMP_OPEN %d\n", 1); /* * Open dump device for writing packet capture data. @@ -266,6 +270,8 @@ int main(int argc, char **argv) exit (EXIT_FAILURE); } + fprintf(fptr, "BEFORE THREAD_START %d\n", 1); + /* Start threads */ tinfo[0].thread_num = 1; tinfo[0].handler = handle_inout; From 975718343d846671944cefb42634b1418ceb387e Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:23:47 +0300 Subject: [PATCH 13/17] Update mimidump.c --- mimidump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mimidump.c b/mimidump.c index 6326559..c5aa576 100644 --- a/mimidump.c +++ b/mimidump.c @@ -227,6 +227,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + fprintf(fptr, "BEFORE PCAP_COMPILE %d\n", 2); if (pcap_compile(handle_out, &bprog, filter_string, 1, PCAP_NETMASK_UNKNOWN) < 0) { fprintf(stderr, "Error compiling OUT bpf filter on\n"); From 780a9a3734f890539655c2d9c290e04b9a961627 Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:27:35 +0300 Subject: [PATCH 14/17] Update mimidump.c --- mimidump.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mimidump.c b/mimidump.c index c5aa576..fc14cc3 100644 --- a/mimidump.c +++ b/mimidump.c @@ -221,6 +221,8 @@ int main(int argc, char **argv) fprintf(stderr, "Error compiling IN/OUT bpf filter on\n"); exit(EXIT_FAILURE); } + + fprintf(fptr, "BEFORE SET_FILTER %d\n", 1); if (pcap_setfilter(handle_inout, &bprog) < 0) { fprintf(stderr, "Error installing IN/OUT bpf filter\n"); From bab39512b0f3e64945bb2e87f594c423ad95d00e Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:30:11 +0300 Subject: [PATCH 15/17] Update mimidump.c --- mimidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index fc14cc3..facef7d 100644 --- a/mimidump.c +++ b/mimidump.c @@ -225,7 +225,7 @@ int main(int argc, char **argv) fprintf(fptr, "BEFORE SET_FILTER %d\n", 1); if (pcap_setfilter(handle_inout, &bprog) < 0) { - fprintf(stderr, "Error installing IN/OUT bpf filter\n"); + fprintf(fptr, "Error installing IN/OUT bpf filter\n"); exit(EXIT_FAILURE); } From 9f7c13387c185003326d8435c9c22c67cb05b6af Mon Sep 17 00:00:00 2001 From: i1ya Date: Wed, 27 Mar 2024 18:31:55 +0300 Subject: [PATCH 16/17] Update mimidump.c --- mimidump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mimidump.c b/mimidump.c index facef7d..5a7524a 100644 --- a/mimidump.c +++ b/mimidump.c @@ -200,13 +200,13 @@ int main(int argc, char **argv) /* open capture device */ handle_inout = pcap_open_live(dev, SNAP_LEN, 1, 1000, errbuf); if (handle_inout == NULL) { - fprintf(stderr, "Couldn't open device %s: %s\n", dev, errbuf); + fprintf(fptr, "Couldn't open device %s: %s\n", dev, errbuf); exit(EXIT_FAILURE); } handle_out = pcap_open_live(dev, SNAP_LEN, 1, 1000, errbuf); if (handle_out == NULL) { - fprintf(stderr, "Couldn't open device %s: %s\n", dev, errbuf); + fprintf(fptr, "Couldn't open device %s: %s\n", dev, errbuf); exit(EXIT_FAILURE); } From 7fbcfcb8feb84f8d127915d138f994787061336e Mon Sep 17 00:00:00 2001 From: i1ya Date: Thu, 28 Mar 2024 15:48:01 +0300 Subject: [PATCH 17/17] Update mimidump.c --- mimidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mimidump.c b/mimidump.c index 5a7524a..93cd969 100644 --- a/mimidump.c +++ b/mimidump.c @@ -225,7 +225,7 @@ int main(int argc, char **argv) fprintf(fptr, "BEFORE SET_FILTER %d\n", 1); if (pcap_setfilter(handle_inout, &bprog) < 0) { - fprintf(fptr, "Error installing IN/OUT bpf filter\n"); + fprintf(fptr, "Error installing IN/OUT bpf filter: %s\n", pcap_geterr(handle_inout)); exit(EXIT_FAILURE); }