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

Implement EAPOL sending callbacks for IBSS RSN

Browse source
This commit is contained in:
Jouni Malinen 2009-01-16 00:56:31 +02:00
parent 11ef8d3578
commit e2d492dd08
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
wpa_supplicant/ibss_rsn.c
View file

@ -15,6 +15,7 @@
#include "includes.h" #include "includes.h"
#include "common.h" #include "common.h"
#include "l2_packet/l2_packet.h"
#include "wpa_supplicant_i.h" #include "wpa_supplicant_i.h"
#include "wpa.h" #include "wpa.h"
#include "wpa_ie.h" #include "wpa_ie.h"
@ -33,15 +34,17 @@ static void ibss_rsn_free(struct ibss_rsn_peer *peer)
static int supp_ether_send(void *ctx, const u8 *dest, u16 proto, const u8 *buf, static int supp_ether_send(void *ctx, const u8 *dest, u16 proto, const u8 *buf,
size_t len) size_t len)
{ {
/* struct ibss_rsn_peer *peer = ctx; */ struct ibss_rsn_peer *peer = ctx;
struct wpa_supplicant *wpa_s = peer->ibss_rsn->wpa_s;
wpa_printf(MSG_DEBUG, "SUPP: %s(dest=" MACSTR " proto=0x%04x " wpa_printf(MSG_DEBUG, "SUPP: %s(dest=" MACSTR " proto=0x%04x "
"len=%lu)", "len=%lu)",
__func__, MAC2STR(dest), proto, (unsigned long) len); __func__, MAC2STR(dest), proto, (unsigned long) len);
/* TODO: send EAPOL frame */ if (wpa_s->l2)
return l2_packet_send(wpa_s->l2, dest, proto, buf, len);
return 0; return wpa_drv_send_eapol(wpa_s, dest, proto, buf, len);
} }
@ -181,15 +184,18 @@ static const u8 * auth_get_psk(void *ctx, const u8 *addr, const u8 *prev_psk)
static int auth_send_eapol(void *ctx, const u8 *addr, const u8 *data, static int auth_send_eapol(void *ctx, const u8 *addr, const u8 *data,
size_t data_len, int encrypt) size_t data_len, int encrypt)
{ {
/* struct ibss_rsn *ibss_rsn = ctx; */ struct ibss_rsn_peer *peer = ctx;
struct wpa_supplicant *wpa_s = peer->ibss_rsn->wpa_s;
wpa_printf(MSG_DEBUG, "AUTH: %s(addr=" MACSTR " data_len=%lu " wpa_printf(MSG_DEBUG, "AUTH: %s(addr=" MACSTR " data_len=%lu "
"encrypt=%d)", "encrypt=%d)",
__func__, MAC2STR(addr), (unsigned long) data_len, encrypt); __func__, MAC2STR(addr), (unsigned long) data_len, encrypt);
/* TODO: send EAPOL frame */ if (wpa_s->l2)
return l2_packet_send(wpa_s->l2, addr, ETH_P_EAPOL, data,
data_len);
return 0; return wpa_drv_send_eapol(wpa_s, addr, ETH_P_EAPOL, data, data_len);
} }
@ -261,6 +267,7 @@ int ibss_rsn_start(struct ibss_rsn *ibss_rsn, const u8 *addr)
if (peer == NULL) if (peer == NULL)
return -1; return -1;
peer->ibss_rsn = ibss_rsn;
os_memcpy(peer->addr, addr, ETH_ALEN); os_memcpy(peer->addr, addr, ETH_ALEN);
if (ibss_rsn_supp_init(peer, ibss_rsn->wpa_s->own_addr, ibss_rsn->psk) if (ibss_rsn_supp_init(peer, ibss_rsn->wpa_s->own_addr, ibss_rsn->psk)

3
wpa_supplicant/ibss_rsn.h
View file

@ -15,8 +15,11 @@
#ifndef IBSS_RSN_H #ifndef IBSS_RSN_H
#define IBSS_RSN_H #define IBSS_RSN_H
struct ibss_rsn;
struct ibss_rsn_peer { struct ibss_rsn_peer {
struct ibss_rsn_peer *next; struct ibss_rsn_peer *next;
struct ibss_rsn *ibss_rsn;
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];