diff options
author | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
commit | 7ec4eb033d83d1150a5d461349c32d7113770a57 (patch) | |
tree | 4c08a6b60d0fad8945a0348eb843f0d8b2bd8d9d /contrib/hostapd/ieee802_1x.h | |
parent | 8410a7ea6cb51f8974a9d5506dacff8d565158f5 (diff) | |
download | FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.zip FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.tar.gz |
resolve merge conflicts
MFC after: 2 weeks
Diffstat (limited to 'contrib/hostapd/ieee802_1x.h')
-rw-r--r-- | contrib/hostapd/ieee802_1x.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/contrib/hostapd/ieee802_1x.h b/contrib/hostapd/ieee802_1x.h index 9d2567a..90cc2ce 100644 --- a/contrib/hostapd/ieee802_1x.h +++ b/contrib/hostapd/ieee802_1x.h @@ -12,13 +12,7 @@ struct ieee802_1x_hdr { /* followed by length octets of data */ } __attribute__ ((packed)); - -#if defined(IEEE802_1X_EAPOL_VERSION_2) #define EAPOL_VERSION 2 -#else -/* Enable support for older Authenticators/Supplicants using EAPOL Version 1 */ -#define EAPOL_VERSION 1 -#endif /* ! IEEE802_1X_EAPOL_VERSION_2 */ enum { IEEE802_1X_TYPE_EAP_PACKET = 0, IEEE802_1X_TYPE_EAPOL_START = 1, @@ -55,7 +49,8 @@ enum { EAPOL_KEY_TYPE_RC4 = 1, EAPOL_KEY_TYPE_RSN = 2, EAPOL_KEY_TYPE_WPA = 254 }; -void ieee802_1x_receive(hostapd *hapd, u8 *sa, u8 *buf, size_t len); +void ieee802_1x_receive(struct hostapd_data *hapd, const u8 *sa, const u8 *buf, + size_t len); void ieee802_1x_new_station(hostapd *hapd, struct sta_info *sta); void ieee802_1x_free_station(struct sta_info *sta); @@ -77,7 +72,8 @@ void ieee802_1x_deinit(hostapd *hapd); int ieee802_1x_tx_status(hostapd *hapd, struct sta_info *sta, u8 *buf, size_t len, int ack); u8 * ieee802_1x_get_identity(struct eapol_state_machine *sm, size_t *len); -u8 * ieee802_1x_get_radius_class(struct eapol_state_machine *sm, size_t *len); +u8 * ieee802_1x_get_radius_class(struct eapol_state_machine *sm, size_t *len, + int idx); u8 * ieee802_1x_get_key_crypt(struct eapol_state_machine *sm, size_t *len); void ieee802_1x_notify_port_enabled(struct eapol_state_machine *sm, int enabled); @@ -91,4 +87,10 @@ void hostapd_get_ntp_timestamp(u8 *buf); void ieee802_1x_finished(struct hostapd_data *hapd, struct sta_info *sta, int success); +struct radius_class_data; + +void ieee802_1x_free_radius_class(struct radius_class_data *class); +int ieee802_1x_copy_radius_class(struct radius_class_data *dst, + struct radius_class_data *src); + #endif /* IEEE802_1X_H */ |