automake build system

[mech_eap.orig] / src / drivers / driver_bsd.c

diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c
index 83c0422..7700a85 100644 (file)
--- a/src/drivers/driver_bsd.c
+++ b/src/drivers/driver_bsd.c
@@ -35,11 +35,14 @@
 #include <netproto/802_11/ieee80211_ioctl.h>
 #include <netproto/802_11/ieee80211_dragonfly.h>
 #else /* __DragonFly__ */
+#ifdef __GLIBC__
+#include <netinet/ether.h>
+#endif /* __GLIBC__ */
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <net80211/ieee80211_crypto.h>
-#endif /* __DragonFly__ */
-#if __FreeBSD__
+#endif /* __DragonFly__ || __GLIBC__ */
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <net80211/ieee80211_freebsd.h>
 #endif
 #if __NetBSD__
@@ -131,7 +134,7 @@ set80211param(struct bsd_driver_data *drv, int op, int arg)
 }
 
 static int
-bsd_get_ssid(const char *ifname, void *priv, u8 *ssid, int len)
+bsd_get_ssid(void *priv, u8 *ssid, int len)
 {
        struct bsd_driver_data *drv = priv;
 #ifdef SIOCG80211NWID
@@ -152,7 +155,7 @@ bsd_get_ssid(const char *ifname, void *priv, u8 *ssid, int len)
 }
 
 static int
-bsd_set_ssid(const char *ifname, void *priv, const u8 *ssid, int ssid_len)
+bsd_set_ssid(void *priv, const u8 *ssid, int ssid_len)
 {
        struct bsd_driver_data *drv = priv;
 #ifdef SIOCS80211NWID
@@ -465,8 +468,8 @@ bsd_set_ieee8021x(void *priv, struct wpa_bss_params *params)
 }
 
 static int
