DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

hostapd: support optional argument for the -v switch of hostapd and wpa_supplicant to query build features, e.g. hostapd -veap to test whether 802.11i support is compiled in

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-12-12 17:26:13 +00:00 • committed by sinavir
parent f25d79b410
commit efb493a087
No known key found for this signature in database
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hostapd/main.c
View file

@ -31,7 +31,7 @@
#include "config_file.h" #include "config_file.h"
#include "eap_register.h" #include "eap_register.h"
#include "ctrl_iface.h" #include "ctrl_iface.h"
#include "build_features.h"
struct hapd_global { struct hapd_global {
void **drv_priv; void **drv_priv;
@ -825,7 +825,7 @@ int main(int argc, char *argv[])
wpa_supplicant_event = hostapd_wpa_event; wpa_supplicant_event = hostapd_wpa_event;
wpa_supplicant_event_global = hostapd_wpa_event_global; wpa_supplicant_event_global = hostapd_wpa_event_global;
for (;;) { for (;;) {
c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:vg:G:q"); c = getopt(argc, argv, "b:Bde:f:hi:KP:sSTtu:g:G:qv::");
if (c < 0) if (c < 0)
break; break;
switch (c) { switch (c) {
@ -862,6 +862,8 @@ int main(int argc, char *argv[])
break; break;
#endif /* CONFIG_DEBUG_LINUX_TRACING */ #endif /* CONFIG_DEBUG_LINUX_TRACING */
case 'v': case 'v':
if (optarg)
exit(!has_feature(optarg));
show_version(); show_version();
exit(1); exit(1);
case 'g': case 'g':

7
wpa_supplicant/main.c
View file

@ -12,6 +12,7 @@
#endif /* __linux__ */ #endif /* __linux__ */
#include "common.h" #include "common.h"
#include "build_features.h"
#include "crypto/crypto.h" #include "crypto/crypto.h"
#include "fst/fst.h" #include "fst/fst.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
@ -202,7 +203,7 @@ int main(int argc, char *argv[])
for (;;) { for (;;) {
c = getopt(argc, argv, c = getopt(argc, argv,
"b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW"); "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuv::W");
if (c < 0) if (c < 0)
break; break;
switch (c) { switch (c) {
@ -302,8 +303,12 @@ int main(int argc, char *argv[])
break; break;
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */ #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
case 'v': case 'v':
if (optarg) {
exitcode = !has_feature(optarg);
} else {
printf("%s\n", wpa_supplicant_version); printf("%s\n", wpa_supplicant_version);
exitcode = 0; exitcode = 0;
}
goto out; goto out;
case 'W': case 'W':
params.wait_for_monitor++; params.wait_for_monitor++;