OpenWrt – Blame information for rev 1

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 --- a/hostapd/Makefile
2 +++ b/hostapd/Makefile
3 @@ -220,6 +220,9 @@ endif
4 ifdef CONFIG_NO_CTRL_IFACE
5 CFLAGS += -DCONFIG_NO_CTRL_IFACE
6 else
7 +ifdef CONFIG_CTRL_IFACE_MIB
8 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
9 +endif
10 ifeq ($(CONFIG_CTRL_IFACE), udp)
11 CFLAGS += -DCONFIG_CTRL_IFACE_UDP
12 else
13 --- a/hostapd/ctrl_iface.c
14 +++ b/hostapd/ctrl_iface.c
15 @@ -2912,6 +2912,7 @@ static int hostapd_ctrl_iface_receive_pr
16 reply_size);
17 } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
18 reply_len = hostapd_drv_status(hapd, reply, reply_size);
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);
22 if (reply_len >= 0) {
23 @@ -2953,6 +2954,7 @@ static int hostapd_ctrl_iface_receive_pr
24 } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
25 reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
26 reply_size);
27 +#endif
28 } else if (os_strcmp(buf, "ATTACH") == 0) {
29 if (hostapd_ctrl_iface_attach(hapd, from, fromlen, NULL))
30 reply_len = -1;
31 --- a/wpa_supplicant/Makefile
32 +++ b/wpa_supplicant/Makefile
33 @@ -927,6 +927,9 @@ ifdef CONFIG_FILS
34 OBJS += ../src/ap/fils_hlp.o
35 endif
36 ifdef CONFIG_CTRL_IFACE
37 +ifdef CONFIG_CTRL_IFACE_MIB
38 +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
39 +endif
40 OBJS += ../src/ap/ctrl_iface_ap.o
41 endif
42  
43 --- a/wpa_supplicant/ctrl_iface.c
44 +++ b/wpa_supplicant/ctrl_iface.c
45 @@ -2117,7 +2117,7 @@ static int wpa_supplicant_ctrl_iface_sta
46 pos += ret;
47 }
48  
49 -#ifdef CONFIG_AP
50 +#if defined(CONFIG_AP) && defined(CONFIG_CTRL_IFACE_MIB)
51 if (wpa_s->ap_iface) {
52 pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
53 end - pos,
54 @@ -9852,6 +9852,7 @@ char * wpa_supplicant_ctrl_iface_process
55 reply_len = -1;
56 } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
57 wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
58 +#ifdef CONFIG_CTRL_IFACE_MIB
59 } else if (os_strcmp(buf, "MIB") == 0) {
60 reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
61 if (reply_len >= 0) {
62 @@ -9859,6 +9860,7 @@ char * wpa_supplicant_ctrl_iface_process
63 reply + reply_len,
64 reply_size - reply_len);
65 }
66 +#endif
67 } else if (os_strncmp(buf, "STATUS", 6) == 0) {
68 reply_len = wpa_supplicant_ctrl_iface_status(
69 wpa_s, buf + 6, reply, reply_size);
70 @@ -10340,6 +10342,7 @@ char * wpa_supplicant_ctrl_iface_process
71 reply_len = wpa_supplicant_ctrl_iface_bss(
72 wpa_s, buf + 4, reply, reply_size);
73 #ifdef CONFIG_AP
74 +#ifdef CONFIG_CTRL_IFACE_MIB
75 } else if (os_strcmp(buf, "STA-FIRST") == 0) {
76 reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
77 } else if (os_strncmp(buf, "STA ", 4) == 0) {
78 @@ -10348,12 +10351,15 @@ char * wpa_supplicant_ctrl_iface_process
79 } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
80 reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
81 reply_size);
82 +#endif
83 +#ifdef CONFIG_CTRL_IFACE_MIB
84 } else if (os_strncmp(buf, "DEAUTHENTICATE ", 15) == 0) {
85 if (ap_ctrl_iface_sta_deauthenticate(wpa_s, buf + 15))
86 reply_len = -1;
87 } else if (os_strncmp(buf, "DISASSOCIATE ", 13) == 0) {
88 if (ap_ctrl_iface_sta_disassociate(wpa_s, buf + 13))
89 reply_len = -1;
90 +#endif
91 } else if (os_strncmp(buf, "CHAN_SWITCH ", 12) == 0) {
92 if (ap_ctrl_iface_chanswitch(wpa_s, buf + 12))
93 reply_len = -1;
94 --- a/src/ap/ctrl_iface_ap.c
95 +++ b/src/ap/ctrl_iface_ap.c
96 @@ -25,6 +25,7 @@
97 #include "mbo_ap.h"
98 #include "taxonomy.h"
99  
100 +#ifdef CONFIG_CTRL_IFACE_MIB
101  
102 static size_t hostapd_write_ht_mcs_bitmask(char *buf, size_t buflen,
103 size_t curr_len, const u8 *mcs_set)
104 @@ -415,6 +416,7 @@ int hostapd_ctrl_iface_sta_next(struct h
105 return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
106 }
107  
108 +#endif
109  
110 #ifdef CONFIG_P2P_MANAGER
111 static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
112 @@ -753,12 +755,12 @@ int hostapd_ctrl_iface_status(struct hos
113 return len;
114 len += ret;
115 }
116 -
117 +#ifdef CONFIG_CTRL_IFACE_MIB
118 if (iface->conf->ieee80211n && !hapd->conf->disable_11n && mode) {
119 len = hostapd_write_ht_mcs_bitmask(buf, buflen, len,
120 mode->mcs_set);
121 }
122 -
123 +#endif /* CONFIG_CTRL_IFACE_MIB */
124 if (iface->current_rates && iface->num_rates) {
125 ret = os_snprintf(buf + len, buflen - len, "supported_rates=");
126 if (os_snprintf_error(buflen - len, ret))
127 --- a/src/ap/ieee802_1x.c
128 +++ b/src/ap/ieee802_1x.c
129 @@ -2581,6 +2581,7 @@ static const char * bool_txt(Boolean val
130 return val ? "TRUE" : "FALSE";
131 }
132  
133 +#ifdef CONFIG_CTRL_IFACE_MIB
134  
135 int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
136 {
137 @@ -2756,6 +2757,7 @@ int ieee802_1x_get_mib_sta(struct hostap
138 return len;
139 }
140  
141 +#endif
142  
143 #ifdef CONFIG_HS20
144 static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
145 --- a/src/ap/wpa_auth.c
146 +++ b/src/ap/wpa_auth.c
147 @@ -3798,6 +3798,7 @@ static const char * wpa_bool_txt(int val
148 return val ? "TRUE" : "FALSE";
149 }
150  
151 +#ifdef CONFIG_CTRL_IFACE_MIB
152  
153 #define RSN_SUITE "%02x-%02x-%02x-%d"
154 #define RSN_SUITE_ARG(s) \
155 @@ -3942,7 +3943,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
156  
157 return len;
158 }
159 -
160 +#endif
161  
162 void wpa_auth_countermeasures_start(struct wpa_authenticator *wpa_auth)
163 {
164 --- a/src/rsn_supp/wpa.c
165 +++ b/src/rsn_supp/wpa.c
166 @@ -2319,6 +2319,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
167 }
168  
169  
170 +#ifdef CONFIG_CTRL_IFACE_MIB
171 +
172 #define RSN_SUITE "%02x-%02x-%02x-%d"
173 #define RSN_SUITE_ARG(s) \
174 ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
175 @@ -2402,6 +2404,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
176  
177 return (int) len;
178 }
179 +#endif
180 #endif /* CONFIG_CTRL_IFACE */
181  
182  
183 --- a/wpa_supplicant/ap.c
184 +++ b/wpa_supplicant/ap.c
185 @@ -1221,7 +1221,7 @@ int wpas_ap_wps_nfc_report_handover(stru
186 #endif /* CONFIG_WPS */
187  
188  
189 -#ifdef CONFIG_CTRL_IFACE
190 +#if defined(CONFIG_CTRL_IFACE) && defined(CONFIG_CTRL_IFACE_MIB)
191  
192 int ap_ctrl_iface_sta_first(struct wpa_supplicant *wpa_s,
193 char *buf, size_t buflen)