-bsd_set_sta_authorized(void *priv, const u8 *addr, int total_flags,
-                      int flags_or, int flags_and)
+bsd_set_sta_authorized(void *priv, const u8 *addr,
+                      int total_flags, int flags_or, int flags_and)
 {
        int authorized = -1;
 
@@ -524,13 +527,14 @@ bsd_send_eapol(void *priv, const u8 *addr, const u8 *data, size_t data_len,
 }
 
 static int
-bsd_set_freq(void *priv, u16 channel)
+bsd_set_freq(void *priv, struct hostapd_freq_params *freq)
 {
        struct bsd_driver_data *drv = priv;
 #ifdef SIOCS80211CHANNEL
        struct ieee80211chanreq creq;
 #endif /* SIOCS80211CHANNEL */
        u32 mode;
+       int channel = freq->channel;
 
        if (channel < 14)
                mode = IFM_IEEE80211_11G;
@@ -547,7 +551,7 @@ bsd_set_freq(void *priv, u16 channel)
 #ifdef SIOCS80211CHANNEL
        os_memset(&creq, 0, sizeof(creq));
        os_strlcpy(creq.i_name, drv->ifname, sizeof(creq.i_name));
-       creq.i_channel = channel;
+       creq.i_channel = (u_int16_t)channel;
        return ioctl(drv->sock, SIOCS80211CHANNEL, &creq);
 #else /* SIOCS80211CHANNEL */
        return set80211param(priv, IEEE80211_IOC_CHANNEL, channel);
@@ -555,7 +559,7 @@ bsd_set_freq(void *priv, u16 channel)
 }
 
 static int
-bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len)
+bsd_set_opt_ie(void *priv, const u8 *ie, size_t ie_len)
 {
 #ifdef IEEE80211_IOC_APPIE
        wpa_printf(MSG_DEBUG, "%s: set WPA+RSN ie (len %lu)", __func__,
@@ -593,7 +597,7 @@ ether_sprintf(const u8 *addr)
 }
 
 static int
-bsd_set_privacy(const char *ifname, void *priv, int enabled)
+bsd_set_privacy(void *priv, int enabled)
 {
        wpa_printf(MSG_DEBUG, "%s: enabled=%d", __func__, enabled);
 
@@ -757,12 +761,6 @@ handle_read(void *ctx, const u8 *src_addr, const u8 *buf, size_t len)
        drv_event_eapol_rx(drv->hapd, src_addr, buf, len);
 }
 
-static int
-hostapd_bsd_set_freq(void *priv, struct hostapd_freq_params *freq)
-{
-       return bsd_set_freq(priv, freq->channel);
-}
-
 static void *
 bsd_init(struct hostapd_data *hapd, struct wpa_init_params *params)
 {
@@ -870,7 +868,7 @@ static int
 wpa_driver_bsd_get_ssid(void *priv, u8 *ssid)
 {
        struct bsd_driver_data *drv = priv;
-       return bsd_get_ssid(drv->ifname, drv, ssid, 0);
+       return bsd_get_ssid(drv, ssid, 0);
 }
 
 static int
@@ -878,7 +876,7 @@ wpa_driver_bsd_set_wpa_ie(struct bsd_driver_data *drv, const u8 *wpa_ie,
                          size_t wpa_ie_len)
 {
 #ifdef IEEE80211_IOC_APPIE
-       return bsd_set_opt_ie(drv->ifname, drv, wpa_ie, wpa_ie_len);
+       return bsd_set_opt_ie(drv, wpa_ie, wpa_ie_len);
 #else /* IEEE80211_IOC_APPIE */
        return set80211var(drv, IEEE80211_IOC_OPTIE, wpa_ie, wpa_ie_len);
 #endif /* IEEE80211_IOC_APPIE */
@@ -969,7 +967,6 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
        struct bsd_driver_data *drv = priv;
        struct ieee80211req_mlme mlme;
        u32 mode;
-       u16 channel;
        int privacy;
        int ret = 0;
 
@@ -1004,18 +1001,6 @@ wpa_driver_bsd_associate(void *priv, struct wpa_driver_associate_params *params)
        }
 
        if (params->mode == IEEE80211_MODE_AP) {
-               if (params->freq >= 2412 && params->freq <= 2472)
-                       channel = (params->freq - 2407) / 5;
-               else if (params->freq == 2484)
-                       channel = 14;
-               else if ((params->freq >= 5180 && params->freq <= 5240) ||
-                        (params->freq >= 5745 && params->freq <= 5825))
-                       channel = (params->freq - 5000) / 5;
-               else
-                       channel = 0;
-               if (bsd_set_freq(drv, channel) < 0)
-                       return -1;
-
                drv->sock_xmit = l2_packet_init(drv->ifname, NULL, ETH_P_EAPOL,
                                                handle_read, drv, 0);
                if (drv->sock_xmit == NULL)
@@ -1118,7 +1103,7 @@ wpa_driver_bsd_scan(void *priv, struct wpa_driver_scan_params *params)
        return set80211var(drv, IEEE80211_IOC_SCAN_REQ, &sr, sizeof(sr));
 #else /* IEEE80211_IOC_SCAN_MAX_SSID */
        /* set desired ssid before scan */
-       if (bsd_set_ssid(drv->ifname, drv, params->ssids[0].ssid,
+       if (bsd_set_ssid(drv, params->ssids[0].ssid,
                         params->ssids[0].ssid_len) < 0)
                return -1;
 
@@ -1515,7 +1500,6 @@ const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .read_sta_data          = bsd_read_sta_driver_data,
        .sta_disassoc           = bsd_sta_disassoc,
        .sta_deauth             = bsd_sta_deauth,
-       .set_freq               = hostapd_bsd_set_freq,
 #else /* HOSTAPD */
        .init                   = wpa_driver_bsd_init,
        .deinit                 = wpa_driver_bsd_deinit,
@@ -1529,6 +1513,7 @@ const struct wpa_driver_ops wpa_driver_bsd_ops = {
        .associate              = wpa_driver_bsd_associate,
        .get_capa               = wpa_driver_bsd_get_capa,
 #endif /* HOSTAPD */
+       .set_freq               = bsd_set_freq,
        .set_key                = bsd_set_key,
        .set_ieee8021x          = bsd_set_ieee8021x,
        .hapd_set_ssid          = bsd_set_ssid,