83 lines
1.9 KiB
Diff
83 lines
1.9 KiB
Diff
--- a/hostapd/main.c
|
|
+++ b/hostapd/main.c
|
|
@@ -15,6 +15,7 @@
|
|
#include "utils/common.h"
|
|
#include "utils/eloop.h"
|
|
#include "utils/uuid.h"
|
|
+#include "utils/build_features.h"
|
|
#include "crypto/random.h"
|
|
#include "crypto/tls.h"
|
|
#include "common/version.h"
|
|
@@ -558,7 +559,7 @@ int main(int argc, char *argv[])
|
|
|
|
wpa_supplicant_event = hostapd_wpa_event;
|
|
for (;;) {
|
|
- c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
|
|
+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:g:G:v::");
|
|
if (c < 0)
|
|
break;
|
|
switch (c) {
|
|
@@ -595,6 +596,8 @@ int main(int argc, char *argv[])
|
|
break;
|
|
#endif /* CONFIG_DEBUG_LINUX_TRACING */
|
|
case 'v':
|
|
+ if (optarg)
|
|
+ exit(!has_feature(optarg));
|
|
show_version();
|
|
exit(1);
|
|
break;
|
|
--- a/wpa_supplicant/main.c
|
|
+++ b/wpa_supplicant/main.c
|
|
@@ -12,6 +12,7 @@
|
|
#endif /* __linux__ */
|
|
|
|
#include "common.h"
|
|
+#include "build_features.h"
|
|
#include "wpa_supplicant_i.h"
|
|
#include "driver_i.h"
|
|
#include "p2p_supplicant.h"
|
|
@@ -176,7 +177,7 @@ int main(int argc, char *argv[])
|
|
|
|
for (;;) {
|
|
c = getopt(argc, argv,
|
|
- "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
|
|
+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W");
|
|
if (c < 0)
|
|
break;
|
|
switch (c) {
|
|
@@ -279,8 +280,12 @@ int main(int argc, char *argv[])
|
|
break;
|
|
#endif /* CONFIG_DBUS */
|
|
case 'v':
|
|
- printf("%s\n", wpa_supplicant_version);
|
|
- exitcode = 0;
|
|
+ if (optarg) {
|
|
+ exitcode = !has_feature(optarg);
|
|
+ } else {
|
|
+ printf("%s\n", wpa_supplicant_version);
|
|
+ exitcode = 0;
|
|
+ }
|
|
goto out;
|
|
case 'W':
|
|
params.wait_for_monitor++;
|
|
--- /dev/null
|
|
+++ b/src/utils/build_features.h
|
|
@@ -0,0 +1,17 @@
|
|
+#ifndef BUILD_FEATURES_H
|
|
+#define BUILD_FEATURES_H
|
|
+
|
|
+static inline int has_feature(const char *feat)
|
|
+{
|
|
+#ifdef IEEE8021X_EAPOL
|
|
+ if (!strcmp(feat, "eap"))
|
|
+ return 1;
|
|
+#endif
|
|
+#ifdef IEEE80211N
|
|
+ if (!strcmp(feat, "11n"))
|
|
+ return 1;
|
|
+#endif
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#endif /* BUILD_FEATURES_H */
|