|
|
|
--- a/hostapd/Makefile
|
|
|
|
+++ b/hostapd/Makefile
|
|
|
|
@@ -168,6 +168,9 @@ endif
|
|
|
|
ifdef CONFIG_NO_CTRL_IFACE
|
|
|
|
CFLAGS += -DCONFIG_NO_CTRL_IFACE
|
|
|
|
else
|
|
|
|
+ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
+CFLAGS += -DCONFIG_CTRL_IFACE_MIB
|
|
|
|
+endif
|
|
|
|
OBJS += ctrl_iface.o
|
|
|
|
OBJS += ../src/ap/ctrl_iface_ap.o
|
|
|
|
endif
|
|
|
|
--- a/hostapd/ctrl_iface.c
|
|
|
|
+++ b/hostapd/ctrl_iface.c
|
|
|
|
@@ -1953,6 +1953,7 @@ static void hostapd_ctrl_iface_receive(i
|
|
|
|
reply_size);
|
|
|
|
} else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
|
|
|
|
reply_len = hostapd_drv_status(hapd, reply, reply_size);
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
} else if (os_strcmp(buf, "MIB") == 0) {
|
|
|
|
reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
|
|
|
|
if (reply_len >= 0) {
|
|
|
|
@@ -1994,6 +1995,7 @@ static void hostapd_ctrl_iface_receive(i
|
|
|
|
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
|
|
|
|
reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
|
|
|
|
reply_size);
|
|
|
|
+#endif
|
|
|
|
} else if (os_strcmp(buf, "ATTACH") == 0) {
|
|
|
|
if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
|
|
|
|
reply_len = -1;
|
|
|
|
--- a/wpa_supplicant/Makefile
|
|
|
|
+++ b/wpa_supplicant/Makefile
|
|
|
|
@@ -837,6 +837,9 @@ ifdef CONFIG_WNM
|
|
|
|
OBJS += ../src/ap/wnm_ap.o
|
|
|
|
endif
|
|
|
|
ifdef CONFIG_CTRL_IFACE
|
|
|
|
+ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
+CFLAGS += -DCONFIG_CTRL_IFACE_MIB
|
|
|
|
+endif
|
|
|
|
OBJS += ../src/ap/ctrl_iface_ap.o
|
|
|
|
endif
|
|
|
|
|
|
|
|
--- a/wpa_supplicant/ctrl_iface.c
|
|
|
|
+++ b/wpa_supplicant/ctrl_iface.c
|
|
|
|
@@ -1795,7 +1795,7 @@ static int wpa_supplicant_ctrl_iface_sta
|
|
|
|
pos += ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
-#ifdef CONFIG_AP
|
|
|
|
+#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
|
|
|
|
if (wpa_s->ap_iface) {
|
|
|
|
pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
|
|
|
|
end - pos,
|
|
|
|
@@ -7896,6 +7896,7 @@ char * wpa_supplicant_ctrl_iface_process
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "NOTE ", 5) == 0) {
|
|
|
|
wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
} else if (os_strcmp(buf, "MIB") == 0) {
|
|
|
|
reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
|
|
|
|
if (reply_len >= 0) {
|
|
|
|
@@ -7903,6 +7904,7 @@ char * wpa_supplicant_ctrl_iface_process
|
|
|
|
reply + reply_len,
|
|
|
|
reply_size - reply_len);
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
} else if (os_strncmp(buf, "STATUS", 6) == 0) {
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_status(
|
|
|
|
wpa_s, buf + 6, reply, reply_size);
|
|
|
|
@@ -8353,6 +8355,7 @@ char * wpa_supplicant_ctrl_iface_process
|
|
|
|
reply_len = wpa_supplicant_ctrl_iface_bss(
|
|
|
|
wpa_s, buf + 4, reply, reply_size);
|
|
|
|
#ifdef CONFIG_AP
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
} else if (os_strcmp(buf, "STA-FIRST") == 0) {
|
|
|
|
reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
|
|
|
|
} else if (os_strncmp(buf, "STA ", 4) == 0) {
|
|
|
|
@@ -8361,12 +8364,15 @@ char * wpa_supplicant_ctrl_iface_process
|
|
|
|
} else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
|
|
|
|
reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
|
|
|
|
reply_size);
|
|
|
|
+#endif
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
} else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
|
|
|
|
if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
|
|
|
|
reply_len = -1;
|
|
|
|
} else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
|
|
|
|
if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
|
|
|
|
reply_len = -1;
|
|
|
|
+#endif
|
|
|
|
} else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
|
|
|
|
if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
|
|
|
|
reply_len = -1;
|
|
|
|
--- a/src/ap/ctrl_iface_ap.c
|
|
|
|
+++ b/src/ap/ctrl_iface_ap.c
|
|
|
|
@@ -22,6 +22,7 @@
|
|
|
|
#include "ctrl_iface_ap.h"
|
|
|
|
#include "ap_drv_ops.h"
|
|
|
|
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
|
|
|
|
static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
|
|
|
|
struct sta_info *sta,
|
|
|
|
@@ -224,6 +225,7 @@ int hostapd_ctrl_iface_sta_next(struct h
|
|
|
|
return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
|
|
|
|
}
|
|
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_P2P_MANAGER
|
|
|
|
static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
|
|
|
|
--- a/src/ap/ieee802_1x.c
|
|
|
|
+++ b/src/ap/ieee802_1x.c
|
|
|
|
@@ -2337,6 +2337,7 @@ static const char * bool_txt(Boolean boo
|
|
|
|
return bool_val ? "TRUE" : "FALSE";
|
|
|
|
}
|
|
|
|
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
|
|
|
|
int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
|
|
|
|
{
|
|
|
|
@@ -2512,6 +2513,7 @@ int ieee802_1x_get_mib_sta(struct hostap
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
static void ieee802_1x_finished(struct hostapd_data *hapd,
|
|
|
|
struct sta_info *sta, int success,
|
|
|
|
--- a/src/ap/wpa_auth.c
|
|
|
|
+++ b/src/ap/wpa_auth.c
|
|
|
|
@@ -2999,6 +2999,7 @@ static const char * wpa_bool_txt(int boo
|
|
|
|
return bool ? "TRUE" : "FALSE";
|
|
|
|
}
|
|
|
|
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
|
|
|
|
#define RSN_SUITE "%02x-%02x-%02x-%d"
|
|
|
|
#define RSN_SUITE_ARG(s) \
|
|
|
|
@@ -3143,7 +3144,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
-
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
|
|
|
|
{
|
|
|
|
--- a/src/rsn_supp/wpa.c
|
|
|
|
+++ b/src/rsn_supp/wpa.c
|
|
|
|
@@ -2032,6 +2032,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+#ifdef CONFIG_CTRL_IFACE_MIB
|
|
|
|
+
|
|
|
|
#define RSN_SUITE "%02x-%02x-%02x-%d"
|
|
|
|
#define RSN_SUITE_ARG(s) \
|
|
|
|
((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
|
|
|
|
@@ -2115,6 +2117,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
|
|
|
|
|
|
|
|
return (int) len;
|
|
|
|
}
|
|
|
|
+#endif
|
|
|
|
#endif /* CONFIG_CTRL_IFACE */
|
|
|
|
|
|
|
|
|
|
|
|
--- a/wpa_supplicant/ap.c
|
|
|
|
+++ b/wpa_supplicant/ap.c
|
|
|
|
@@ -1015,7 +1015,7 @@ int wpas_ap_wps_nfc_report_handover(stru
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
|
|
|
|
|
|
|
|
-#ifdef CONFIG_CTRL_IFACE
|
|
|
|
+#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
|
|
|
|
|
|
|
|
int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
|
|
|
|
char *buf, size_t buflen)
|