|
|
@ -145,7 +145,7 @@ |
|
|
|
madwifi_raw_receive, drv, 1);
|
|
|
|
madwifi_raw_receive, drv, 1);
|
|
|
|
if (drv->sock_raw == NULL)
|
|
|
|
if (drv->sock_raw == NULL)
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
@@ -1016,7 +1018,7 @@ madwifi_get_we_version(struct madwifi_dr
|
|
|
|
@@ -1017,7 +1019,7 @@ madwifi_get_we_version(struct madwifi_dr
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
@ -154,7 +154,7 @@ |
|
|
|
iwr.u.data.pointer = (caddr_t) range;
|
|
|
|
iwr.u.data.pointer = (caddr_t) range;
|
|
|
|
iwr.u.data.length = buflen;
|
|
|
|
iwr.u.data.length = buflen;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1133,17 +1135,17 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
@@ -1134,17 +1136,17 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
perror("socket[PF_INET,SOCK_DGRAM]");
|
|
|
|
perror("socket[PF_INET,SOCK_DGRAM]");
|
|
|
|
goto bad;
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -175,7 +175,7 @@ |
|
|
|
handle_read, drv, 1);
|
|
|
|
handle_read, drv, 1);
|
|
|
|
if (drv->sock_xmit == NULL)
|
|
|
|
if (drv->sock_xmit == NULL)
|
|
|
|
goto bad;
|
|
|
|
goto bad;
|
|
|
|
@@ -1157,7 +1159,7 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
@@ -1158,7 +1160,7 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
1);
|
|
|
|
1);
|
|
|
|
if (drv->sock_recv == NULL)
|
|
|
|
if (drv->sock_recv == NULL)
|
|
|
|
goto bad;
|
|
|
|
goto bad;
|
|
|
@ -184,7 +184,7 @@ |
|
|
|
wpa_printf(MSG_DEBUG, "Interface in bridge %s; configure for "
|
|
|
|
wpa_printf(MSG_DEBUG, "Interface in bridge %s; configure for "
|
|
|
|
"EAPOL receive", brname);
|
|
|
|
"EAPOL receive", brname);
|
|
|
|
drv->sock_recv = l2_packet_init(brname, NULL, ETH_P_EAPOL,
|
|
|
|
drv->sock_recv = l2_packet_init(brname, NULL, ETH_P_EAPOL,
|
|
|
|
@@ -1168,7 +1170,7 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
@@ -1169,7 +1171,7 @@ madwifi_init(struct hostapd_data *hapd,
|
|
|
|
drv->sock_recv = drv->sock_xmit;
|
|
|
|
drv->sock_recv = drv->sock_xmit;
|
|
|
|
|
|
|
|
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
@ -193,7 +193,16 @@ |
|
|
|
|
|
|
|
|
|
|
|
iwr.u.mode = IW_MODE_MASTER;
|
|
|
|
iwr.u.mode = IW_MODE_MASTER;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1203,7 +1205,7 @@ madwifi_deinit(void *priv)
|
|
|
|
@@ -1180,7 +1182,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);
|
|
|
|
|
|
|
|
@@ -1206,7 +1208,7 @@ madwifi_deinit(void *priv)
|
|
|
|
struct madwifi_driver_data *drv = priv;
|
|
|
|
struct madwifi_driver_data *drv = priv;
|
|
|
|
|
|
|
|
|
|
|
|
netlink_deinit(drv->netlink);
|
|
|
|
netlink_deinit(drv->netlink);
|
|
|
@ -202,7 +211,7 @@ |
|
|
|
if (drv->ioctl_sock >= 0)
|
|
|
|
if (drv->ioctl_sock >= 0)
|
|
|
|
close(drv->ioctl_sock);
|
|
|
|
close(drv->ioctl_sock);
|
|
|
|
if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)
|
|
|
|
if (drv->sock_recv != NULL && drv->sock_recv != drv->sock_xmit)
|
|
|
|
@@ -1222,7 +1224,7 @@ madwifi_set_ssid(void *priv, const u8 *b
|
|
|
|
@@ -1225,7 +1227,7 @@ madwifi_set_ssid(void *priv, const u8 *b
|
|
|
|
struct iwreq iwr;
|
|
|
|
struct iwreq iwr;
|
|
|
|
|
|
|
|
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
@ -211,7 +220,7 @@ |
|
|
|
iwr.u.essid.flags = 1; /* SSID active */
|
|
|
|
iwr.u.essid.flags = 1; /* SSID active */
|
|
|
|
iwr.u.essid.pointer = (caddr_t) buf;
|
|
|
|
iwr.u.essid.pointer = (caddr_t) buf;
|
|
|
|
iwr.u.essid.length = len + 1;
|
|
|
|
iwr.u.essid.length = len + 1;
|
|
|
|
@@ -1243,7 +1245,7 @@ madwifi_get_ssid(void *priv, u8 *buf, in
|
|
|
|
@@ -1246,7 +1248,7 @@ madwifi_get_ssid(void *priv, u8 *buf, in
|
|
|
|
int ret = 0;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
|
memset(&iwr, 0, sizeof(iwr));
|
|
|
@ -220,8 +229,12 @@ |
|
|
|
iwr.u.essid.pointer = (caddr_t) buf;
|
|
|
|
iwr.u.essid.pointer = (caddr_t) buf;
|
|
|
|
iwr.u.essid.length = len;
|
|
|
|
iwr.u.essid.length = len;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1270,137 +1272,16 @@ madwifi_commit(void *priv)
|
|
|
|
@@ -1271,140 +1273,19 @@ static int
|
|
|
|
return 0;
|
|
|
|
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 */
|
|
|
|
-#else /* HOSTAPD */
|
|
|
@ -361,7 +374,7 @@ |
|
|
|
const u8 *wpa_ie, size_t wpa_ie_len)
|
|
|
|
const u8 *wpa_ie, size_t wpa_ie_len)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
struct iwreq iwr;
|
|
|
|
struct iwreq iwr;
|
|
|
|
@@ -1411,7 +1292,7 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
|
|
|
@@ -1415,7 +1296,7 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
|
|
|
iwr.u.data.pointer = (void *) wpa_ie;
|
|
|
|
iwr.u.data.pointer = (void *) wpa_ie;
|
|
|
|
iwr.u.data.length = wpa_ie_len;
|
|
|
|
iwr.u.data.length = wpa_ie_len;
|
|
|
|
|
|
|
|
|
|
|
@ -370,7 +383,7 @@ |
|
|
|
perror("ioctl[IEEE80211_IOCTL_SETOPTIE]");
|
|
|
|
perror("ioctl[IEEE80211_IOCTL_SETOPTIE]");
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -1419,156 +1300,51 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
|
|
|
@@ -1423,156 +1304,51 @@ wpa_driver_madwifi_set_wpa_ie(struct wpa
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
static int
|
|
|
@ -535,7 +548,7 @@ |
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
if (wpa_driver_madwifi_set_auth_alg(drv, params->auth_alg) < 0)
|
|
|
|
if (wpa_driver_madwifi_set_auth_alg(drv, params->auth_alg) < 0)
|
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
@@ -1591,12 +1367,12 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
@@ -1595,12 +1371,12 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
params->wpa_ie_len == 0)
|
|
|
|
params->wpa_ie_len == 0)
|
|
|
|
privacy = 0;
|
|
|
|
privacy = 0;
|
|
|
|
|
|
|
|
|
|
|
@ -550,7 +563,7 @@ |
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
|
|
|
|
|
|
|
|
if (params->bssid == NULL) {
|
|
|
|
if (params->bssid == NULL) {
|
|
|
|
@@ -1604,14 +1380,14 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
@@ -1608,14 +1384,14 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
* roaming */
|
|
|
|
* roaming */
|
|
|
|
/* FIX: this does not seem to work; would probably need to
|
|
|
|
/* FIX: this does not seem to work; would probably need to
|
|
|
|
* change something in the driver */
|
|
|
|
* change something in the driver */
|
|
|
@ -567,7 +580,7 @@ |
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
if (wpa_driver_wext_set_ssid(drv->wext, params->ssid,
|
|
|
|
if (wpa_driver_wext_set_ssid(drv->wext, params->ssid,
|
|
|
|
params->ssid_len) < 0)
|
|
|
|
params->ssid_len) < 0)
|
|
|
|
@@ -1620,7 +1396,7 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
@@ -1624,7 +1400,7 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
mlme.im_op = IEEE80211_MLME_ASSOC;
|
|
|
|
mlme.im_op = IEEE80211_MLME_ASSOC;
|
|
|
|
os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);
|
|
|
|
os_memcpy(mlme.im_macaddr, params->bssid, IEEE80211_ADDR_LEN);
|
|
|
|
if (set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme,
|
|
|
|
if (set80211priv(drv, IEEE80211_IOCTL_SETMLME, &mlme,
|
|
|
@ -576,7 +589,7 @@ |
|
|
|
wpa_printf(MSG_DEBUG, "%s: SETMLME[ASSOC] failed",
|
|
|
|
wpa_printf(MSG_DEBUG, "%s: SETMLME[ASSOC] failed",
|
|
|
|
__func__);
|
|
|
|
__func__);
|
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
@@ -1633,7 +1409,7 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
@@ -1637,7 +1413,7 @@ wpa_driver_madwifi_associate(void *priv,
|
|
|
|
static int
|
|
|
|
static int
|
|
|
|
wpa_driver_madwifi_set_auth_alg(void *priv, int auth_alg)
|
|
|
|
wpa_driver_madwifi_set_auth_alg(void *priv, int auth_alg)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -585,7 +598,7 @@ |
|
|
|
int authmode;
|
|
|
|
int authmode;
|
|
|
|
|
|
|
|
|
|
|
|
if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
|
|
|
|
if ((auth_alg & WPA_AUTH_ALG_OPEN) &&
|
|
|
|
@@ -1644,13 +1420,13 @@ wpa_driver_madwifi_set_auth_alg(void *pr
|
|
|
|
@@ -1648,13 +1424,13 @@ wpa_driver_madwifi_set_auth_alg(void *pr
|
|
|
|
else
|
|
|
|
else
|
|
|
|
authmode = IEEE80211_AUTH_OPEN;
|
|
|
|
authmode = IEEE80211_AUTH_OPEN;
|
|
|
|
|
|
|
|
|
|
|
@ -601,7 +614,7 @@ |
|
|
|
struct iwreq iwr;
|
|
|
|
struct iwreq iwr;
|
|
|
|
int ret = 0;
|
|
|
|
int ret = 0;
|
|
|
|
const u8 *ssid = params->ssids[0].ssid;
|
|
|
|
const u8 *ssid = params->ssids[0].ssid;
|
|
|
|
@@ -1668,7 +1444,7 @@ wpa_driver_madwifi_scan(void *priv, stru
|
|
|
|
@@ -1672,7 +1448,7 @@ wpa_driver_madwifi_scan(void *priv, stru
|
|
|
|
if (wpa_driver_wext_set_ssid(drv->wext, ssid, ssid_len) < 0)
|
|
|
|
if (wpa_driver_wext_set_ssid(drv->wext, ssid, ssid_len) < 0)
|
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
|
|
|
|
|
|
|
@ -610,7 +623,7 @@ |
|
|
|
perror("ioctl[SIOCSIWSCAN]");
|
|
|
|
perror("ioctl[SIOCSIWSCAN]");
|
|
|
|
ret = -1;
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -1690,14 +1466,14 @@ wpa_driver_madwifi_scan(void *priv, stru
|
|
|
|
@@ -1694,14 +1470,14 @@ wpa_driver_madwifi_scan(void *priv, stru
|
|
|
|
|
|
|
|
|
|
|
|
static int wpa_driver_madwifi_get_bssid(void *priv, u8 *bssid)
|
|
|
|
static int wpa_driver_madwifi_get_bssid(void *priv, u8 *bssid)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -627,7 +640,7 @@ |
|
|
|
return wpa_driver_wext_get_ssid(drv->wext, ssid);
|
|
|
|
return wpa_driver_wext_get_ssid(drv->wext, ssid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1705,14 +1481,16 @@ static int wpa_driver_madwifi_get_ssid(v
|
|
|
|
@@ -1709,14 +1485,16 @@ static int wpa_driver_madwifi_get_ssid(v
|
|
|
|
static struct wpa_scan_results *
|
|
|
|
static struct wpa_scan_results *
|
|
|
|
wpa_driver_madwifi_get_scan_results(void *priv)
|
|
|
|
wpa_driver_madwifi_get_scan_results(void *priv)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -646,7 +659,7 @@ |
|
|
|
return wpa_driver_wext_set_operstate(drv->wext, state);
|
|
|
|
return wpa_driver_wext_set_operstate(drv->wext, state);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1733,7 +1511,7 @@ static int wpa_driver_madwifi_set_probe_
|
|
|
|
@@ -1737,7 +1515,7 @@ static int wpa_driver_madwifi_set_probe_
|
|
|
|
|
|
|
|
|
|
|
|
ret = set80211priv(priv, IEEE80211_IOCTL_SET_APPIEBUF, probe_req_ie,
|
|
|
|
ret = set80211priv(priv, IEEE80211_IOCTL_SET_APPIEBUF, probe_req_ie,
|
|
|
|
sizeof(struct ieee80211req_getset_appiebuf) +
|
|
|
|
sizeof(struct ieee80211req_getset_appiebuf) +
|
|
|
@ -655,7 +668,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
os_free(probe_req_ie);
|
|
|
|
os_free(probe_req_ie);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1743,7 +1521,7 @@ static int wpa_driver_madwifi_set_probe_
|
|
|
|
@@ -1747,7 +1525,7 @@ static int wpa_driver_madwifi_set_probe_
|
|
|
|
|
|
|
|
|
|
|
|
static void * wpa_driver_madwifi_init(void *ctx, const char *ifname)
|
|
|
|
static void * wpa_driver_madwifi_init(void *ctx, const char *ifname)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -664,7 +677,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
drv = os_zalloc(sizeof(*drv));
|
|
|
|
drv = os_zalloc(sizeof(*drv));
|
|
|
|
if (drv == NULL)
|
|
|
|
if (drv == NULL)
|
|
|
|
@@ -1754,17 +1532,17 @@ static void * wpa_driver_madwifi_init(vo
|
|
|
|
@@ -1758,17 +1536,17 @@ static void * wpa_driver_madwifi_init(vo
|
|
|
|
|
|
|
|
|
|
|
|
drv->ctx = ctx;
|
|
|
|
drv->ctx = ctx;
|
|
|
|
os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
|
|
|
|
os_strlcpy(drv->ifname, ifname, sizeof(drv->ifname));
|
|
|
@ -686,7 +699,7 @@ |
|
|
|
wpa_printf(MSG_DEBUG, "%s: failed to enable WPA support",
|
|
|
|
wpa_printf(MSG_DEBUG, "%s: failed to enable WPA support",
|
|
|
|
__FUNCTION__);
|
|
|
|
__FUNCTION__);
|
|
|
|
goto fail3;
|
|
|
|
goto fail3;
|
|
|
|
@@ -1773,7 +1551,7 @@ static void * wpa_driver_madwifi_init(vo
|
|
|
|
@@ -1777,7 +1555,7 @@ static void * wpa_driver_madwifi_init(vo
|
|
|
|
return drv;
|
|
|
|
return drv;
|
|
|
|
|
|
|
|
|
|
|
|
fail3:
|
|
|
|
fail3:
|
|
|
@ -695,7 +708,7 @@ |
|
|
|
fail2:
|
|
|
|
fail2:
|
|
|
|
wpa_driver_wext_deinit(drv->wext);
|
|
|
|
wpa_driver_wext_deinit(drv->wext);
|
|
|
|
fail:
|
|
|
|
fail:
|
|
|
|
@@ -1784,38 +1562,37 @@ fail:
|
|
|
|
@@ -1788,38 +1566,37 @@ fail:
|
|
|
|
|
|
|
|
|
|
|
|
static void wpa_driver_madwifi_deinit(void *priv)
|
|
|
|
static void wpa_driver_madwifi_deinit(void *priv)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -741,7 +754,7 @@ |
|
|
|
#ifdef HOSTAPD
|
|
|
|
#ifdef HOSTAPD
|
|
|
|
.hapd_init = madwifi_init,
|
|
|
|
.hapd_init = madwifi_init,
|
|
|
|
.hapd_deinit = madwifi_deinit,
|
|
|
|
.hapd_deinit = madwifi_deinit,
|
|
|
|
@@ -1835,7 +1612,8 @@ const struct wpa_driver_ops wpa_driver_m
|
|
|
|
@@ -1839,7 +1616,8 @@ const struct wpa_driver_ops wpa_driver_m
|
|
|
|
.sta_clear_stats = madwifi_sta_clear_stats,
|
|
|
|
.sta_clear_stats = madwifi_sta_clear_stats,
|
|
|
|
.commit = madwifi_commit,
|
|
|
|
.commit = madwifi_commit,
|
|
|
|
.set_ap_wps_ie = madwifi_set_ap_wps_ie,
|
|
|
|
.set_ap_wps_ie = madwifi_set_ap_wps_ie,
|
|
|
@ -751,7 +764,7 @@ |
|
|
|
.get_bssid = wpa_driver_madwifi_get_bssid,
|
|
|
|
.get_bssid = wpa_driver_madwifi_get_bssid,
|
|
|
|
.get_ssid = wpa_driver_madwifi_get_ssid,
|
|
|
|
.get_ssid = wpa_driver_madwifi_get_ssid,
|
|
|
|
.init = wpa_driver_madwifi_init,
|
|
|
|
.init = wpa_driver_madwifi_init,
|
|
|
|
@@ -1847,5 +1625,5 @@ const struct wpa_driver_ops wpa_driver_m
|
|
|
|
@@ -1851,5 +1629,5 @@ const struct wpa_driver_ops wpa_driver_m
|
|
|
|
.disassociate = wpa_driver_madwifi_disassociate,
|
|
|
|
.disassociate = wpa_driver_madwifi_disassociate,
|
|
|
|
.associate = wpa_driver_madwifi_associate,
|
|
|
|
.associate = wpa_driver_madwifi_associate,
|
|
|
|
.set_operstate = wpa_driver_madwifi_set_operstate,
|
|
|
|
.set_operstate = wpa_driver_madwifi_set_operstate,
|