iw: Print 802.11u roaming consortium IE in scan results.

[thirdparty/iw.git] / ibss.c

diff --git a/ibss.c b/ibss.c
index 8785e7acaffd68fa0767f00e48f2cb500ae74b53..955446e445dddf1563cdeb9e901ac98edde905f6 100644 (file)
--- a/ibss.c
+++ b/ibss.c
@@ -1,4 +1,9 @@
+#ifndef _POSIX_SOURCE
+#define _POSIX_SOURCE
+#endif
 #include <errno.h>
+#include <string.h>
+#include <strings.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -9,13 +14,32 @@
 #include "nl80211.h"
 #include "iw.h"
 
+SECTION(ibss);
+
 static int join_ibss(struct nl80211_state *state,
                     struct nl_cb *cb,
                     struct nl_msg *msg,
-                    int argc, char **argv)
+                    int argc, char **argv,
+                    enum id_input id)
 {
        char *end;
        unsigned char abssid[6];
+       unsigned char rates[NL80211_MAX_SUPP_RATES];
+       int n_rates = 0;
+       char *value = NULL, *sptr = NULL;
+       float rate;
+       int bintval;
+       int i;
+       static const struct {
+               const char *name;
+               unsigned int val;
+       } htmap[] = {
+               { .name = "HT20", .val = NL80211_CHAN_HT20, },
+               { .name = "HT40+", .val = NL80211_CHAN_HT40PLUS, },
+               { .name = "HT40-", .val = NL80211_CHAN_HT40MINUS, },
+               { .name = "NOHT", .val = NL80211_CHAN_NO_HT, },
+       };
+       unsigned int htval;
 
        if (argc < 2)
                return 1;
@@ -33,6 +57,22 @@ static int join_ibss(struct nl80211_state *state,
        argv++;
        argc--;
 
+       if (argc) {
+               for (i = 0; i < ARRAY_SIZE(htmap); i++) {
+                       if (strcasecmp(htmap[i].name, argv[0]) == 0) {
+                               htval = htmap[i].val;
+                               break;
+                       }
+               }
+               if (i != ARRAY_SIZE(htmap)) {
+                       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+                                   htval);
+                       argv++;
+                       argc--;
+               }
+
+       }
+
        if (argc && strcmp(argv[0], "fixed-freq") == 0) {
                NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED);
                argv++;
@@ -47,6 +87,57 @@ static int join_ibss(struct nl80211_state *state,
                }
        }
 
+       if (argc > 1 && strcmp(argv[0], "beacon-interval") == 0) {
+               argv++;
+               argc--;
+               bintval = strtoul(argv[0], &end, 10);
+               if (*end != '\0')
+                       return 1;
+               NLA_PUT_U32(msg, NL80211_ATTR_BEACON_INTERVAL, bintval);
+               argv++;
+               argc--;
+       }
+
+       /* basic rates */
+       if (argc > 1 && strcmp(argv[0], "basic-rates") == 0) {
+               argv++;
+               argc--;
+
+               value = strtok_r(argv[0], ",", &sptr);
+
+               while (value && n_rates < NL80211_MAX_SUPP_RATES) {
+                       rate = strtod(value, &end);
+                       rates[n_rates] = rate * 2;
+
+                       /* filter out suspicious values  */
+                       if (*end != '\0' || !rates[n_rates] ||
+                           rate*2 != rates[n_rates])
+                               return 1;
+
+                       n_rates++;
+                       value = strtok_r(NULL, ",", &sptr);
+               }
+
+               NLA_PUT(msg, NL80211_ATTR_BSS_BASIC_RATES, n_rates, rates);
+
+               argv++;
+               argc--;
+       }
+
+       /* multicast rate */
+       if (argc > 1 && strcmp(argv[0], "mcast-rate") == 0) {
+               argv++;
+               argc--;
+
+               rate = strtod(argv[0], &end);
+               if (*end != '\0')
+                       return 1;
+
+               NLA_PUT_U32(msg, NL80211_ATTR_MCAST_RATE, (int)(rate * 10));
+               argv++;
+               argc--;
+       }
+
        if (!argc)
                return 0;
 
@@ -64,17 +155,22 @@ static int join_ibss(struct nl80211_state *state,
 static int leave_ibss(struct nl80211_state *state,
                      struct nl_cb *cb,
                      struct nl_msg *msg,
-                     int argc, char **argv)
+                     int argc, char **argv,
+                     enum id_input id)
 {
        return 0;
 }
 COMMAND(ibss, leave, NULL,
        NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss,
        "Leave the current IBSS cell.");
-COMMAND(ibss, join, "<SSID> <freq in MHz> [fixed-freq] [<fixed bssid>] [key d:0:abcde]",
+COMMAND(ibss, join,
+       "<SSID> <freq in MHz> [HT20|HT40+|HT40-|NOHT] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
+       " [basic-rates <rate in Mbps,rate2,...>] [mcast-rate <rate in Mbps>] "
+       "[key d:0:abcde]",
        NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss,
        "Join the IBSS cell with the given SSID, if it doesn't exist create\n"
        "it on the given frequency. When fixed frequency is requested, don't\n"
        "join/create a cell on a different frequency. When a fixed BSSID is\n"
        "requested use that BSSID and do not adopt another cell's BSSID even\n"
-       "if it has higher TSF and the same SSID.");
+       "if it has higher TSF and the same SSID. If an IBSS is created, create\n"
+       "it with the specified basic-rates, multicast-rate and beacon-interval.");