git.openwrt.org Git - openwrt/staging/florian.git/blob

   1 From 4bb69d15477e0f2b00e166845341dc933de47c58 Mon Sep 17 00:00:00 2001
   2 From: Antonio Quartulli <ordex@autistici.org>
   3 Date: Sun, 3 Jun 2012 18:22:56 +0200
   4 Subject: [PATCHv2 601/602] wpa_supplicant: add new config params to be used
   5  with the ibss join command
   6
   7 Signed-hostap: Antonio Quartulli <ordex@autistici.org>
   8 ---
   9  src/drivers/driver.h            |    6 +++
  10  wpa_supplicant/config.c         |   96 +++++++++++++++++++++++++++++++++++++++
  11  wpa_supplicant/config_ssid.h    |    6 +++
  12  wpa_supplicant/wpa_supplicant.c |   23 +++++++---
  13  4 files changed, 124 insertions(+), 7 deletions(-)
  14
  15 --- a/src/drivers/driver.h
  16 +++ b/src/drivers/driver.h
  17 @@ -19,6 +19,7 @@
  18
  19  #define WPA_SUPPLICANT_DRIVER_VERSION 4
  20
  21 +#include "drivers/nl80211_copy.h"
  22  #include "common/defs.h"
  23
  24  #define HOSTAPD_CHAN_DISABLED 0x00000001
  25 @@ -370,6 +371,11 @@ struct wpa_driver_associate_params {
  26          */
  27         int freq;
  28
  29 +       int beacon_interval;
  30 +       int fixed_freq;
  31 +       unsigned char rates[NL80211_MAX_SUPP_RATES];
  32 +       int mcast_rate;
  33 +
  34         /**
  35          * bg_scan_period - Background scan period in seconds, 0 to disable
  36          * background scan, or -1 to indicate no change to default driver
  37 --- a/wpa_supplicant/config.c
  38 +++ b/wpa_supplicant/config.c
  39 @@ -14,6 +14,7 @@
  40  #include "rsn_supp/wpa.h"
  41  #include "eap_peer/eap.h"
  42  #include "p2p/p2p.h"
  43 +#include "drivers/nl80211_copy.h"
  44  #include "config.h"
  45
  46
  47 @@ -1374,6 +1375,97 @@ static char * wpa_config_write_p2p_clien
  48
  49  #endif /* CONFIG_P2P */
  50
  51 +static int wpa_config_parse_mcast_rate(const struct parse_data *data,
  52 +                                      struct wpa_ssid *ssid, int line,
  53 +                                      const char *value)
  54 +{
  55 +       ssid->mcast_rate = (int)(strtod(value, NULL) * 10);
  56 +
  57 +       return 0;
  58 +}
  59 +
  60 +#ifndef NO_CONFIG_WRITE
  61 +static char * wpa_config_write_mcast_rate(const struct parse_data *data,
  62 +                                         struct wpa_ssid *ssid)
  63 +{
  64 +       char *value;
  65 +       int res;
  66 +
  67 +       if (!ssid->mcast_rate == 0)
  68 +               return NULL;
  69 +
  70 +       value = os_malloc(6); /* longest: 300.0 */
  71 +       if (value == NULL)
  72 +               return NULL;
  73 +       res = os_snprintf(value, 5, "%.1f", (double)ssid->mcast_rate / 10);
  74 +       if (res < 0) {
  75 +               os_free(value);
  76 +               return NULL;
  77 +       }
  78 +       return value;
  79 +}
  80 +#endif /* NO_CONFIG_WRITE */
  81 +
  82 +static int wpa_config_parse_rates(const struct parse_data *data,
  83 +                                 struct wpa_ssid *ssid, int line,
  84 +                                 const char *value)
  85 +{
  86 +       int i;
  87 +       char *pos, *r, *sptr, *end;
  88 +       double rate;
  89 +
  90 +       pos = (char *)value;
  91 +       r = strtok_r(pos, ",", &sptr);
  92 +       i = 0;
  93 +       while (pos && i < NL80211_MAX_SUPP_RATES) {
  94 +               rate = 0.0;
  95 +               if (r)
  96 +                       rate = strtod(r, &end);
  97 +               ssid->rates[i] = rate * 2;
  98 +               if (*end != '\0' || rate * 2 != ssid->rates[i])
  99 +                       return 1;
 100 +
 101 +               i++;
 102 +               r = strtok_r(NULL, ",", &sptr);
 103 +       }
 104 +
 105 +       return 0;
 106 +}
 107 +
 108 +#ifndef NO_CONFIG_WRITE
 109 +static char * wpa_config_write_rates(const struct parse_data *data,
 110 +                                    struct wpa_ssid *ssid)
 111 +{
 112 +       char *value, *pos;
 113 +       int res, i;
 114 +
 115 +       if (ssid->rates[0] <= 0)
 116 +               return NULL;
 117 +
 118 +       value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1);
 119 +       if (value == NULL)
 120 +               return NULL;
 121 +       pos = value;
 122 +       for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) {
 123 +               res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
 124 +               if (res < 0) {
 125 +                       os_free(value);
 126 +                       return NULL;
 127 +               }
 128 +               pos += res;
 129 +       }
 130 +       res = os_snprintf(pos, 6, "%.1f",
 131 +                         (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2);
 132 +       if (res < 0) {
 133 +               os_free(value);
 134 +               return NULL;
 135 +       }
 136 +
 137 +       value[6 * NL80211_MAX_SUPP_RATES] = '\0';
 138 +       return value;
 139 +}
 140 +#endif /* NO_CONFIG_WRITE */
 141 +
 142  /* Helper macros for network block parser */
 143
 144  #ifdef OFFSET
 145 @@ -1573,6 +1665,9 @@ static const struct parse_data ssid_fiel
 146         { INT(ap_max_inactivity) },
 147         { INT(dtim_period) },
 148         { INT(beacon_int) },
 149 +       { INT_RANGE(fixed_freq, 0, 1) },
 150 +       { FUNC(rates) },
 151 +       { FUNC(mcast_rate) },
 152  };
 153
 154  #undef OFFSET
 155 --- a/wpa_supplicant/config_ssid.h
 156 +++ b/wpa_supplicant/config_ssid.h
 157 @@ -11,6 +11,7 @@
 158
 159  #include "common/defs.h"
 160  #include "eap_peer/eap_config.h"
 161 +#include "drivers/nl80211_copy.h"
 162
 163  #define MAX_SSID_LEN 32
 164
 165 @@ -600,6 +601,10 @@ struct wpa_ssid {
 166          * dereferences since it may not be updated in all cases.
 167          */
 168         void *parent_cred;
 169 +
 170 +       int fixed_freq;
 171 +       unsigned char rates[NL80211_MAX_SUPP_RATES];
 172 +       double mcast_rate;
 173  };
 174
 175  #endif /* CONFIG_SSID_H */
 176 --- a/wpa_supplicant/wpa_supplicant.c
 177 +++ b/wpa_supplicant/wpa_supplicant.c
 178 @@ -1594,15 +1594,24 @@ void wpa_supplicant_associate(struct wpa
 179                 params.ssid_len = ssid->ssid_len;
 180         }
 181
 182 -       if (ssid->mode == WPAS_MODE_IBSS && ssid->bssid_set &&
 183 -           wpa_s->conf->ap_scan == 2) {
 184 -               params.bssid = ssid->bssid;
 185 -               params.fixed_bssid = 1;
 186 +       if (ssid->mode == WPAS_MODE_IBSS) {
 187 +               if (ssid->bssid_set && wpa_s->conf->ap_scan == 2) {
 188 +                       params.bssid = ssid->bssid;
 189 +                       params.fixed_bssid = 1;
 190 +               }
 191 +               if (ssid->frequency > 0 && params.freq == 0)
 192 +                       /* Initial channel for IBSS */
 193 +                       params.freq = ssid->frequency;
 194 +               params.fixed_freq = ssid->fixed_freq;
 195 +               params.beacon_interval = ssid->beacon_int;
 196 +               i = 0;
 197 +               while (i < NL80211_MAX_SUPP_RATES) {
 198 +                       params.rates[i] = ssid->rates[i];
 199 +                       i++;
 200 +               }
 201 +               params.mcast_rate = ssid->mcast_rate;
 202         }
 203
 204 -       if (ssid->mode == WPAS_MODE_IBSS && ssid->frequency > 0 &&
 205 -           params.freq == 0)
 206 -               params.freq = ssid->frequency; /* Initial channel for IBSS */
 207         params.wpa_ie = wpa_ie;
 208         params.wpa_ie_len = wpa_ie_len;
 209         params.pairwise_suite = cipher_pairwise;