3 @@ -144,6 +144,9 @@ endif
4 ifdef CONFIG_NO_CTRL_IFACE
5 CFLAGS += -DCONFIG_NO_CTRL_IFACE
7 +ifdef CONFIG_CTRL_IFACE_MIB
8 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
11 OBJS += ../src/ap/ctrl_iface_ap.o
13 --- a/hostapd/ctrl_iface.c
14 +++ b/hostapd/ctrl_iface.c
15 @@ -1234,6 +1234,7 @@ static void hostapd_ctrl_iface_receive(i
16 } else if (os_strcmp(buf, "STATUS") == 0) {
17 reply_len = hostapd_ctrl_iface_status(hapd, reply,
19 +#ifdef CONFIG_CTRL_IFACE_MIB
20 } else if (os_strcmp(buf, "MIB") == 0) {
21 reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
23 @@ -1263,10 +1264,12 @@ static void hostapd_ctrl_iface_receive(i
26 #endif /* CONFIG_NO_RADIUS */
28 } else if (os_strcmp(buf, "DOWN") == 0) {
29 hostapd_ctrl_iface_set_down(hapd);
30 } else if (os_strncmp(buf, "UPDATE ", 7) == 0) {
31 hostapd_ctrl_iface_update(hapd, buf + 7);
32 +#ifdef CONFIG_CTRL_IFACE_MIB
33 } else if (os_strcmp(buf, "STA-FIRST") == 0) {
34 reply_len = hostapd_ctrl_iface_sta_first(hapd, reply,
36 @@ -1276,6 +1279,7 @@ static void hostapd_ctrl_iface_receive(i
37 } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
38 reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
41 } else if (os_strcmp(buf, "ATTACH") == 0) {
42 if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
44 --- a/wpa_supplicant/Makefile
45 +++ b/wpa_supplicant/Makefile
46 @@ -778,6 +778,9 @@ ifdef CONFIG_WNM
47 OBJS += ../src/ap/wnm_ap.o
49 ifdef CONFIG_CTRL_IFACE
50 +ifdef CONFIG_CTRL_IFACE_MIB
51 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
53 OBJS += ../src/ap/ctrl_iface_ap.o
56 --- a/wpa_supplicant/ctrl_iface.c
57 +++ b/wpa_supplicant/ctrl_iface.c
58 @@ -5262,6 +5262,7 @@ char * wpa_supplicant_ctrl_iface_process
60 } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
61 wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
62 +#ifdef CONFIG_CTRL_IFACE_MIB
63 } else if (os_strcmp(buf, "MIB") == 0) {
64 reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
66 @@ -5273,6 +5274,7 @@ char * wpa_supplicant_ctrl_iface_process
71 } else if (os_strncmp(buf, "STATUS", 6) == 0) {
72 reply_len = wpa_supplicant_ctrl_iface_status(
73 wpa_s, buf + 6, reply, reply_size);
74 @@ -5687,6 +5689,7 @@ char * wpa_supplicant_ctrl_iface_process
75 reply_len = wpa_supplicant_ctrl_iface_bss(
76 wpa_s, buf + 4, reply, reply_size);
78 +#ifdef CONFIG_CTRL_IFACE_MIB
79 } else if (os_strcmp(buf, "STA-FIRST") == 0) {
80 reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
81 } else if (os_strncmp(buf, "STA ", 4) == 0) {
82 @@ -5695,6 +5698,7 @@ char * wpa_supplicant_ctrl_iface_process
83 } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
84 reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
87 } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
88 if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
90 --- a/src/ap/ctrl_iface_ap.c
91 +++ b/src/ap/ctrl_iface_ap.c
93 #include "ctrl_iface_ap.h"
94 #include "ap_drv_ops.h"
96 +#ifdef CONFIG_CTRL_IFACE_MIB
98 static int hostapd_get_sta_conn_time(struct sta_info *sta,
99 char *buf, size_t buflen)
100 @@ -129,6 +130,7 @@ int hostapd_ctrl_iface_sta_next(struct h
101 return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
106 #ifdef CONFIG_P2P_MANAGER
107 static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
108 @@ -423,3 +425,4 @@ int hostapd_parse_csa_settings(const cha
113 --- a/src/ap/ieee802_1x.c
114 +++ b/src/ap/ieee802_1x.c
115 @@ -1938,6 +1938,7 @@ static const char * bool_txt(Boolean boo
116 return bool_val ? "TRUE" : "FALSE";
119 +#ifdef CONFIG_CTRL_IFACE_MIB
121 int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
123 @@ -2090,6 +2091,7 @@ int ieee802_1x_get_mib_sta(struct hostap
129 static void ieee802_1x_finished(struct hostapd_data *hapd,
130 struct sta_info *sta, int success)
131 --- a/src/ap/wpa_auth.c
132 +++ b/src/ap/wpa_auth.c
133 @@ -2708,6 +2708,7 @@ static const char * wpa_bool_txt(int boo
134 return bool ? "TRUE" : "FALSE";
137 +#ifdef CONFIG_CTRL_IFACE_MIB
139 #define RSN_SUITE "%02x-%02x-%02x-%d"
140 #define RSN_SUITE_ARG(s) \
141 @@ -2852,7 +2853,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
148 void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
150 --- a/src/rsn_supp/wpa.c
151 +++ b/src/rsn_supp/wpa.c
152 @@ -1844,6 +1844,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
156 +#ifdef CONFIG_CTRL_IFACE_MIB
158 #define RSN_SUITE "%02x-%02x-%02x-%d"
159 #define RSN_SUITE_ARG(s) \
160 ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
161 @@ -1927,6 +1929,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
166 #endif /* CONFIG_CTRL_IFACE */