ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-03 04:26:55 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

iwcap: fix handling kill signal during dump

Browse Source 
Do not run another loop iteration before checking the stop flag

Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 2f09a1e3c9)
This commit is contained in:
Felix Fietkau 2017-03-09 08:53:52 +01:00 committed by Jo-Philipp Wich
parent 1411493569
commit cfb5a550e4
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/network/utils/iwcap/src/iwcap.c
View File

@ -490,19 +490,7 @@ int main(int argc, char **argv)
/* capture loop */ /* capture loop */
while (1) while (1)
{ {
if (run_stop) if (run_dump)
{
msg("Shutting down ...\n");
if (promisc)
set_promisc(0);
if (ring)
ringbuf_free(ring);
return 0;
}
else if (run_dump)
{ {
msg("Dumping ring to %s ...\n", output); msg("Dumping ring to %s ...\n", output);
@ -535,6 +523,18 @@ int main(int argc, char **argv)
run_dump = 0; 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); pktlen = recvfrom(capture_sock, pktbuf, sizeof(pktbuf), 0, NULL, 0);
frames_captured++; frames_captured++;