9dc9482c66
git-svn-id: svn://svn.openwrt.org/openwrt/packages@16865 3c298f89-4303-0410-b956-a3cf2f4a3e73
35 lines
907 B
Diff
35 lines
907 B
Diff
diff -Naur netdiscover-0.3-beta6.01machine/src/main.c netdiscover-0.3-beta6/src/main.c
|
|
--- netdiscover-0.3-beta6.01machine/src/main.c 2009-06-25 18:19:18.000000000 -0400
|
|
+++ netdiscover-0.3-beta6/src/main.c 2009-07-16 06:37:43.000000000 -0400
|
|
@@ -121,6 +121,8 @@
|
|
node = 67;
|
|
pcount = 1;
|
|
nokeywait = 0;
|
|
+ fastmode = 0;
|
|
+ ssleep = 0;
|
|
|
|
current_network = (char *) malloc ((sizeof(char)) * 16);
|
|
sprintf(current_network,"Starting.");
|
|
@@ -250,7 +252,6 @@
|
|
}
|
|
}
|
|
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
@@ -299,9 +300,10 @@
|
|
lnet_destroy();
|
|
if (inject->scan_secs > 0) {
|
|
sleep(inject->scan_secs);
|
|
- pthread_kill(*(inject->sniffer), SIGKILL);
|
|
- pthread_kill(*(inject->screen), SIGKILL);
|
|
- pthread_kill(*(inject->keys), SIGKILL);
|
|
+ pthread_kill(*(inject->sniffer), SIGTERM);
|
|
+ pthread_kill(*(inject->screen), SIGTERM);
|
|
+ pthread_kill(*(inject->keys), SIGTERM);
|
|
+ sighandler(SIGTERM);
|
|
}
|
|
|
|
return NULL;
|