DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

bsd: Aggregate ioctl routines

Browse source 
This patch aggregates ioctls.

First is SIOCS80211. The SIOCS80211's arguments has 3 couples.
        1-1. i_len, i_data
        1-2. i_val
        1-3. i_len, i_data, i_val (currently only IEEE80211_IOC_APPIE)
There were 3 routines for each cases. This patch aggregates these to
one.

Second is SIOCG80211. The SIOCG80211 returns 2 type of value.
        2-1. i_len
        2-2. i_val
There were 2 routines for each cases. This patch aggregates these to
one.

I have tested on both FreeBSD 8.0 and NetBSD 5.0.1 with these cases.

[hostapd]
RSN-PSK(CCMP)/WPA-PSK(TKIP)

[wpa_supplicant(STA)]
RSN-PSK(CCMP)/WPA-PSK(TKIP)

[wpa_supplicant(AP)]
RSN-PSK(CCMP)/WPA-PSK(TKIP)
This commit is contained in:
Masashi Honma 2010-02-13 13:59:29 +02:00 committed by Jouni Malinen
parent 88487b0e0b
commit 0c6bdf91ea
1 changed files with 30 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/drivers/driver_bsd.c
View file

@ -67,56 +67,42 @@ struct bsd_driver_data {
/* Generic functions for hostapd and wpa_supplicant */ /* Generic functions for hostapd and wpa_supplicant */
static int static int
bsd_set80211var(int s, const char *ifname, int op, const void *arg, int arg_len) bsd_set80211(void *priv, int op, int val, const void *arg, int arg_len)
{ {
struct bsd_driver_data *drv = priv;
struct ieee80211req ireq; struct ieee80211req ireq;
os_memset(&ireq, 0, sizeof(ireq)); os_memset(&ireq, 0, sizeof(ireq));
os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name)); os_strlcpy(ireq.i_name, drv->ifname, sizeof(ireq.i_name));
ireq.i_type = op; ireq.i_type = op;
ireq.i_len = arg_len; ireq.i_val = val;
ireq.i_data = (void *) arg; ireq.i_data = (void *) arg;
ireq.i_len = arg_len;
if (ioctl(s, SIOCS80211, &ireq) < 0) { if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) {
fprintf(stderr, "ioctl[SIOCS80211, op %u, len %u]: %s\n", wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, val=%u, "
op, arg_len, strerror(errno)); "arg_len=%u]: %s", op, val, arg_len,
strerror(errno));
return -1; return -1;
} }
return 0; return 0;
} }
static int static int
bsd_get80211var(int s, const char *ifname, int op, void *arg, int arg_len) bsd_get80211(void *priv, struct ieee80211req *ireq, int op, void *arg,
int arg_len)
{ {
struct ieee80211req ireq; struct bsd_driver_data *drv = priv;
os_memset(&ireq, 0, sizeof(ireq)); os_memset(ireq, 0, sizeof(*ireq));
os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name)); os_strlcpy(ireq->i_name, drv->ifname, sizeof(ireq->i_name));
ireq.i_type = op; ireq->i_type = op;
ireq.i_len = arg_len; ireq->i_len = arg_len;
ireq.i_data = arg; ireq->i_data = arg;
if (ioctl(s, SIOCG80211, &ireq) < 0) { if (ioctl(drv->sock, SIOCG80211, ireq) < 0) {
fprintf(stderr, "ioctl[SIOCG80211, op %u, len %u]: %s\n", wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, "
op, arg_len, strerror(errno)); "arg_len=%u]: %s", op, arg_len, strerror(errno));
return -1;
}
return ireq.i_len;
}
static int
bsd_set80211param(int s, const char *ifname, int op, int arg)
{
struct ieee80211req ireq;
os_memset(&ireq, 0, sizeof(ireq));
os_strlcpy(ireq.i_name, ifname, sizeof(ireq.i_name));
ireq.i_type = op;
ireq.i_val = arg;
if (ioctl(s, SIOCS80211, &ireq) < 0) {
fprintf(stderr, "ioctl[SIOCS80211, op %u, arg 0x%x]: %s\n",
op, arg, strerror(errno));
return -1; return -1;
} }
return 0; return 0;
@ -125,19 +111,23 @@ bsd_set80211param(int s, const char *ifname, int op, int arg)
static int static int
get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len) get80211var(struct bsd_driver_data *drv, int op, void *arg, int arg_len)
{ {
return bsd_get80211var(drv->sock, drv->ifname, op, arg, arg_len); struct ieee80211req ireq;
if (bsd_get80211(drv, &ireq, op, arg, arg_len) < 0)
return -1;
return ireq.i_len;
} }
static int static int
set80211var(struct bsd_driver_data *drv, int op, const void *arg, int arg_len) set80211var(struct bsd_driver_data *drv, int op, const void *arg, int arg_len)
{ {
return bsd_set80211var(drv->sock, drv->ifname, op, arg, arg_len); return bsd_set80211(drv, op, 0, arg, arg_len);
} }
static int static int
set80211param(struct bsd_driver_data *drv, int op, int arg) set80211param(struct bsd_driver_data *drv, int op, int arg)
{ {
return bsd_set80211param(drv->sock, drv->ifname, op, arg); return bsd_set80211(drv, op, arg, NULL, 0);
} }
static int static int
@ -568,22 +558,10 @@ static int
bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len) bsd_set_opt_ie(const char *ifname, void *priv, const u8 *ie, size_t ie_len)
{ {
#ifdef IEEE80211_IOC_APPIE #ifdef IEEE80211_IOC_APPIE
struct bsd_driver_data *drv = priv;
struct ieee80211req ireq;
os_memset(&ireq, 0, sizeof(ireq));
os_strlcpy(ireq.i_name, drv->ifname, sizeof(ireq.i_name));
ireq.i_type = IEEE80211_IOC_APPIE;
ireq.i_val = IEEE80211_APPIE_WPA;
ireq.i_data = (void *) ie;
ireq.i_len = ie_len;
wpa_printf(MSG_DEBUG, "%s: set WPA+RSN ie (len %lu)", __func__, wpa_printf(MSG_DEBUG, "%s: set WPA+RSN ie (len %lu)", __func__,
(unsigned long)ie_len); (unsigned long)ie_len);
if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) { return bsd_set80211(priv, IEEE80211_IOC_APPIE, IEEE80211_APPIE_WPA,
perror("Unable to set WPA+RSN ie"); ie, ie_len);
return -1;
}
#endif /* IEEE80211_IOC_APPIE */ #endif /* IEEE80211_IOC_APPIE */
return 0; return 0;
} }
@ -865,15 +843,8 @@ get80211param(struct bsd_driver_data *drv, int op)
{ {
struct ieee80211req ireq; struct ieee80211req ireq;
os_memset(&ireq, 0, sizeof(ireq)); if (bsd_get80211(drv, &ireq, op, NULL, 0) < 0)
os_strlcpy(ireq.i_name, drv->ifname, sizeof(ireq.i_name));
ireq.i_type = op;
if (ioctl(drv->sock, SIOCG80211, &ireq) < 0) {
fprintf(stderr, "ioctl[SIOCG80211, op %u]: %s\n",
op, strerror(errno));
return -1; return -1;
}
return ireq.i_val; return ireq.i_val;
} }