iwcap: fix handling kill signal during dump

[openwrt/openwrt.git] / package / network / utils / iwcap / src / iwcap.c

diff --git a/package/network/utils/iwcap/src/iwcap.c b/package/network/utils/iwcap/src/iwcap.c
index a71dca23206b668ad1b88017e3ee031f3d3adbcd..bc69550ef38dc675bdfc5e8a7790223c8c42e327 100644 (file)
--- a/package/network/utils/iwcap/src/iwcap.c
+++ b/package/network/utils/iwcap/src/iwcap.c
@@ -1,7 +1,7 @@
 /*
  * iwcap.c - A simply radiotap capture utility outputting pcap dumps
  *
- *    Copyright 2012 Jo-Philipp Wich <jow@openwrt.org>
+ *    Copyright 2012 Jo-Philipp Wich <jo@mein.io>
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 #include <signal.h>
 #include <syslog.h>
 #include <errno.h>
+#include <byteswap.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
@@ -489,19 +490,7 @@ int main(int argc, char **argv)
        /* capture loop */
        while (1)
        {
-               if (run_stop)
-               {
-                       msg("Shutting down ...\n");
-
-                       if (promisc)
-                               set_promisc(0);
-
-                       if (ring)
-                               ringbuf_free(ring);
-
-                       return 0;
-               }
-               else if (run_dump)
+               if (run_dump)
                {
                        msg("Dumping ring to %s ...\n", output);
 
@@ -534,6 +523,18 @@ int main(int argc, char **argv)
 
                        run_dump = 0;
                }
+               if (run_stop)
+               {
+                       msg("Shutting down ...\n");
+
+                       if (promisc)
+                               set_promisc(0);
+
+                       if (ring)
+                               ringbuf_free(ring);
+
+                       return 0;
+               }
 
                pktlen = recvfrom(capture_sock, pktbuf, sizeof(pktbuf), 0, NULL, 0);
                frames_captured++;