aboutsummaryrefslogtreecommitdiffstats
path: root/package/hostapd/patches/350-hostap_multicall_fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/hostapd/patches/350-hostap_multicall_fix.patch')
-rw-r--r--package/hostapd/patches/350-hostap_multicall_fix.patch554
1 files changed, 0 insertions, 554 deletions
diff --git a/package/hostapd/patches/350-hostap_multicall_fix.patch b/package/hostapd/patches/350-hostap_multicall_fix.patch
deleted file mode 100644
index 2664341e5e..0000000000
--- a/package/hostapd/patches/350-hostap_multicall_fix.patch
+++ /dev/null
@@ -1,554 +0,0 @@
---- a/src/drivers/driver_hostap.c
-+++ b/src/drivers/driver_hostap.c
-@@ -22,9 +22,6 @@
- #include "eloop.h"
- #include "driver_hostap.h"
-
--
--#ifdef HOSTAPD
--
- #include <net/if_arp.h>
- #include <netpacket/packet.h>
-
-@@ -43,10 +40,16 @@
- static const u8 rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-
- struct hostap_driver_data {
-+ void *wext; /* private data for driver_wext */
-+ void *ctx;
-+ char ifname[IFNAMSIZ + 1];
-+ int sock;
-+ int current_mode; /* infra/adhoc */
-+
-+#ifdef HOSTAPD
- struct hostapd_data *hapd;
-
- char iface[IFNAMSIZ + 1];
-- int sock; /* raw packet socket for driver access */
- int ioctl_sock; /* socket for ioctl() use */
- struct netlink_data *netlink;
-
-@@ -56,9 +59,11 @@ struct hostap_driver_data {
- size_t generic_ie_len;
- u8 *wps_ie;
- size_t wps_ie_len;
-+#endif
- };
-
-
-+#ifdef HOSTAPD
- static int hostapd_ioctl(void *priv, struct prism2_hostapd_param *param,
- int len);
- static int hostap_set_iface_flags(void *priv, int dev_up);
-@@ -399,65 +404,6 @@ static int hostapd_ioctl(void *priv, str
- }
-
-
--static int wpa_driver_hostap_set_key(const char *ifname, void *priv,
-- enum wpa_alg alg, const u8 *addr,
-- int key_idx, int set_tx,
-- const u8 *seq, size_t seq_len,
-- const u8 *key, size_t key_len)
--{
-- struct hostap_driver_data *drv = priv;
-- struct prism2_hostapd_param *param;
-- u8 *buf;
-- size_t blen;
-- int ret = 0;
--
-- blen = sizeof(*param) + key_len;
-- buf = os_zalloc(blen);
-- if (buf == NULL)
-- return -1;
--
-- param = (struct prism2_hostapd_param *) buf;
-- param->cmd = PRISM2_SET_ENCRYPTION;
-- if (addr == NULL)
-- memset(param->sta_addr, 0xff, ETH_ALEN);
-- else
-- memcpy(param->sta_addr, addr, ETH_ALEN);
-- switch (alg) {
-- case WPA_ALG_NONE:
-- os_strlcpy((char *) param->u.crypt.alg, "NONE",
-- HOSTAP_CRYPT_ALG_NAME_LEN);
-- break;
-- case WPA_ALG_WEP:
-- os_strlcpy((char *) param->u.crypt.alg, "WEP",
-- HOSTAP_CRYPT_ALG_NAME_LEN);
-- break;
-- case WPA_ALG_TKIP:
-- os_strlcpy((char *) param->u.crypt.alg, "TKIP",
-- HOSTAP_CRYPT_ALG_NAME_LEN);
-- break;
-- case WPA_ALG_CCMP:
-- os_strlcpy((char *) param->u.crypt.alg, "CCMP",
-- HOSTAP_CRYPT_ALG_NAME_LEN);
-- break;
-- default:
-- os_free(buf);
-- return -1;
-- }
-- param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0;
-- param->u.crypt.idx = key_idx;
-- param->u.crypt.key_len = key_len;
-- memcpy((u8 *) (param + 1), key, key_len);
--
-- if (hostapd_ioctl(drv, param, blen)) {
-- printf("Failed to set encryption.\n");
-- ret = -1;
-- }
-- free(buf);
--
-- return ret;
--}
--
--
- static int hostap_get_seqnum(const char *ifname, void *priv, const u8 *addr,
- int idx, u8 *seq)
- {
-@@ -1171,21 +1117,9 @@ static void wpa_driver_hostap_poll_clien
- hostap_send_mlme(priv, (u8 *)&hdr, sizeof(hdr));
- }
-
--#else /* HOSTAPD */
--
--struct wpa_driver_hostap_data {
-- void *wext; /* private data for driver_wext */
-- void *ctx;
-- char ifname[IFNAMSIZ + 1];
-- int sock;
-- int current_mode; /* infra/adhoc */
--};
--
--
--static int wpa_driver_hostap_set_auth_alg(void *priv, int auth_alg);
--
-+#endif /* HOSTAPD */
-
--static int hostapd_ioctl(struct wpa_driver_hostap_data *drv,
-+static int wpa_hostapd_ioctl(struct hostap_driver_data *drv,
- struct prism2_hostapd_param *param,
- int len, int show_err)
- {
-@@ -1207,7 +1141,12 @@ static int hostapd_ioctl(struct wpa_driv
- }
-
-
--static int wpa_driver_hostap_set_wpa_ie(struct wpa_driver_hostap_data *drv,
-+#if !defined(NO_SUPPLICANT)
-+
-+static int wpa_driver_hostap_set_auth_alg(void *priv, int auth_alg);
-+
-+
-+static int wpa_driver_hostap_set_wpa_ie(struct hostap_driver_data *drv,
- const u8 *wpa_ie, size_t wpa_ie_len)
- {
- struct prism2_hostapd_param *param;
-@@ -1223,7 +1162,7 @@ static int wpa_driver_hostap_set_wpa_ie(
- param->cmd = PRISM2_HOSTAPD_SET_GENERIC_ELEMENT;
- param->u.generic_elem.len = wpa_ie_len;
- os_memcpy(param->u.generic_elem.data, wpa_ie, wpa_ie_len);
-- res = hostapd_ioctl(drv, param, blen, 1);
-+ res = wpa_hostapd_ioctl(drv, param, blen, 1);
-
- os_free(param);
-
-@@ -1231,7 +1170,7 @@ static int wpa_driver_hostap_set_wpa_ie(
- }
-
-
--static int prism2param(struct wpa_driver_hostap_data *drv, int param,
-+static int prism2param(struct hostap_driver_data *drv, int param,
- int value)
- {
- struct iwreq iwr;
-@@ -1253,7 +1192,7 @@ static int prism2param(struct wpa_driver
-
- static int wpa_driver_hostap_set_wpa(void *priv, int enabled)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- int ret = 0;
-
- wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled);
-@@ -1269,125 +1208,15 @@ static int wpa_driver_hostap_set_wpa(voi
- }
-
-
--static void show_set_key_error(struct prism2_hostapd_param *param)
--{
-- switch (param->u.crypt.err) {
-- case HOSTAP_CRYPT_ERR_UNKNOWN_ALG:
-- wpa_printf(MSG_INFO, "Unknown algorithm '%s'.",
-- param->u.crypt.alg);
-- wpa_printf(MSG_INFO, "You may need to load kernel module to "
-- "register that algorithm.");
-- wpa_printf(MSG_INFO, "E.g., 'modprobe hostap_crypt_wep' for "
-- "WEP.");
-- break;
-- case HOSTAP_CRYPT_ERR_UNKNOWN_ADDR:
-- wpa_printf(MSG_INFO, "Unknown address " MACSTR ".",
-- MAC2STR(param->sta_addr));
-- break;
-- case HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED:
-- wpa_printf(MSG_INFO, "Crypt algorithm initialization failed.");
-- break;
-- case HOSTAP_CRYPT_ERR_KEY_SET_FAILED:
-- wpa_printf(MSG_INFO, "Key setting failed.");
-- break;
-- case HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED:
-- wpa_printf(MSG_INFO, "TX key index setting failed.");
-- break;
-- case HOSTAP_CRYPT_ERR_CARD_CONF_FAILED:
-- wpa_printf(MSG_INFO, "Card configuration failed.");
-- break;
-- }
--}
--
--
--static int wpa_driver_hostap_set_key(const char *ifname, void *priv,
-- enum wpa_alg alg, const u8 *addr,
-- int key_idx, int set_tx,
-- const u8 *seq, size_t seq_len,
-- const u8 *key, size_t key_len)
--{
-- struct wpa_driver_hostap_data *drv = priv;
-- struct prism2_hostapd_param *param;
-- u8 *buf;
-- size_t blen;
-- int ret = 0;
-- char *alg_name;
--
-- switch (alg) {
-- case WPA_ALG_NONE:
-- alg_name = "none";
-- break;
-- case WPA_ALG_WEP:
-- alg_name = "WEP";
-- break;
-- case WPA_ALG_TKIP:
-- alg_name = "TKIP";
-- break;
-- case WPA_ALG_CCMP:
-- alg_name = "CCMP";
-- break;
-- default:
-- return -1;
-- }
--
-- wpa_printf(MSG_DEBUG, "%s: alg=%s key_idx=%d set_tx=%d seq_len=%lu "
-- "key_len=%lu", __FUNCTION__, alg_name, key_idx, set_tx,
-- (unsigned long) seq_len, (unsigned long) key_len);
--
-- if (seq_len > 8)
-- return -2;
--
-- blen = sizeof(*param) + key_len;
-- buf = os_zalloc(blen);
-- if (buf == NULL)
-- return -1;
--
-- param = (struct prism2_hostapd_param *) buf;
-- param->cmd = PRISM2_SET_ENCRYPTION;
-- /* TODO: In theory, STA in client mode can use five keys; four default
-- * keys for receiving (with keyidx 0..3) and one individual key for
-- * both transmitting and receiving (keyidx 0) _unicast_ packets. Now,
-- * keyidx 0 is reserved for this unicast use and default keys can only
-- * use keyidx 1..3 (i.e., default key with keyidx 0 is not supported).
-- * This should be fine for more or less all cases, but for completeness
-- * sake, the driver could be enhanced to support the missing key. */
--#if 0
-- if (addr == NULL)
-- os_memset(param->sta_addr, 0xff, ETH_ALEN);
-- else
-- os_memcpy(param->sta_addr, addr, ETH_ALEN);
--#else
-- os_memset(param->sta_addr, 0xff, ETH_ALEN);
--#endif
-- os_strlcpy((char *) param->u.crypt.alg, alg_name,
-- HOSTAP_CRYPT_ALG_NAME_LEN);
-- param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0;
-- param->u.crypt.idx = key_idx;
-- if (seq)
-- os_memcpy(param->u.crypt.seq, seq, seq_len);
-- param->u.crypt.key_len = key_len;
-- os_memcpy((u8 *) (param + 1), key, key_len);
--
-- if (hostapd_ioctl(drv, param, blen, 1)) {
-- wpa_printf(MSG_WARNING, "Failed to set encryption.");
-- show_set_key_error(param);
-- ret = -1;
-- }
-- os_free(buf);
--
-- return ret;
--}
--
--
- static int wpa_driver_hostap_set_countermeasures(void *priv, int enabled)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled);
- return prism2param(drv, PRISM2_PARAM_TKIP_COUNTERMEASURES, enabled);
- }
-
-
--static int wpa_driver_hostap_reset(struct wpa_driver_hostap_data *drv,
-+static int wpa_driver_hostap_reset(struct hostap_driver_data *drv,
- int type)
- {
- struct iwreq iwr;
-@@ -1408,7 +1237,7 @@ static int wpa_driver_hostap_reset(struc
- }
-
-
--static int wpa_driver_hostap_mlme(struct wpa_driver_hostap_data *drv,
-+static int wpa_driver_hostap_mlme(struct hostap_driver_data *drv,
- const u8 *addr, int cmd, int reason_code)
- {
- struct prism2_hostapd_param param;
-@@ -1423,7 +1252,7 @@ static int wpa_driver_hostap_mlme(struct
- os_memcpy(param.sta_addr, addr, ETH_ALEN);
- param.u.mlme.cmd = cmd;
- param.u.mlme.reason_code = reason_code;
-- ret = hostapd_ioctl(drv, &param, sizeof(param), 1);
-+ ret = wpa_hostapd_ioctl(drv, &param, sizeof(param), 1);
- if (ret == 0) {
- os_sleep(0, 100000);
- ret = wpa_driver_hostap_reset(drv, 2);
-@@ -1435,7 +1264,7 @@ static int wpa_driver_hostap_mlme(struct
- static int wpa_driver_hostap_deauthenticate(void *priv, const u8 *addr,
- int reason_code)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
- return wpa_driver_hostap_mlme(drv, addr, MLME_STA_DEAUTH,
- reason_code);
-@@ -1445,7 +1274,7 @@ static int wpa_driver_hostap_deauthentic
- static int wpa_driver_hostap_disassociate(void *priv, const u8 *addr,
- int reason_code)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
- return wpa_driver_hostap_mlme(drv, addr, MLME_STA_DISASSOC,
- reason_code);
-@@ -1456,7 +1285,7 @@ static int
- wpa_driver_hostap_associate(void *priv,
- struct wpa_driver_associate_params *params)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- int ret = 0;
- int allow_unencrypted_eapol;
-
-@@ -1520,7 +1349,7 @@ wpa_driver_hostap_associate(void *priv,
- static int wpa_driver_hostap_scan(void *priv,
- struct wpa_driver_scan_params *params)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- struct prism2_hostapd_param param;
- int ret;
- const u8 *ssid = params->ssids[0].ssid;
-@@ -1541,7 +1370,7 @@ static int wpa_driver_hostap_scan(void *
- param.cmd = PRISM2_HOSTAPD_SCAN_REQ;
- param.u.scan_req.ssid_len = ssid_len;
- os_memcpy(param.u.scan_req.ssid, ssid, ssid_len);
-- ret = hostapd_ioctl(drv, &param, sizeof(param), 1);
-+ ret = wpa_hostapd_ioctl(drv, &param, sizeof(param), 1);
-
- /* Not all drivers generate "scan completed" wireless event, so try to
- * read results after a timeout. */
-@@ -1556,7 +1385,7 @@ static int wpa_driver_hostap_scan(void *
-
- static int wpa_driver_hostap_set_auth_alg(void *priv, int auth_alg)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- int algs = 0;
-
- if (auth_alg & WPA_AUTH_ALG_OPEN)
-@@ -1574,35 +1403,35 @@ static int wpa_driver_hostap_set_auth_al
-
- static int wpa_driver_hostap_get_bssid(void *priv, u8 *bssid)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- return wpa_driver_wext_get_bssid(drv->wext, bssid);
- }
-
-
- static int wpa_driver_hostap_get_ssid(void *priv, u8 *ssid)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- return wpa_driver_wext_get_ssid(drv->wext, ssid);
- }
-
-
- static struct wpa_scan_results * wpa_driver_hostap_get_scan_results(void *priv)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- return wpa_driver_wext_get_scan_results(drv->wext);
- }
-
-
- static int wpa_driver_hostap_set_operstate(void *priv, int state)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- return wpa_driver_wext_set_operstate(drv->wext, state);
- }
-
-
- static void * wpa_driver_hostap_init(void *ctx, const char *ifname)
- {
-- struct wpa_driver_hostap_data *drv;
-+ struct hostap_driver_data *drv;
-
- drv = os_zalloc(sizeof(*drv));
- if (drv == NULL)
-@@ -1642,14 +1471,120 @@ static void * wpa_driver_hostap_init(voi
-
- static void wpa_driver_hostap_deinit(void *priv)
- {
-- struct wpa_driver_hostap_data *drv = priv;
-+ struct hostap_driver_data *drv = priv;
- wpa_driver_hostap_set_wpa(drv, 0);
- wpa_driver_wext_deinit(drv->wext);
- close(drv->sock);
- os_free(drv);
- }
-
--#endif /* HOSTAPD */
-+#endif
-+
-+
-+static void show_set_key_error(struct prism2_hostapd_param *param)
-+{
-+ switch (param->u.crypt.err) {
-+ case HOSTAP_CRYPT_ERR_UNKNOWN_ALG:
-+ wpa_printf(MSG_INFO, "Unknown algorithm '%s'.",
-+ param->u.crypt.alg);
-+ wpa_printf(MSG_INFO, "You may need to load kernel module to "
-+ "register that algorithm.");
-+ wpa_printf(MSG_INFO, "E.g., 'modprobe hostap_crypt_wep' for "
-+ "WEP.");
-+ break;
-+ case HOSTAP_CRYPT_ERR_UNKNOWN_ADDR:
-+ wpa_printf(MSG_INFO, "Unknown address " MACSTR ".",
-+ MAC2STR(param->sta_addr));
-+ break;
-+ case HOSTAP_CRYPT_ERR_CRYPT_INIT_FAILED:
-+ wpa_printf(MSG_INFO, "Crypt algorithm initialization failed.");
-+ break;
-+ case HOSTAP_CRYPT_ERR_KEY_SET_FAILED:
-+ wpa_printf(MSG_INFO, "Key setting failed.");
-+ break;
-+ case HOSTAP_CRYPT_ERR_TX_KEY_SET_FAILED:
-+ wpa_printf(MSG_INFO, "TX key index setting failed.");
-+ break;
-+ case HOSTAP_CRYPT_ERR_CARD_CONF_FAILED:
-+ wpa_printf(MSG_INFO, "Card configuration failed.");
-+ break;
-+ }
-+}
-+
-+
-+static int wpa_driver_hostap_set_key(const char *ifname, void *priv,
-+ enum wpa_alg alg, const u8 *addr,
-+ int key_idx, int set_tx,
-+ const u8 *seq, size_t seq_len,
-+ const u8 *key, size_t key_len)
-+{
-+ struct hostap_driver_data *drv = priv;
-+ struct prism2_hostapd_param *param;
-+ u8 *buf;
-+ size_t blen;
-+ int ret = 0;
-+ char *alg_name;
-+
-+ switch (alg) {
-+ case WPA_ALG_NONE:
-+ alg_name = "none";
-+ break;
-+ case WPA_ALG_WEP:
-+ alg_name = "WEP";
-+ break;
-+ case WPA_ALG_TKIP:
-+ alg_name = "TKIP";
-+ break;
-+ case WPA_ALG_CCMP:
-+ alg_name = "CCMP";
-+ break;
-+ default:
-+ return -1;
-+ }
-+
-+ wpa_printf(MSG_DEBUG, "%s: alg=%s key_idx=%d set_tx=%d seq_len=%lu "
-+ "key_len=%lu", __FUNCTION__, alg_name, key_idx, set_tx,
-+ (unsigned long) seq_len, (unsigned long) key_len);
-+
-+ if (seq_len > 8)
-+ return -2;
-+
-+ blen = sizeof(*param) + key_len;
-+ buf = os_zalloc(blen);
-+ if (buf == NULL)
-+ return -1;
-+
-+ param = (struct prism2_hostapd_param *) buf;
-+ param->cmd = PRISM2_SET_ENCRYPTION;
-+ /* TODO: In theory, STA in client mode can use five keys; four default
-+ * keys for receiving (with keyidx 0..3) and one individual key for
-+ * both transmitting and receiving (keyidx 0) _unicast_ packets. Now,
-+ * keyidx 0 is reserved for this unicast use and default keys can only
-+ * use keyidx 1..3 (i.e., default key with keyidx 0 is not supported).
-+ * This should be fine for more or less all cases, but for completeness
-+ * sake, the driver could be enhanced to support the missing key. */
-+ if (addr == NULL)
-+ os_memset(param->sta_addr, 0xff, ETH_ALEN);
-+ else
-+ os_memcpy(param->sta_addr, addr, ETH_ALEN);
-+ os_strlcpy((char *) param->u.crypt.alg, alg_name,
-+ HOSTAP_CRYPT_ALG_NAME_LEN);
-+ param->u.crypt.flags = set_tx ? HOSTAP_CRYPT_FLAG_SET_TX_KEY : 0;
-+ param->u.crypt.idx = key_idx;
-+ if (seq)
-+ os_memcpy(param->u.crypt.seq, seq, seq_len);
-+ param->u.crypt.key_len = key_len;
-+ os_memcpy((u8 *) (param + 1), key, key_len);
-+
-+ if (wpa_hostapd_ioctl(drv, param, blen, 1)) {
-+ wpa_printf(MSG_WARNING, "Failed to set encryption.");
-+ show_set_key_error(param);
-+ ret = -1;
-+ }
-+ os_free(buf);
-+
-+ return ret;
-+}
-
-
- const struct wpa_driver_ops wpa_driver_hostap_ops = {
-@@ -1679,7 +1614,8 @@ const struct wpa_driver_ops wpa_driver_h
- .set_ap_wps_ie = hostap_set_ap_wps_ie,
- .set_freq = hostap_set_freq,
- .poll_client = wpa_driver_hostap_poll_client,
--#else /* HOSTAPD */
-+#endif /* HOSTAPD */
-+#if !defined(NO_SUPPLICANT)
- .get_bssid = wpa_driver_hostap_get_bssid,
- .get_ssid = wpa_driver_hostap_get_ssid,
- .set_countermeasures = wpa_driver_hostap_set_countermeasures,
-@@ -1691,5 +1627,5 @@ const struct wpa_driver_ops wpa_driver_h
- .init = wpa_driver_hostap_init,
- .deinit = wpa_driver_hostap_deinit,
- .set_operstate = wpa_driver_hostap_set_operstate,
--#endif /* HOSTAPD */
-+#endif
- };