summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2022-05-11 08:13:38 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2022-05-12 07:51:56 +0200
commitcb01e5b2a190c21937bf8c87ad485d768f10a7ed (patch)
tree354b2ee75d282070e4390ab907117086e14fce51
parenttcpdump: Use rtems_task_exit() (diff)
downloadrtems-libbsd-cb01e5b2a190c21937bf8c87ad485d768f10a7ed.tar.bz2
tcpdump: Close pcap dumper at program exit
Update #4649.
-rw-r--r--freebsd/contrib/tcpdump/tcpdump.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/freebsd/contrib/tcpdump/tcpdump.c b/freebsd/contrib/tcpdump/tcpdump.c
index 0438dd37..a02fa184 100644
--- a/freebsd/contrib/tcpdump/tcpdump.c
+++ b/freebsd/contrib/tcpdump/tcpdump.c
@@ -1269,6 +1269,13 @@ pcap_loop_wrapper(pcap_t *pd, int cnt, pcap_handler cb, u_char *ud)
}
#define pcap_loop(pd, cnt, cb, ud) pcap_loop_wrapper(pd, cnt, cb, ud)
+
+static void
+destroy_pcap_dumper(void *arg)
+{
+
+ pcap_dump_close(arg);
+}
#endif /* __rtems__ */
int
#ifndef __rtems__
@@ -2125,6 +2132,12 @@ main(int argc, char **argv)
if (Uflag)
pcap_dump_flush(p);
#endif
+#ifdef __rtems__
+ if (rtems_bsd_program_add_destructor(destroy_pcap_dumper, p) ==
+ NULL) {
+ error("cannot add destructor");
+ }
+#endif /* __rtems__ */
} else {
dlt = pcap_datalink(pd);
ndo->ndo_if_printer = get_if_printer(ndo, dlt);