parent
35607da5b8
commit
4225e4b2d8
@ -0,0 +1,60 @@
|
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -2918,6 +2918,7 @@ static void * wpa_driver_nl80211_init(vo
|
||||
drv->monitor_sock = -1;
|
||||
drv->eapol_tx_sock = -1;
|
||||
drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
|
||||
+ drv->nlmode = NL80211_IFTYPE_STATION;
|
||||
|
||||
if (wpa_driver_nl80211_init_nl(drv)) {
|
||||
os_free(drv);
|
||||
@@ -3232,17 +3233,12 @@ static void wpa_driver_nl80211_send_rfki
|
||||
wpa_supplicant_event(timeout_ctx, EVENT_INTERFACE_DISABLED, NULL);
|
||||
}
|
||||
|
||||
-
|
||||
static int
|
||||
-wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
|
||||
+wpa_driver_nl80211_finish_drv_init_sta(struct wpa_driver_nl80211_data *drv,
|
||||
+ int *send_rfkill_event)
|
||||
{
|
||||
struct i802_bss *bss = &drv->first_bss;
|
||||
- int send_rfkill_event = 0;
|
||||
|
||||
- drv->ifindex = if_nametoindex(bss->ifname);
|
||||
- drv->first_bss.ifindex = drv->ifindex;
|
||||
-
|
||||
-#ifndef HOSTAPD
|
||||
/*
|
||||
* Make sure the interface starts up in station mode unless this is a
|
||||
* dynamically added interface (e.g., P2P) that was already configured
|
||||
@@ -3261,7 +3257,7 @@ wpa_driver_nl80211_finish_drv_init(struc
|
||||
"interface '%s' due to rfkill",
|
||||
bss->ifname);
|
||||
drv->if_disabled = 1;
|
||||
- send_rfkill_event = 1;
|
||||
+ *send_rfkill_event = 1;
|
||||
} else {
|
||||
wpa_printf(MSG_ERROR, "nl80211: Could not set "
|
||||
"interface '%s' UP", bss->ifname);
|
||||
@@ -3271,7 +3267,19 @@ wpa_driver_nl80211_finish_drv_init(struc
|
||||
|
||||
netlink_send_oper_ifla(drv->global->netlink, drv->ifindex,
|
||||
1, IF_OPER_DORMANT);
|
||||
-#endif /* HOSTAPD */
|
||||
+}
|
||||
+
|
||||
+static int
|
||||
+wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv)
|
||||
+{
|
||||
+ struct i802_bss *bss = &drv->first_bss;
|
||||
+ int send_rfkill_event = 0;
|
||||
+
|
||||
+ drv->ifindex = if_nametoindex(bss->ifname);
|
||||
+ drv->first_bss.ifindex = drv->ifindex;
|
||||
+
|
||||
+ if (drv->nlmode == NL80211_IFTYPE_STATION)
|
||||
+ wpa_driver_nl80211_finish_drv_init_sta(drv, &send_rfkill_event);
|
||||
|
||||
if (wpa_driver_nl80211_capa(drv))
|
||||
return -1;
|
@ -1,37 +0,0 @@
|
||||
--- a/wpa_supplicant/scan.c
|
||||
+++ b/wpa_supplicant/scan.c
|
||||
@@ -423,6 +423,7 @@ static void wpa_supplicant_scan(void *el
|
||||
int scan_req = 0, ret;
|
||||
struct wpabuf *extra_ie;
|
||||
struct wpa_driver_scan_params params;
|
||||
+ int scan_ssid_all = 1;
|
||||
size_t max_ssids;
|
||||
enum wpa_states prev_state;
|
||||
|
||||
@@ -502,6 +503,16 @@ static void wpa_supplicant_scan(void *el
|
||||
}
|
||||
}
|
||||
|
||||
+ /* check if all configured ssids should be scanned directly */
|
||||
+ ssid = wpa_s->conf->ssid;
|
||||
+ while (ssid) {
|
||||
+ if (!ssid->scan_ssid) {
|
||||
+ scan_ssid_all = 0;
|
||||
+ break;
|
||||
+ }
|
||||
+ ssid = ssid->next;
|
||||
+ }
|
||||
+
|
||||
/* Find the starting point from which to continue scanning */
|
||||
ssid = wpa_s->conf->ssid;
|
||||
if (wpa_s->prev_scan_ssid != WILDCARD_SSID_SCAN) {
|
||||
@@ -564,6 +575,9 @@ static void wpa_supplicant_scan(void *el
|
||||
int_array_sort_unique(params.freqs);
|
||||
}
|
||||
|
||||
+ if (scan_ssid_all && !ssid)
|
||||
+ ssid = wpa_s->conf->ssid;
|
||||
+
|
||||
if (ssid) {
|
||||
wpa_s->prev_scan_ssid = ssid;
|
||||
if (max_ssids > 1) {
|
@ -1,791 +0,0 @@
|
||||
--- a/src/drivers/driver_madwifi.c
|
||||
+++ b/src/drivers/driver_madwifi.c
|
||||
@@ -71,7 +71,6 @@
|
||||
|
||||
#define WPA_KEY_RSC_LEN 8
|
||||
|
||||
-#ifdef HOSTAPD
|
||||
|
||||
#include "priv_netlink.h"
|
||||
#include "netlink.h"
|
||||
@@ -82,17 +81,22 @@
|
||||
struct madwifi_driver_data {
|
||||
struct hostapd_data *hapd; /* back pointer */
|
||||
|
||||
- char iface[IFNAMSIZ + 1];
|
||||
+ void *wext; /* private data for driver_wext */
|
||||
+ void *ctx;
|
||||
+ char ifname[IFNAMSIZ + 1];
|
||||
+ int ioctl_sock; /* socket for ioctl() use */
|
||||
+
|
||||
+#ifdef HOSTAPD
|
||||
int ifindex;
|
||||
struct l2_packet_data *sock_xmit; /* raw packet xmit socket */
|
||||
struct l2_packet_data *sock_recv; /* raw packet recv socket */
|
||||
- int ioctl_sock; /* socket for ioctl() use */
|
||||
struct netlink_data *netlink;
|
||||
int we_version;
|
||||
u8 acct_mac[ETH_ALEN];
|
||||
struct hostap_sta_driver_data acct_data;
|
||||
|
||||
struct l2_packet_data *sock_raw; /* raw 802.11 management frames */
|
||||
+#endif
|
||||
};
|
||||
|
||||
static int madwifi_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
|
||||
@@ -105,7 +109,7 @@ set80211priv(struct madwifi_driver_data
|
||||
int do_inline = len < IFNAMSIZ;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
#ifdef IEEE80211_IOCTL_FILTERFRAME
|
||||
/* FILTERFRAME must be NOT inline, regardless of size. */
|
||||
if (op == IEEE80211_IOCTL_FILTERFRAME)
|
||||
@@ -206,7 +210,7 @@ set80211param(struct madwifi_driver_data
|
||||
struct iwreq iwr;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.mode = op;
|
||||
memcpy(iwr.u.name+sizeof(__u32), &arg, sizeof(arg));
|
||||
|
||||
@@ -233,6 +237,7 @@ ether_sprintf(const u8 *addr)
|
||||
}
|
||||
#endif /* CONFIG_NO_STDOUT_DEBUG */
|
||||
|
||||
+#ifdef HOSTAPD
|
||||
/*
|
||||
* Configure WPA parameters.
|
||||
*/
|
||||
@@ -395,7 +400,7 @@ madwifi_sta_set_flags(void *priv, const
|
||||
return madwifi_set_sta_authorized(priv, addr, 0);
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
+#endif /* HOSTAPD */
|
||||
static int
|
||||
madwifi_del_key(void *priv, const u8 *addr, int key_idx)
|
||||
{
|
||||
@@ -407,28 +412,20 @@ madwifi_del_key(void *priv, const u8 *ad
|
||||
__func__, ether_sprintf(addr), key_idx);
|
||||
|
||||
memset(&wk, 0, sizeof(wk));
|
||||
+ wk.idk_keyix = key_idx;
|
||||
if (addr != NULL) {
|
||||
memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
- wk.idk_keyix = (u8) IEEE80211_KEYIX_NONE;
|
||||
- } else {
|
||||
- wk.idk_keyix = key_idx;
|
||||
- }
|
||||
-
|
||||
- ret = set80211priv(drv, IEEE80211_IOCTL_DELKEY, &wk, sizeof(wk));
|
||||
- if (ret < 0) {
|
||||
- wpa_printf(MSG_DEBUG, "%s: Failed to delete key (addr %s"
|
||||
- " key_idx %d)", __func__, ether_sprintf(addr),
|
||||
- key_idx);
|
||||
}
|
||||
|
||||
- return ret;
|
||||
+ set80211priv(drv, IEEE80211_IOCTL_DELKEY, &wk, sizeof(wk));
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
-wpa_driver_madwifi_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)
|
||||
+madwifi_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 madwifi_driver_data *drv = priv;
|
||||
struct ieee80211req_key wk;
|
||||
@@ -466,6 +463,9 @@ wpa_driver_madwifi_set_key(const char *i
|
||||
memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
|
||||
wk.ik_keyix = key_idx;
|
||||
wk.ik_flags |= IEEE80211_KEY_DEFAULT;
|
||||
+ } else if (!memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) {
|
||||
+ wk.ik_flags |= IEEE80211_KEY_GROUP;
|
||||
+ memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
} else {
|
||||
memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
wk.ik_keyix = IEEE80211_KEYIX_NONE;
|
||||
@@ -485,6 +485,7 @@ wpa_driver_madwifi_set_key(const char *i
|
||||
}
|
||||
|
||||
|
||||
+#ifdef HOSTAPD
|
||||
static int
|
||||
madwifi_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx,
|
||||
u8 *seq)
|
||||
@@ -591,7 +592,7 @@ madwifi_read_sta_driver_data(void *priv,
|
||||
|
||||
memset(data, 0, sizeof(*data));
|
||||
snprintf(buf, sizeof(buf), "/proc/net/madwifi/%s/" MACSTR,
|
||||
- drv->iface, MAC2STR(addr));
|
||||
+ drv->ifname, MAC2STR(addr));
|
||||
|
||||
f = fopen(buf, "r");
|
||||
if (!f) {
|
||||
@@ -759,7 +760,7 @@ static int madwifi_receive_probe_req(str
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- drv->sock_raw = l2_packet_init(drv->iface, NULL, ETH_P_80211_RAW,
|
||||
+ drv->sock_raw = l2_packet_init(drv->ifname, NULL, ETH_P_80211_RAW,
|
||||
madwifi_raw_receive, drv, 1);
|
||||
if (drv->sock_raw == NULL)
|
||||
return -1;
|
||||
@@ -812,7 +813,7 @@ static int madwifi_set_freq(void *priv,
|
||||
struct iwreq iwr;
|
||||
|
||||
os_memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.freq.m = freq->channel;
|
||||
iwr.u.freq.e = 0;
|
||||
|
||||
@@ -1037,7 +1038,7 @@ madwifi_get_we_version(struct madwifi_dr
|
||||
return -1;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.data.pointer = (caddr_t) range;
|
||||
iwr.u.data.length = buflen;
|
||||
|
||||
@@ -1154,17 +1155,17 @@ madwifi_init(struct hostapd_data *hapd,
|
||||
perror("socket[PF_INET,SOCK_DGRAM]");
|
||||
goto bad;
|
||||
}
|
||||
- memcpy(drv->iface, params->ifname, sizeof(drv->iface));
|
||||
+ memcpy(drv->ifname, params->ifname, sizeof(drv->ifname));
|
||||
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
- os_strlcpy(ifr.ifr_name, drv->iface, sizeof(ifr.ifr_name));
|
||||
+ os_strlcpy(ifr.ifr_name, drv->ifname, sizeof(ifr.ifr_name));
|
||||
if (ioctl(drv->ioctl_sock, SIOCGIFINDEX, &ifr) != 0) {
|
||||
perror("ioctl(SIOCGIFINDEX)");
|
||||
goto bad;
|
||||
}
|
||||
drv->ifindex = ifr.ifr_ifindex;
|
||||
|
||||
- drv->sock_xmit = l2_packet_init(drv->iface, NULL, ETH_P_EAPOL,
|
||||
+ drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
|
||||
handle_read, drv, 1);
|
||||
if (drv->sock_xmit == NULL)
|
||||
goto bad;
|
||||
@@ -1178,7 +1179,7 @@ madwifi_init(struct hostapd_data *hapd,
|
||||
1);
|
||||
if (drv->sock_recv == NULL)
|
||||
goto bad;
|
||||
- } else if (linux_br_get(brname, drv->iface) == 0) {
|
||||
+ } else if (linux_br_get(brname, drv->ifname) == 0) {
|
||||
wpa_printf(MSG_DEBUG, "Interface in bridge %s; configure for "
|
||||
"EAPOL receive", brname);
|
||||
drv->sock_recv = l2_packet_init(brname, NULL, ETH_P_EAPOL,
|
||||
@@ -1189,7 +1190,7 @@ madwifi_init(struct hostapd_data *hapd,
|
||||
drv->sock_recv = drv->sock_xmit;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
|
||||
iwr.u.mode = IW_MODE_MASTER;
|
||||
|
||||
@@ -1200,7 +1201,7 @@ madwifi_init(struct hostapd_data *hapd,
|
||||
}
|
||||
|
||||
/* mark down during setup */
|
||||
- linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
|
||||
+ linux_set_iface_flags(drv->ioctl_sock, drv->ifname, 0);
|
||||
madwifi_set_privacy(drv, 0); /* default to no privacy */
|
||||
|
||||
madwifi_receive_probe_req(drv);
|
||||
@@ -1226,7 +1227,7 @@ madwifi_deinit(void *priv)
|
||||
struct madwifi_driver_data *drv = priv;
|
||||
|
||||
netlink_deinit(drv->netlink);
|
||||
- (void) linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0);
|
||||
+ (void) linux_set_iface_flags(drv->ioctl_sock, drv->ifname, 0);
|
||||
if (drv->ioctl_sock >= 0)
|
||||
close(drv->ioctl_sock);
|
||||
if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)
|
||||
@@ -1245,7 +1246,7 @@ madwifi_set_ssid(void *priv, const u8 *b
|
||||
struct iwreq iwr;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.essid.flags = 1; /* SSID active */
|
||||
iwr.u.essid.pointer = (caddr_t) buf;
|
||||
iwr.u.essid.length = len + 1;
|
||||
@@ -1266,7 +1267,7 @@ madwifi_get_ssid(void *priv, u8 *buf, in
|
||||
int ret = 0;
|
||||
|
||||
memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->iface, IFNAMSIZ);
|
||||
+ os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
iwr.u.essid.pointer = (caddr_t) buf;
|
||||
iwr.u.essid.length = len;
|
||||
|
||||
@@ -1291,140 +1292,19 @@ static int
|
||||
madwifi_commit(void *priv)
|
||||
{
|
||||
struct madwifi_driver_data *drv = priv;
|
||||
- return linux_set_iface_flags(drv->ioctl_sock, drv->iface, 1);
|
||||
+ return linux_set_iface_flags(drv->ioctl_sock, drv->ifname, 1);
|
||||
}
|
||||
|
||||
-#else /* HOSTAPD */
|
||||
+#endif /* HOSTAPD */
|
||||
|
||||
-struct wpa_driver_madwifi_data {
|
||||
- void *wext; /* private data for driver_wext */
|
||||
- void *ctx;
|
||||
- char ifname[IFNAMSIZ + 1];
|
||||
- int sock;
|
||||
-};
|
||||
+#if !defined(NO_SUPPLICANT)
|
||||
|
||||
static int wpa_driver_madwifi_set_auth_alg(void *priv, int auth_alg);
|
||||
static int wpa_driver_madwifi_set_probe_req_ie(void *priv, const u8 *ies,
|
||||
size_t ies_len);
|
||||
|
||||
-
|
||||
-static int
|
||||
-set80211priv(struct wpa_driver_madwifi_data *drv, int op, void *data, int len,
|
||||
- int show_err)
|
||||
-{
|
||||
- struct iwreq iwr;
|
||||
-
|
||||
- os_memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
- if (len < IFNAMSIZ &&
|
||||
- op != IEEE80211_IOCTL_SET_APPIEBUF) {
|
||||
- /*
|
||||
- * Argument data fits inline; put it there.
|
||||
- */
|
||||
- os_memcpy(iwr.u.name, data, len);
|
||||
- } else {
|
||||
- /*
|
||||
- * Argument data too big for inline transfer; setup a
|
||||
- * parameter block instead; the kernel will transfer
|
||||
- * the data for the driver.
|
||||
- */
|
||||
- iwr.u.data.pointer = data;
|
||||
- iwr.u.data.length = len;
|
||||
- }
|
||||
-
|
||||
- if (ioctl(drv->sock, op, &iwr) < 0) {
|
||||
- if (show_err) {
|
||||
-#ifdef MADWIFI_NG
|
||||
- int first = IEEE80211_IOCTL_SETPARAM;
|
||||
- int last = IEEE80211_IOCTL_KICKMAC;
|
||||
- static const char *opnames[] = {
|
||||
- "ioctl[IEEE80211_IOCTL_SETPARAM]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETPARAM]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETMODE]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETMODE]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETWMMPARAMS]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETWMMPARAMS]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETCHANLIST]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETCHANLIST]",
|
||||
- "ioctl[IEEE80211_IOCTL_CHANSWITCH]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_SET_APPIEBUF]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETSCANRESULTS]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_GETCHANINFO]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETOPTIE]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETOPTIE]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETMLME]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_SETKEY]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_DELKEY]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_ADDMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_DELMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_WDSMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_WDSDELMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_KICKMAC]",
|
||||
- };
|
||||
-#else /* MADWIFI_NG */
|
||||
- int first = IEEE80211_IOCTL_SETPARAM;
|
||||
- int last = IEEE80211_IOCTL_CHANLIST;
|
||||
- static const char *opnames[] = {
|
||||
- "ioctl[IEEE80211_IOCTL_SETPARAM]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETPARAM]",
|
||||
- "ioctl[IEEE80211_IOCTL_SETKEY]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETKEY]",
|
||||
- "ioctl[IEEE80211_IOCTL_DELKEY]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_SETMLME]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_SETOPTIE]",
|
||||
- "ioctl[IEEE80211_IOCTL_GETOPTIE]",
|
||||
- "ioctl[IEEE80211_IOCTL_ADDMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_DELMAC]",
|
||||
- NULL,
|
||||
- "ioctl[IEEE80211_IOCTL_CHANLIST]",
|
||||
- };
|
||||
-#endif /* MADWIFI_NG */
|
||||
- int idx = op - first;
|
||||
- if (first <= op && op <= last &&
|
||||
- idx < (int) (sizeof(opnames) / sizeof(opnames[0]))
|
||||
- && opnames[idx])
|
||||
- perror(opnames[idx]);
|
||||
- else
|
||||
- perror("ioctl[unknown???]");
|
||||
- }
|
||||
- return -1;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
static int
|
||||
-set80211param(struct wpa_driver_madwifi_data *drv, int op, int arg,
|
||||
- int show_err)
|
||||
-{
|
||||
- struct iwreq iwr;
|
||||
-
|
||||
- os_memset(&iwr, 0, sizeof(iwr));
|
||||
- os_strlcpy(iwr.ifr_name, drv->ifname, IFNAMSIZ);
|
||||
- iwr.u.mode = op;
|
||||
- os_memcpy(iwr.u.name+sizeof(u32), &arg, sizeof(arg));
|
||||
-
|
||||
- if (ioctl(drv->sock, IEEE80211_IOCTL_SETPARAM, &iwr) < 0) {
|
||||
- if (show_err)
|
||||
- perror("ioctl[IEEE80211_IOCTL_SETPARAM]");
|
||||
- return -1;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
-wpa_driver_madwifi_set_wpa_ie(struct wpa_driver_madwifi_data *drv,
|
||||
+wpa_driver_madwifi_set_wpa_ie(struct madwifi_driver_data *drv,
|
||||
const u8 *wpa_ie, size_t wpa_ie_len)
|
||||
{
|
||||
struct iwreq iwr;
|
||||
@@ -1435,7 +1315,7 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
||||
iwr.u.data.pointer = (void *) wpa_ie;
|
||||
iwr.u.data.length = wpa_ie_len;
|
||||
|
||||
- if (ioctl(drv->sock, IEEE80211_IOCTL_SETOPTIE, &iwr) < 0) {
|
||||
+ if (ioctl(drv->ioctl_sock, IEEE80211_IOCTL_SETOPTIE, &iwr) < 0) {
|
||||
perror("ioctl[IEEE80211_IOCTL_SETOPTIE]");
|
||||
return -1;
|
||||
}
|
||||
@@ -1443,157 +1323,51 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
||||
}
|
||||
|
||||
static int
|
||||
-wpa_driver_madwifi_del_key(struct wpa_driver_madwifi_data *drv, int key_idx,
|
||||
- const u8 *addr)
|
||||
-{
|
||||
- struct ieee80211req_del_key wk;
|
||||
-
|
||||
- wpa_printf(MSG_DEBUG, "%s: keyidx=%d", __FUNCTION__, key_idx);
|
||||
- os_memset(&wk, 0, sizeof(wk));
|
||||
- wk.idk_keyix = key_idx;
|
||||
- if (addr != NULL)
|
||||
- os_memcpy(wk.idk_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
-
|
||||
- return set80211priv(drv, IEEE80211_IOCTL_DELKEY, &wk, sizeof(wk), 1);
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
-wpa_driver_madwifi_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_madwifi_data *drv = priv;
|
||||
- struct ieee80211req_key wk;
|
||||
- char *alg_name;
|
||||
- u_int8_t cipher;
|
||||
-
|
||||
- if (alg == WPA_ALG_NONE)
|
||||
- return wpa_driver_madwifi_del_key(drv, key_idx, addr);
|
||||
-
|
||||
- switch (alg) {
|
||||
- case WPA_ALG_WEP:
|
||||
- if (addr == NULL || os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
|
||||
- ETH_ALEN) == 0) {
|
||||
- /*
|
||||
- * madwifi did not seem to like static WEP key
|
||||
- * configuration with IEEE80211_IOCTL_SETKEY, so use
|
||||
- * Linux wireless extensions ioctl for this.
|
||||
- */
|
||||
- return wpa_driver_wext_set_key(ifname, drv->wext, alg,
|
||||
- addr, key_idx, set_tx,
|
||||
- seq, seq_len,
|
||||
- key, key_len);
|
||||
- }
|
||||
- alg_name = "WEP";
|
||||
- cipher = IEEE80211_CIPHER_WEP;
|
||||
- break;
|
||||
- case WPA_ALG_TKIP:
|
||||
- alg_name = "TKIP";
|
||||
- cipher = IEEE80211_CIPHER_TKIP;
|
||||
- break;
|
||||
- case WPA_ALG_CCMP:
|
||||
- alg_name = "CCMP";
|
||||
- cipher = IEEE80211_CIPHER_AES_CCM;
|
||||
- break;
|
||||
- default:
|
||||
- wpa_printf(MSG_DEBUG, "%s: unknown/unsupported algorithm %d",
|
||||
- __FUNCTION__, alg);
|
||||
- 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 > sizeof(u_int64_t)) {
|
||||
- wpa_printf(MSG_DEBUG, "%s: seq_len %lu too big",
|
||||
- __FUNCTION__, (unsigned long) seq_len);
|
||||
- return -2;
|
||||
- }
|
||||
- if (key_len > sizeof(wk.ik_keydata)) {
|
||||
- wpa_printf(MSG_DEBUG, "%s: key length %lu too big",
|
||||
- __FUNCTION__, (unsigned long) key_len);
|
||||
- return -3;
|
||||
- }
|
||||
-
|
||||
- os_memset(&wk, 0, sizeof(wk));
|
||||
- wk.ik_type = cipher;
|
||||
- wk.ik_flags = IEEE80211_KEY_RECV;
|
||||
- if (addr == NULL ||
|
||||
- os_memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) == 0)
|
||||
- wk.ik_flags |= IEEE80211_KEY_GROUP;
|
||||
- if (set_tx) {
|
||||
- wk.ik_flags |= IEEE80211_KEY_XMIT | IEEE80211_KEY_DEFAULT;
|
||||
- os_memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
- } else
|
||||
- os_memset(wk.ik_macaddr, 0, IEEE80211_ADDR_LEN);
|
||||
- wk.ik_keyix = key_idx;
|
||||
- wk.ik_keylen = key_len;
|
||||
-#ifdef WORDS_BIGENDIAN
|
||||
- if (seq) {
|
||||
- size_t i;
|
||||
- u8 tmp[WPA_KEY_RSC_LEN];
|
||||
- os_memset(tmp, 0, sizeof(tmp));
|
||||
- for (i = 0; i < seq_len; i++)
|
||||
- tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
|
||||
- os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
|
||||
- }
|
||||
-#else /* WORDS_BIGENDIAN */
|
||||
- if (seq)
|
||||
- os_memcpy(&wk.ik_keyrsc, seq, seq_len);
|
||||
-#endif /* WORDS_BIGENDIAN */
|
||||
- os_memcpy(wk.ik_keydata, key, key_len);
|
||||
-
|
||||
- return set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk), 1);
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
wpa_driver_madwifi_set_countermeasures(void *priv, int enabled)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled);
|
||||
- return set80211param(drv, IEEE80211_PARAM_COUNTERMEASURES, enabled, 1);
|
||||
+ return set80211param(drv, IEEE80211_PARAM_COUNTERMEASURES, enabled);
|
||||
}
|
||||
|
||||
static int
|
||||
wpa_driver_madwifi_deauthenticate(void *priv, const u8 *addr, int reason_code)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
struct ieee80211req_mlme mlme;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
|
||||
mlme.im_op = IEEE80211_MLME_DEAUTH;
|
||||
mlme.im_reason = reason_code;
|
||||
os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
- return set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme, sizeof(mlme), 1);
|
||||
+ return set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme, sizeof(mlme));
|
||||
}
|
||||
|
||||
static int
|
||||
wpa_driver_madwifi_disassociate(void *priv, const u8 *addr, int reason_code)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
struct ieee80211req_mlme mlme;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
|
||||
mlme.im_op = IEEE80211_MLME_DISASSOC;
|
||||
mlme.im_reason = reason_code;
|
||||
os_memcpy(mlme.im_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
- return set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme, sizeof(mlme), 1);
|
||||
+ return set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme, sizeof(mlme));
|
||||
}
|
||||
|
||||
static int
|
||||
wpa_driver_madwifi_associate(void *priv,
|
||||
struct wpa_driver_associate_params *params)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
struct ieee80211req_mlme mlme;
|
||||
int ret = 0, privacy = 1;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "%s", __FUNCTION__);
|
||||
|
||||
if (set80211param(drv, IEEE80211_PARAM_DROPUNENCRYPTED,
|
||||
- params->drop_unencrypted, 1) < 0)
|
||||
+ params->drop_unencrypted) < 0)
|
||||
ret = -1;
|
||||
if (wpa_driver_madwifi_set_auth_alg(drv, params->auth_alg) < 0)
|
||||
ret = -1;
|
||||
@@ -1616,12 +1390,12 @@ wpa_driver_madwifi_associate(void *priv,
|
||||
params->wpa_ie_len == 0)
|
||||
privacy = 0;
|
||||
|
||||
- if (set80211param(drv, IEEE80211_PARAM_PRIVACY, privacy, 1) < 0)
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_PRIVACY, privacy) < 0)
|
||||
ret = -1;
|
||||
|
||||
if (params->wpa_ie_len &&
|
||||
set80211param(drv, IEEE80211_PARAM_WPA,
|
||||
- params->wpa_ie[0] == WLAN_EID_RSN ? 2 : 1, 1) < 0)
|
||||
+ params->wpa_ie[0] == WLAN_EID_RSN ? 2 : 1) < 0)
|
||||
ret = -1;
|
||||
|
||||
if (params->bssid == NULL) {
|
||||
@@ -1629,14 +1403,14 @@ wpa_driver_madwifi_associate(void *priv,
|
||||
* roaming */
|
||||
/* FIX: this does not seem to work; would probably need to
|
||||
* change something in the driver */
|
||||
- if (set80211param(drv, IEEE80211_PARAM_ROAMING, 0, 1) < 0)
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_ROAMING, 0) < 0)
|
||||
ret = -1;
|
||||
|
||||
if (wpa_driver_wext_set_ssid(drv->wext, params->ssid,
|
||||
params->ssid_len) < 0)
|
||||
ret = -1;
|
||||
} else {
|
||||
- if (set80211param(drv, IEEE80211_PARAM_ROAMING, 2, 1) < 0)
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_ROAMING, 2) < 0)
|
||||
ret = -1;
|
||||
if (wpa_driver_wext_set_ssid(drv->wext, params->ssid,
|
||||
params->ssid_len) < 0)
|
||||
@@ -1645,7 +1419,7 @@ wpa_driver_madwifi_associate(void *priv,
|
||||
mlme.im_op = IEEE80211_MLME_ASSOC;
|
||||
os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);
|
||||
if (set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme,
|
||||
- sizeof(mlme), 1) < 0) {
|
||||
+ sizeof(mlme)) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: SETMLME[ASSOC] failed",
|
||||
__func__);
|
||||
ret = -1;
|
||||
@@ -1658,7 +1432,7 @@ wpa_driver_madwifi_associate(void *priv,
|
||||
static int
|
||||
wpa_driver_madwifi_set_auth_alg(void *priv, int auth_alg)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
int authmode;
|
||||
|
||||
if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
|
||||
@@ -1669,13 +1443,13 @@ wpa_driver_madwifi_set_auth_alg(void *pr
|
||||
else
|
||||
authmode = IEEE80211_AUTH_OPEN;
|
||||
|
||||
- return set80211param(drv, IEEE80211_PARAM_AUTHMODE, authmode, 1);
|
||||
+ return set80211param(drv, IEEE80211_PARAM_AUTHMODE, authmode);
|
||||
}
|
||||
|
||||
static int
|
||||
wpa_driver_madwifi_scan(void *priv, struct wpa_driver_scan_params *params)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
struct iwreq iwr;
|
||||
int ret = 0;
|
||||
const u8 *ssid = params->ssids[0].ssid;
|
||||
@@ -1693,7 +1467,7 @@ wpa_driver_madwifi_scan(void *priv, stru
|
||||
if (wpa_driver_wext_set_ssid(drv->wext, ssid, ssid_len) < 0)
|
||||
ret = -1;
|
||||
|
||||
- if (ioctl(drv->sock, SIOCSIWSCAN, &iwr) < 0) {
|
||||
+ if (ioctl(drv->ioctl_sock, SIOCSIWSCAN, &iwr) < 0) {
|
||||
perror("ioctl[SIOCSIWSCAN]");
|
||||
ret = -1;
|
||||
}
|
||||
@@ -1715,14 +1489,14 @@ wpa_driver_madwifi_scan(void *priv, stru
|
||||
|
||||
static int wpa_driver_madwifi_get_bssid(void *priv, u8 *bssid)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
return wpa_driver_wext_get_bssid(drv->wext, bssid);
|
||||
}
|
||||
|
||||
|
||||
static int wpa_driver_madwifi_get_ssid(void *priv, u8 *ssid)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
return wpa_driver_wext_get_ssid(drv->wext, ssid);
|
||||
}
|
||||
|
||||
@@ -1730,14 +1504,16 @@ static int wpa_driver_madwifi_get_ssid(v
|
||||
static struct wpa_scan_results *
|
||||
wpa_driver_madwifi_get_scan_results(void *priv)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
return wpa_driver_wext_get_scan_results(drv->wext);
|
||||
}
|
||||
|
||||
|
||||
static int wpa_driver_madwifi_set_operstate(void *priv, int state)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
+ if (!drv->wext)
|
||||
+ return 0;
|
||||
return wpa_driver_wext_set_operstate(drv->wext, state);
|
||||
}
|
||||
|
||||
@@ -1758,7 +1534,7 @@ static int wpa_driver_madwifi_set_probe_
|
||||
|
||||
ret = set80211priv(priv, IEEE80211_IOCTL_SET_APPIEBUF, probe_req_ie,
|
||||
sizeof(struct ieee80211req_getset_appiebuf) +
|
||||
- ies_len, 1);
|
||||
+ ies_len);
|
||||
|
||||
os_free(probe_req_ie);
|
||||
|
||||
@@ -1768,7 +1544,7 @@ static int wpa_driver_madwifi_set_probe_
|
||||
|
||||
static void * wpa_driver_madwifi_init(void *ctx, const char *ifname)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv;
|
||||
+ struct madwifi_driver_data *drv;
|
||||
|
||||
drv = os_zalloc(sizeof(*drv));
|
||||
if (drv == NULL)
|
||||
@@ -1779,17 +1555,17 @@ static void * wpa_driver_madwifi_init(vo
|
||||
|
||||
drv->ctx = ctx;
|
||||
os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
|
||||
- drv->sock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
- if (drv->sock < 0)
|
||||
+ drv->ioctl_sock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
+ if (drv->ioctl_sock < 0)
|
||||
goto fail2;
|
||||
|
||||
- if (set80211param(drv, IEEE80211_PARAM_ROAMING, 2, 1) < 0) {
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_ROAMING, 2) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to set wpa_supplicant-based "
|
||||
"roaming", __FUNCTION__);
|
||||
goto fail3;
|
||||
}
|
||||
|
||||
- if (set80211param(drv, IEEE80211_PARAM_WPA, 3, 1) < 0) {
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_WPA, 3) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to enable WPA support",
|
||||
__FUNCTION__);
|
||||
goto fail3;
|
||||
@@ -1798,7 +1574,7 @@ static void * wpa_driver_madwifi_init(vo
|
||||
return drv;
|
||||
|
||||
fail3:
|
||||
- close(drv->sock);
|
||||
+ close(drv->ioctl_sock);
|
||||
fail2:
|
||||
wpa_driver_wext_deinit(drv->wext);
|
||||
fail:
|
||||
@@ -1809,38 +1585,37 @@ fail:
|
||||
|
||||
static void wpa_driver_madwifi_deinit(void *priv)
|
||||
{
|
||||
- struct wpa_driver_madwifi_data *drv = priv;
|
||||
+ struct madwifi_driver_data *drv = priv;
|
||||
|
||||
if (wpa_driver_madwifi_set_wpa_ie(drv, NULL, 0) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to clear WPA IE",
|
||||
__FUNCTION__);
|
||||
}
|
||||
- if (set80211param(drv, IEEE80211_PARAM_ROAMING, 0, 1) < 0) {
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_ROAMING, 0) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to enable driver-based "
|
||||
"roaming", __FUNCTION__);
|
||||
}
|
||||
- if (set80211param(drv, IEEE80211_PARAM_PRIVACY, 0, 1) < 0) {
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_PRIVACY, 0) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to disable forced Privacy "
|
||||
"flag", __FUNCTION__);
|
||||
}
|
||||
- if (set80211param(drv, IEEE80211_PARAM_WPA, 0, 1) < 0) {
|
||||
+ if (set80211param(drv, IEEE80211_PARAM_WPA, 0) < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: failed to disable WPA",
|
||||
__FUNCTION__);
|
||||
}
|
||||
|
||||
wpa_driver_wext_deinit(drv->wext);
|
||||
|
||||
- close(drv->sock);
|
||||
+ close(drv->ioctl_sock);
|
||||
os_free(drv);
|
||||
}
|
||||
|
||||
-#endif /* HOSTAPD */
|
||||
-
|
||||
+#endif
|
||||
|
||||
const struct wpa_driver_ops wpa_driver_madwifi_ops = {
|
||||
.name = "madwifi",
|
||||
.desc = "MADWIFI 802.11 support (Atheros, etc.)",
|
||||
- .set_key = wpa_driver_madwifi_set_key,
|
||||
+ .set_key = madwifi_set_key,
|
||||
#ifdef HOSTAPD
|
||||
.hapd_init = madwifi_init,
|
||||
.hapd_deinit = madwifi_deinit,
|
||||
@@ -1861,7 +1636,8 @@ const struct wpa_driver_ops wpa_driver_m
|
||||
.commit = madwifi_commit,
|
||||
.set_ap_wps_ie = madwifi_set_ap_wps_ie,
|
||||
.set_freq = madwifi_set_freq,
|
||||
-#else /* HOSTAPD */
|
||||
+#endif /* HOSTAPD */
|
||||
+#if !defined(NO_SUPPLICANT)
|
||||
.get_bssid = wpa_driver_madwifi_get_bssid,
|
||||
.get_ssid = wpa_driver_madwifi_get_ssid,
|
||||
.init = wpa_driver_madwifi_init,
|
||||
@@ -1873,5 +1649,5 @@ const struct wpa_driver_ops wpa_driver_m
|
||||
.disassociate = wpa_driver_madwifi_disassociate,
|
||||
.associate = wpa_driver_madwifi_associate,
|
||||
.set_operstate = wpa_driver_madwifi_set_operstate,
|
||||
-#endif /* HOSTAPD */
|
||||
+#endif
|
||||
};
|
||||
--- a/src/drivers/drivers.mak
|
||||
+++ b/src/drivers/drivers.mak
|
||||
@@ -144,8 +144,8 @@ DRV_WPA_OBJS += ../src/drivers/driver_ro
|
||||
endif
|
||||
|
||||
ifdef CONFIG_WIRELESS_EXTENSION
|
||||
-DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
|
||||
-DRV_WPA_OBJS += ../src/drivers/driver_wext.o
|
||||
+DRV_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
|
||||
+DRV_OBJS += ../src/drivers/driver_wext.o
|
||||
NEED_RFKILL=y
|
||||
endif
|
||||
|
@ -0,0 +1,50 @@
|
||||
--- a/src/drivers/driver_madwifi.c
|
||||
+++ b/src/drivers/driver_madwifi.c
|
||||
@@ -439,8 +439,14 @@ wpa_driver_madwifi_set_key(const char *i
|
||||
wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%s key_idx=%d",
|
||||
__func__, alg, ether_sprintf(addr), key_idx);
|
||||
|
||||
- if (alg == WPA_ALG_WEP)
|
||||
+ if (alg == WPA_ALG_WEP) {
|
||||
cipher = IEEE80211_CIPHER_WEP;
|
||||
+ if ((!addr || !memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) &&
|
||||
+ drv->wext)
|
||||
+ return wpa_driver_wext_set_key(ifname, drv->wext, alg, addr,
|
||||
+ key_idx, set_tx, seq, seq_len,
|
||||
+ key, key_len);
|
||||
+ }
|
||||
else if (alg == WPA_ALG_TKIP)
|
||||
cipher = IEEE80211_CIPHER_TKIP;
|
||||
else if (alg == WPA_ALG_CCMP)
|
||||
@@ -459,7 +465,9 @@ wpa_driver_madwifi_set_key(const char *i
|
||||
|
||||
memset(&wk, 0, sizeof(wk));
|
||||
wk.ik_type = cipher;
|
||||
- wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT;
|
||||
+ wk.ik_flags = IEEE80211_KEY_RECV;
|
||||
+ if (set_tx)
|
||||
+ wk.ik_flags |= IEEE80211_KEY_XMIT;
|
||||
if (addr == NULL || is_broadcast_ether_addr(addr)) {
|
||||
memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
|
||||
wk.ik_keyix = key_idx;
|
||||
@@ -471,6 +479,20 @@ wpa_driver_madwifi_set_key(const char *i
|
||||
wk.ik_keylen = key_len;
|
||||
memcpy(wk.ik_keydata, key, key_len);
|
||||
|
||||
+#ifdef WORDS_BIGENDIAN
|
||||
+#define WPA_KEY_RSC_LEN 8
|
||||
+ {
|
||||
+ size_t i;
|
||||
+ u8 tmp[WPA_KEY_RSC_LEN];
|
||||
+ os_memset(tmp, 0, sizeof(tmp));
|
||||
+ for (i = 0; i < seq_len; i++)
|
||||
+ tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
|
||||
+ os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
|
||||
+ }
|
||||
+#else /* WORDS_BIGENDIAN */
|
||||
+ os_memcpy(&wk.ik_keyrsc, seq, seq_len);
|
||||
+#endif /* WORDS_BIGENDIAN */
|
||||
+
|
||||
ret = set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk));
|
||||
if (ret < 0) {
|
||||
wpa_printf(MSG_DEBUG, "%s: Failed to set key (addr %s"
|
@ -1,76 +0,0 @@
|
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -2289,6 +2289,7 @@ static void * wpa_driver_nl80211_init(vo
|
||||
drv->monitor_ifidx = -1;
|
||||
drv->monitor_sock = -1;
|
||||
drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
|
||||
+ drv->nlmode = NL80211_IFTYPE_STATION;
|
||||
|
||||
if (wpa_driver_nl80211_init_nl(drv)) {
|
||||
os_free(drv);
|
||||
@@ -2446,37 +2447,37 @@ wpa_driver_nl80211_finish_drv_init(struc
|
||||
drv->ifindex = if_nametoindex(bss->ifname);
|
||||
drv->first_bss.ifindex = drv->ifindex;
|
||||
|
||||
-#ifndef HOSTAPD
|
||||
- /*
|
||||
- * Make sure the interface starts up in station mode unless this is a
|
||||
- * dynamically added interface (e.g., P2P) that was already configured
|
||||
- * with proper iftype.
|
||||
- */
|
||||
- if ((drv->global == NULL ||
|
||||
- drv->ifindex != drv->global->if_add_ifindex) &&
|
||||
- wpa_driver_nl80211_set_mode(bss, NL80211_IFTYPE_STATION) < 0) {
|
||||
- wpa_printf(MSG_ERROR, "nl80211: Could not configure driver to "
|
||||
- "use managed mode");
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1)) {
|
||||
- if (rfkill_is_blocked(drv->rfkill)) {
|
||||
- wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable "
|
||||
- "interface '%s' due to rfkill",
|
||||
- bss->ifname);
|
||||
- drv->if_disabled = 1;
|
||||
- send_rfkill_event = 1;
|
||||
- } else {
|
||||
- wpa_printf(MSG_ERROR, "nl80211: Could not set "
|
||||
- "interface '%s' UP", bss->ifname);
|
||||
+ if (drv->nlmode == NL80211_IFTYPE_STATION) {
|
||||
+ /*
|
||||
+ * Make sure the interface starts up in station mode unless this is a
|
||||
+ * dynamically added interface (e.g., P2P) that was already configured
|
||||
+ * with proper iftype.
|
||||
+ */
|
||||
+ if ((drv->global == NULL ||
|
||||
+ drv->ifindex != drv->global->if_add_ifindex) &&
|
||||
+ wpa_driver_nl80211_set_mode(bss, NL80211_IFTYPE_STATION) < 0) {
|
||||
+ wpa_printf(MSG_ERROR, "nl80211: Could not configure driver to "
|
||||
+ "use managed mode");
|
||||
return -1;
|
||||
}
|
||||
- }
|
||||
|
||||
- netlink_send_oper_ifla(drv->global->netlink, drv->ifindex,
|
||||
- 1, IF_OPER_DORMANT);
|
||||
-#endif /* HOSTAPD */
|
||||
+ if (linux_set_iface_flags(drv->global->ioctl_sock, bss->ifname, 1)) {
|
||||
+ if (rfkill_is_blocked(drv->rfkill)) {
|
||||
+ wpa_printf(MSG_DEBUG, "nl80211: Could not yet enable "
|
||||
+ "interface '%s' due to rfkill",
|
||||
+ bss->ifname);
|
||||
+ drv->if_disabled = 1;
|
||||
+ send_rfkill_event = 1;
|
||||
+ } else {
|
||||
+ wpa_printf(MSG_ERROR, "nl80211: Could not set "
|
||||
+ "interface '%s' UP", bss->ifname);
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ netlink_send_oper_ifla(drv->global->netlink, drv->ifindex,
|
||||
+ 1, IF_OPER_DORMANT);
|
||||
+ }
|
||||
|
||||
if (wpa_driver_nl80211_capa(drv))
|
||||
return -1;
|
@ -1,69 +0,0 @@
|
||||
--- a/src/drivers/driver_madwifi.c
|
||||
+++ b/src/drivers/driver_madwifi.c
|
||||
@@ -439,7 +439,11 @@ madwifi_set_key(const char *ifname, void
|
||||
__func__, alg, ether_sprintf(addr), key_idx);
|
||||
|
||||
if (alg == WPA_ALG_WEP)
|
||||
+ {
|
||||
cipher = IEEE80211_CIPHER_WEP;
|
||||
+ if ((!addr || !memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) && drv->wext)
|
||||
+ return wpa_driver_wext_set_key(ifname, drv->wext, alg, addr, key_idx, set_tx, seq, seq_len, key, key_len);
|
||||
+ }
|
||||
else if (alg == WPA_ALG_TKIP)
|
||||
cipher = IEEE80211_CIPHER_TKIP;
|
||||
else if (alg == WPA_ALG_CCMP)
|
||||
@@ -458,20 +462,45 @@ madwifi_set_key(const char *ifname, void
|
||||
|
||||
memset(&wk, 0, sizeof(wk));
|
||||
wk.ik_type = cipher;
|
||||
- wk.ik_flags = IEEE80211_KEY_RECV | IEEE80211_KEY_XMIT;
|
||||
- if (addr == NULL || is_broadcast_ether_addr(addr)) {
|
||||
- memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
|
||||
+ wk.ik_flags = IEEE80211_KEY_RECV;
|
||||
+ if (set_tx)
|
||||
+ wk.ik_flags |= IEEE80211_KEY_XMIT;
|
||||
+ if (addr == NULL) {
|
||||
+ os_memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
|
||||
wk.ik_keyix = key_idx;
|
||||
- wk.ik_flags |= IEEE80211_KEY_DEFAULT;
|
||||
- } else if (!memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN)) {
|
||||
- wk.ik_flags |= IEEE80211_KEY_GROUP;
|
||||
- memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
} else {
|
||||
- memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
- wk.ik_keyix = IEEE80211_KEYIX_NONE;
|
||||
+ os_memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN);
|
||||
+ /*
|
||||
+ * Deduce whether group/global or unicast key by checking
|
||||
+ * the address (yech). Note also that we can only mark global
|
||||
+ * keys default; doing this for a unicast key is an error.
|
||||
+ */
|
||||
+ if (os_memcmp(addr, "\xff\xff\xff\xff\xff\xff",
|
||||
+ IEEE80211_ADDR_LEN) == 0) {
|
||||
+ wk.ik_flags |= IEEE80211_KEY_GROUP;
|
||||
+ wk.ik_keyix = key_idx;
|
||||
+ } else {
|
||||
+ wk.ik_keyix = key_idx == 0 ? IEEE80211_KEYIX_NONE :
|
||||
+ key_idx;
|
||||
+ }
|
||||
}
|
||||
+ if (wk.ik_keyix != IEEE80211_KEYIX_NONE && set_tx)
|
||||
+ wk.ik_flags |= IEEE80211_KEY_DEFAULT;
|
||||
wk.ik_keylen = key_len;
|
||||
memcpy(wk.ik_keydata, key, key_len);
|
||||
+#ifdef WORDS_BIGENDIAN
|
||||
+#define WPA_KEY_RSC_LEN 8
|
||||
+ {
|
||||
+ size_t i;
|
||||
+ u8 tmp[WPA_KEY_RSC_LEN];
|
||||
+ os_memset(tmp, 0, sizeof(tmp));
|
||||
+ for (i = 0; i < seq_len; i++)
|
||||
+ tmp[WPA_KEY_RSC_LEN - i - 1] = seq[i];
|
||||
+ os_memcpy(&wk.ik_keyrsc, tmp, WPA_KEY_RSC_LEN);
|
||||
+ }
|
||||
+#else /* WORDS_BIGENDIAN */
|
||||
+ os_memcpy(&wk.ik_keyrsc, seq, seq_len);
|
||||
+#endif /* WORDS_BIGENDIAN */
|
||||
|
||||
ret = set80211priv(drv, IEEE80211_IOCTL_SETKEY, &wk, sizeof(wk));
|
||||
if (ret < 0) {
|
@ -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, ¶m, sizeof(param), 1);
|
||||
+ ret = wpa_hostapd_ioctl(drv, ¶m, 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, ¶m, sizeof(param), 1);
|
||||
+ ret = wpa_hostapd_ioctl(drv, ¶m, 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
|
||||
};
|
@ -1,18 +0,0 @@
|
||||
--- a/wpa_supplicant/ctrl_iface.c
|
||||
+++ b/wpa_supplicant/ctrl_iface.c
|
||||
@@ -685,6 +685,7 @@ static int wpa_supplicant_ctrl_iface_ibs
|
||||
#endif /* CONFIG_IBSS_RSN */
|
||||
|
||||
|
||||
+#ifdef IEEE8021X_EAPOL
|
||||
int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
|
||||
struct wpa_ssid *ssid,
|
||||
const char *field,
|
||||
@@ -750,6 +751,7 @@ int wpa_supplicant_ctrl_iface_ctrl_rsp_h
|
||||
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
static int wpa_supplicant_ctrl_iface_ctrl_rsp(struct wpa_supplicant *wpa_s,
|
@ -1,6 +1,6 @@
|
||||
--- a/src/tls/x509v3.c
|
||||
+++ b/src/tls/x509v3.c
|
||||
@@ -1854,6 +1854,9 @@ int x509_certificate_chain_validate(stru
|
||||
@@ -1848,6 +1848,9 @@ int x509_certificate_chain_validate(stru
|
||||
if (chain_trusted)
|
||||
continue;
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/wpa_supplicant/wpa_supplicant.c
|
||||
+++ b/wpa_supplicant/wpa_supplicant.c
|
||||
@@ -2157,7 +2157,7 @@ static struct wpa_supplicant * wpa_suppl
|
||||
@@ -2191,7 +2191,7 @@ static struct wpa_supplicant * wpa_suppl
|
||||
if (wpa_s == NULL)
|
||||
return NULL;
|
||||
wpa_s->scan_req = 1;
|
@ -1,12 +1,12 @@
|
||||
--- a/src/ap/hostapd.c
|
||||
+++ b/src/ap/hostapd.c
|
||||
@@ -124,6 +124,10 @@ int hostapd_reload_config(struct hostapd
|
||||
@@ -136,6 +136,10 @@ int hostapd_reload_config(struct hostapd
|
||||
oldconf = hapd->iconf;
|
||||
iface->conf = newconf;
|
||||
|
||||
+ iface->freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
|
||||
+ if (iface->current_mode)
|
||||
+ hostapd_prepare_rates(hapd, iface->current_mode);
|
||||
+ hostapd_prepare_rates(iface, iface->current_mode);
|
||||
+
|
||||
for (j = 0; j < iface->num_bss; j++) {
|
||||
hapd = iface->bss[j];
|
@ -1,6 +1,6 @@
|
||||
--- a/hostapd/ctrl_iface.c
|
||||
+++ b/hostapd/ctrl_iface.c
|
||||
@@ -514,6 +514,9 @@ static int hostapd_ctrl_iface_wps_ap_pin
|
||||
@@ -343,6 +343,9 @@ static int hostapd_ctrl_iface_wps_ap_pin
|
||||
char *pos;
|
||||
const char *pin_txt;
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- a/src/drivers/driver_nl80211.c
|
||||
+++ b/src/drivers/driver_nl80211.c
|
||||
@@ -121,7 +121,7 @@ static struct nl_handle * nl_create_hand
|
||||
}
|
||||
|
||||
if (genl_connect(handle)) {
|
||||
- wpa_printf(MSG_ERROR, "nl80211: Failed to connect to generic "
|
||||
+ wpa_printf(MSG_DEBUG, "nl80211: Failed to connect to generic "
|
||||
"netlink (%s)", dbg);
|
||||
nl80211_handle_destroy(handle);
|
||||
return NULL;
|
@ -1,11 +0,0 @@
|
||||
--- a/src/ap/wpa_auth.c
|
||||
+++ b/src/ap/wpa_auth.c
|
||||
@@ -1337,7 +1337,7 @@ static void wpa_send_eapol(struct wpa_au
|
||||
keyidx, encr, 0);
|
||||
|
||||
ctr = pairwise ? sm->TimeoutCtr : sm->GTimeoutCtr;
|
||||
- if (ctr == 1 && wpa_auth->conf.tx_status)
|
||||
+ if (ctr == 1 && wpa_auth->conf.tx_status && pairwise)
|
||||
timeout_ms = eapol_key_timeout_first;
|
||||
else
|
||||
timeout_ms = eapol_key_timeout_subseq;
|
@ -1,12 +0,0 @@
|
||||
--- a/src/ap/ieee802_11.c
|
||||
+++ b/src/ap/ieee802_11.c
|
||||
@@ -1774,6 +1774,9 @@ void ieee802_11_rx_from_unknown(struct h
|
||||
|
||||
sta = ap_get_sta(hapd, src);
|
||||
if (sta && (sta->flags & WLAN_STA_ASSOC)) {
|
||||
+ if (!hapd->conf->wds_sta)
|
||||
+ return;
|
||||
+
|
||||
if (wds && !(sta->flags & WLAN_STA_WDS)) {
|
||||
wpa_printf(MSG_DEBUG, "Enable 4-address WDS mode for "
|
||||
"STA " MACSTR " (aid %u)",
|
Loading…
Reference in New Issue