jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nl80211: Use non-receiving socket for EAPOL TX

Browse source 
The non-monitor TX currently uses a normal L2 abstraction
socket, but that will also receive frames we don't want,
so use a plain socket that isn't bound for RX. This might
be possible using the L2 abstraction, but we need a plain
socket later for getting TX status events here.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-11-19 14:00:53 +02:00 committed by Jouni Malinen
parent 61cbe2ffd8
commit d12dab4c6f
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/drivers/driver_nl80211.c
View file

@ -218,7 +218,7 @@ struct wpa_driver_nl80211_data {
struct i802_bss first_bss; struct i802_bss first_bss;
#ifdef CONFIG_AP #ifdef CONFIG_AP
struct l2_packet_data *l2; int eapol_tx_sock;
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
#ifdef HOSTAPD #ifdef HOSTAPD
@ -2239,16 +2239,6 @@ static void nl80211_get_phy_name(struct wpa_driver_nl80211_data *drv)
} }
#ifdef CONFIG_AP
static void nl80211_l2_read(void *ctx, const u8 *src_addr, const u8 *buf,
size_t len)
{
wpa_printf(MSG_DEBUG, "nl80211: l2_packet read %u",
(unsigned int) len);
}
#endif /* CONFIG_AP */
/** /**
* wpa_driver_nl80211_init - Initialize nl80211 driver interface * wpa_driver_nl80211_init - Initialize nl80211 driver interface
* @ctx: context to be used when calling wpa_supplicant functions, * @ctx: context to be used when calling wpa_supplicant functions,
@ -2276,6 +2266,9 @@ static void * wpa_driver_nl80211_init(void *ctx, const char *ifname,
os_strlcpy(bss->ifname, ifname, sizeof(bss->ifname)); os_strlcpy(bss->ifname, ifname, sizeof(bss->ifname));
drv->monitor_ifidx = -1; drv->monitor_ifidx = -1;
drv->monitor_sock = -1; drv->monitor_sock = -1;
#ifdef CONFIG_AP
drv->eapol_tx_sock = -1;
#endif /* CONFIG_AP */
drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED; drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED;
if (wpa_driver_nl80211_init_nl(drv)) { if (wpa_driver_nl80211_init_nl(drv)) {
@ -2302,8 +2295,7 @@ static void * wpa_driver_nl80211_init(void *ctx, const char *ifname,
goto failed; goto failed;
#ifdef CONFIG_AP #ifdef CONFIG_AP
drv->l2 = l2_packet_init(ifname, NULL, ETH_P_EAPOL, drv->eapol_tx_sock = socket(PF_PACKET, SOCK_DGRAM, 0);
nl80211_l2_read, drv, 0);
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
if (drv->global) { if (drv->global) {
@ -2521,8 +2513,8 @@ static void wpa_driver_nl80211_deinit(void *priv)
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
#ifdef CONFIG_AP #ifdef CONFIG_AP
if (drv->l2) if (drv->eapol_tx_sock >= 0)
l2_packet_deinit(drv->l2); close(drv->eapol_tx_sock);
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
if (drv->nl_preq.handle) if (drv->nl_preq.handle)
@ -5111,17 +5103,29 @@ nl80211_create_monitor_interface(struct wpa_driver_nl80211_data *drv)
#ifdef CONFIG_AP #ifdef CONFIG_AP
static int nl80211_send_eapol_data(struct i802_bss *bss, static int nl80211_send_eapol_data(struct i802_bss *bss,
const u8 *addr, const u8 *data, const u8 *addr, const u8 *data,
size_t data_len, const u8 *own_addr) size_t data_len)
{ {
if (bss->drv->l2 == NULL) { struct sockaddr_ll ll;
wpa_printf(MSG_DEBUG, "nl80211: No l2_packet to send EAPOL"); int ret;
if (bss->drv->eapol_tx_sock < 0) {
wpa_printf(MSG_DEBUG, "nl80211: No socket to send EAPOL");
return -1; return -1;
} }
if (l2_packet_send(bss->drv->l2, addr, ETH_P_EAPOL, data, data_len) < os_memset(&ll, 0, sizeof(ll));
0) ll.sll_family = AF_PACKET;
return -1; ll.sll_ifindex = bss->ifindex;
return 0; ll.sll_protocol = htons(ETH_P_PAE);
ll.sll_halen = ETH_ALEN;
os_memcpy(ll.sll_addr, addr, ETH_ALEN);
ret = sendto(bss->drv->eapol_tx_sock, data, data_len, 0,
(struct sockaddr *) &ll, sizeof(ll));
if (ret < 0)
wpa_printf(MSG_ERROR, "nl80211: EAPOL TX: %s",
strerror(errno));
return ret;
} }
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
@ -5142,8 +5146,7 @@ static int wpa_driver_nl80211_hapd_send_eapol(
#ifdef CONFIG_AP #ifdef CONFIG_AP
if (drv->device_ap_sme) if (drv->device_ap_sme)
return nl80211_send_eapol_data(bss, addr, data, data_len, return nl80211_send_eapol_data(bss, addr, data, data_len);
own_addr);
#endif /* CONFIG_AP */ #endif /* CONFIG_AP */
len = sizeof(*hdr) + (qos ? 2 : 0) + sizeof(rfc1042_header) + 2 + len = sizeof(*hdr) + (qos ? 2 : 0) + sizeof(rfc1042_header) + 2 +