diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-04-06 12:13:55 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-06 12:13:55 +0000 |
commit | 8994b4b1918fba0ba846bd438c2f85547fe8daf5 (patch) | |
tree | fcdd134fd461310bd58912b31464ad39c44a2c89 /package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch | |
parent | 4e155c80d3d8811e19effa7f173a863f6b22f4bf (diff) | |
download | master-31e0f0ae-8994b4b1918fba0ba846bd438c2f85547fe8daf5.tar.gz master-31e0f0ae-8994b4b1918fba0ba846bd438c2f85547fe8daf5.tar.bz2 master-31e0f0ae-8994b4b1918fba0ba846bd438c2f85547fe8daf5.zip |
hostapd: update to version 2014-04-04
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40394
Diffstat (limited to 'package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch')
-rw-r--r-- | package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch | 57 |
1 files changed, 22 insertions, 35 deletions
diff --git a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch index 27f21bdb8f..40d3a9305b 100644 --- a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch +++ b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch @@ -1,6 +1,6 @@ --- a/hostapd/Makefile +++ b/hostapd/Makefile -@@ -144,6 +144,9 @@ endif +@@ -163,6 +163,9 @@ endif ifdef CONFIG_NO_CTRL_IFACE CFLAGS += -DCONFIG_NO_CTRL_IFACE else @@ -12,28 +12,15 @@ endif --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c -@@ -1234,6 +1234,7 @@ static void hostapd_ctrl_iface_receive(i - } else if (os_strcmp(buf, "STATUS") == 0) { - reply_len = hostapd_ctrl_iface_status(hapd, reply, +@@ -1447,6 +1447,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) { -@@ -1263,10 +1264,12 @@ static void hostapd_ctrl_iface_receive(i - reply_len += res; - } - #endif /* CONFIG_NO_RADIUS */ -+#endif - } else if (os_strcmp(buf, "DOWN") == 0) { - hostapd_ctrl_iface_set_down(hapd); - } else if (os_strncmp(buf, "UPDATE ", 7) == 0) { - hostapd_ctrl_iface_update(hapd, buf + 7); -+#ifdef CONFIG_CTRL_IFACE_MIB - } else if (os_strcmp(buf, "STA-FIRST") == 0) { - reply_len = hostapd_ctrl_iface_sta_first(hapd, reply, - reply_size); -@@ -1276,6 +1279,7 @@ static void hostapd_ctrl_iface_receive(i +@@ -1488,6 +1489,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); @@ -43,7 +30,7 @@ reply_len = -1; --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile -@@ -778,6 +778,9 @@ ifdef CONFIG_WNM +@@ -797,6 +797,9 @@ ifdef CONFIG_WNM OBJS += ../src/ap/wnm_ap.o endif ifdef CONFIG_CTRL_IFACE @@ -55,7 +42,7 @@ --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c -@@ -5262,6 +5262,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -6100,6 +6100,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); @@ -63,7 +50,7 @@ } else if (os_strcmp(buf, "MIB") == 0) { reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size); if (reply_len >= 0) { -@@ -5273,6 +5274,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -6111,6 +6112,7 @@ char * wpa_supplicant_ctrl_iface_process else reply_len += res; } @@ -71,7 +58,7 @@ } else if (os_strncmp(buf, "STATUS", 6) == 0) { reply_len = wpa_supplicant_ctrl_iface_status( wpa_s, buf + 6, reply, reply_size); -@@ -5687,6 +5689,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -6518,6 +6520,7 @@ char * wpa_supplicant_ctrl_iface_process reply_len = wpa_supplicant_ctrl_iface_bss( wpa_s, buf + 4, reply, reply_size); #ifdef CONFIG_AP @@ -79,7 +66,7 @@ } 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) { -@@ -5695,6 +5698,7 @@ char * wpa_supplicant_ctrl_iface_process +@@ -6526,6 +6529,7 @@ 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); @@ -89,15 +76,15 @@ reply_len = -1; --- a/src/ap/ctrl_iface_ap.c +++ b/src/ap/ctrl_iface_ap.c -@@ -20,6 +20,7 @@ +@@ -21,6 +21,7 @@ #include "ctrl_iface_ap.h" #include "ap_drv_ops.h" +#ifdef CONFIG_CTRL_IFACE_MIB - static int hostapd_get_sta_conn_time(struct sta_info *sta, - char *buf, size_t buflen) -@@ -129,6 +130,7 @@ int hostapd_ctrl_iface_sta_next(struct h + static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd, + struct sta_info *sta, +@@ -214,6 +215,7 @@ int hostapd_ctrl_iface_sta_next(struct h return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen); } @@ -105,14 +92,14 @@ #ifdef CONFIG_P2P_MANAGER static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype, -@@ -423,3 +425,4 @@ int hostapd_parse_csa_settings(const cha +@@ -524,3 +526,4 @@ int hostapd_parse_csa_settings(const cha return 0; } + --- a/src/ap/ieee802_1x.c +++ b/src/ap/ieee802_1x.c -@@ -1938,6 +1938,7 @@ static const char * bool_txt(Boolean boo +@@ -2124,6 +2124,7 @@ static const char * bool_txt(Boolean boo return bool_val ? "TRUE" : "FALSE"; } @@ -120,17 +107,17 @@ int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen) { -@@ -2090,6 +2091,7 @@ int ieee802_1x_get_mib_sta(struct hostap +@@ -2291,6 +2292,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) + struct sta_info *sta, int success, --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c -@@ -2708,6 +2708,7 @@ static const char * wpa_bool_txt(int boo +@@ -2830,6 +2830,7 @@ static const char * wpa_bool_txt(int boo return bool ? "TRUE" : "FALSE"; } @@ -138,7 +125,7 @@ #define RSN_SUITE "%02x-%02x-%02x-%d" #define RSN_SUITE_ARG(s) \ -@@ -2852,7 +2853,7 @@ int wpa_get_mib_sta(struct wpa_state_mac +@@ -2974,7 +2975,7 @@ int wpa_get_mib_sta(struct wpa_state_mac return len; } @@ -149,7 +136,7 @@ { --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c -@@ -1844,6 +1844,8 @@ static u32 wpa_key_mgmt_suite(struct wpa +@@ -1910,6 +1910,8 @@ static u32 wpa_key_mgmt_suite(struct wpa } @@ -158,7 +145,7 @@ #define RSN_SUITE "%02x-%02x-%02x-%d" #define RSN_SUITE_ARG(s) \ ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff -@@ -1927,6 +1929,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch +@@ -1993,6 +1995,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch return (int) len; } |