Add hostapd driver_params config parameter

This is mainly for development testing purposes to allow driver_nl80211
behavior to be modified.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 5586f26..79bbba4 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1867,6 +1867,9 @@ static int hostapd_config_fill(struct hostapd_config *conf,
                                   line, pos);
                        return 1;
                }
+       } else if (os_strcmp(buf, "driver_params") == 0) {
+               os_free(conf->driver_params);
+               conf->driver_params = os_strdup(pos);
        } else if (os_strcmp(buf, "debug") == 0) {
                wpa_printf(MSG_DEBUG, "Line %d: DEPRECATED: 'debug' configuration variable is not used anymore",
                           line);

diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 6bc04f8..dc7e95b 100644 (file)
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -24,6 +24,9 @@ interface=wlan0
 # not control any wireless/wired driver.
 # driver=hostap
 
+# Driver interface parameters (mainly for development testing use)
+# driver_params=<params>
+
 # hostapd event logger configuration
 #
 # Two output method: syslog and stdout (only usable if not forking to

diff --git a/hostapd/main.c b/hostapd/main.c
index d1a54ce..900bba9 100644 (file)
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -184,6 +184,7 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
        }
        params.bssid = b;
        params.ifname = hapd->conf->iface;
+       params.driver_params = hapd->iconf->driver_params;
        params.use_pae_group_addr = hapd->conf->use_pae_group_addr;
 
        params.num_bridge = hapd->iface->num_bss;

diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index e39effa..e888b69 100644 (file)
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -566,6 +566,7 @@ void hostapd_config_free(struct hostapd_config *conf)
        os_free(conf->supported_rates);
        os_free(conf->basic_rates);
        os_free(conf->chanlist);
+       os_free(conf->driver_params);
 
        os_free(conf);
 }

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index cf10cdb..7abfb5f 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -572,6 +572,7 @@ struct hostapd_config {
        int *basic_rates;
 
        const struct wpa_driver_ops *driver;
+       char *driver_params;
 
        int ap_table_max_size;
        int ap_table_expiration_time;

diff --git a/src/drivers/driver.h b/src/drivers/driver.h
index 774e345..aaac0b1 100644 (file)
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -1247,6 +1247,7 @@ struct wpa_init_params {
        void *global_priv;
        const u8 *bssid;
        const char *ifname;
+       const char *driver_params;
        int use_pae_group_addr;
        char **bridge;
        size_t num_bridge;

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 2b4abf3..ce5639a 100644 (file)
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -155,7 +155,8 @@ static int wpa_driver_nl80211_set_mode_ibss(struct i802_bss *bss,
 
 static int
 wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *set_addr, int first);
+                                  const u8 *set_addr, int first,
+                                  const char *driver_params);
 static int wpa_driver_nl80211_mlme(struct wpa_driver_nl80211_data *drv,
                                   const u8 *addr, int cmd, u16 reason_code,
                                   int local_state_change);
@@ -185,6 +186,7 @@ static int nl80211_leave_ibss(struct wpa_driver_nl80211_data *drv);
 
 static int i802_set_freq(void *priv, struct hostapd_freq_params *freq);
 static int i802_set_iface_flags(struct i802_bss *bss, int up);
+static int nl80211_set_param(void *priv, const char *param);
 
 
 /* Converts nl80211_chan_width to a common format */
@@ -836,7 +838,7 @@ static int wpa_driver_nl80211_own_ifindex(struct wpa_driver_nl80211_data *drv,
        if (drv->if_removed && wpa_driver_nl80211_own_ifname(drv, buf, len)) {
                wpa_printf(MSG_DEBUG, "nl80211: Update ifindex for a removed "
                           "interface");
-               wpa_driver_nl80211_finish_drv_init(drv, NULL, 0);
+               wpa_driver_nl80211_finish_drv_init(drv, NULL, 0, NULL);
                return 1;
        }
 
@@ -1659,7 +1661,8 @@ static void nl80211_destroy_bss(struct i802_bss *bss)
 
 static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
                                          void *global_priv, int hostapd,
-                                         const u8 *set_addr)
+                                         const u8 *set_addr,
+                                         const char *driver_params)
 {
        struct wpa_driver_nl80211_data *drv;
        struct rfkill_config *rcfg;
@@ -1716,7 +1719,7 @@ static void * wpa_driver_nl80211_drv_init(void *ctx, const char *ifname,
        if (linux_iface_up(drv->global->ioctl_sock, ifname) > 0)
                drv->start_iface_up = 1;
 
-       if (wpa_driver_nl80211_finish_drv_init(drv, set_addr, 1))
+       if (wpa_driver_nl80211_finish_drv_init(drv, set_addr, 1, driver_params))
                goto failed;
 
        drv->eapol_tx_sock = socket(PF_PACKET, SOCK_DGRAM, 0);
@@ -1765,7 +1768,8 @@ failed:
 static void * wpa_driver_nl80211_init(void *ctx, const char *ifname,
                                      void *global_priv)
 {
-       return wpa_driver_nl80211_drv_init(ctx, ifname, global_priv, 0, NULL);
+       return wpa_driver_nl80211_drv_init(ctx, ifname, global_priv, 0, NULL,
+                                          NULL);
 }
 
 
@@ -2188,7 +2192,8 @@ static int i802_set_iface_flags(struct i802_bss *bss, int up)
 
 static int
 wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
-                                  const u8 *set_addr, int first)
+                                  const u8 *set_addr, int first,
+                                  const char *driver_params)
 {
        struct i802_bss *bss = drv->first_bss;
        int send_rfkill_event = 0;
@@ -2209,6 +2214,9 @@ wpa_driver_nl80211_finish_drv_init(struct wpa_driver_nl80211_data *drv,
        if (wpa_driver_nl80211_capa(drv))
                return -1;
 
+       if (driver_params && nl80211_set_param(bss, driver_params) < 0)
+               return -1;
+
        wpa_printf(MSG_DEBUG, "nl80211: interface %s in phy %s",
                   bss->ifname, drv->phyname);
 
@@ -6401,7 +6409,7 @@ static void *i802_init(struct hostapd_data *hapd,
 
        bss = wpa_driver_nl80211_drv_init(hapd, params->ifname,
                                          params->global_priv, 1,
-                                         params->bssid);
+                                         params->bssid, params->driver_params);
        if (bss == NULL)
                return NULL;