info: macro-ify ext_feat_print()

[thirdparty/iw.git] / ibss.c

diff --git a/ibss.c b/ibss.c
index 649143005cbee3e55bc543ec3371dcd660590c9a..f6cbc4ca88017ecdbcf3df60bcd0e335ebddba57 100644 (file)
--- a/ibss.c
+++ b/ibss.c
@@ -1,10 +1,6 @@
 #include <errno.h>
-
-#include <netlink/genl/genl.h>
-#include <netlink/genl/family.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/msg.h>
-#include <netlink/attr.h>
+#include <string.h>
+#include <strings.h>
 
 #include "nl80211.h"
 #include "iw.h"
@@ -12,16 +8,19 @@
 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;
+       struct chandef chandef;
        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 parsed, err;
 
        if (argc < 2)
                return 1;
@@ -31,13 +30,16 @@ static int join_ibss(struct nl80211_state *state,
        argv++;
        argc--;
 
-       /* freq */
-       NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ,
-                   strtoul(argv[0], &end, 10));
-       if (*end != '\0')
-               return 1;
-       argv++;
-       argc--;
+       err = parse_freqchan(&chandef, false, argc, argv, &parsed);
+       if (err)
+               return err;
+
+       argv += parsed;
+       argc -= parsed;
+
+       err = put_chandef(msg, &chandef);
+       if (err)
+               return err;
 
        if (argc && strcmp(argv[0], "fixed-freq") == 0) {
                NLA_PUT_FLAG(msg, NL80211_ATTR_FREQ_FIXED);
@@ -53,6 +55,17 @@ 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++;
@@ -79,6 +92,20 @@ static int join_ibss(struct nl80211_state *state,
                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;
 
@@ -88,15 +115,15 @@ static int join_ibss(struct nl80211_state *state,
        argv++;
        argc--;
 
-       return parse_keys(msg, argv, argc);
+       return parse_keys(msg, &argv, &argc);
  nla_put_failure:
        return -ENOSPC;
 }
 
 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;
 }
@@ -104,11 +131,13 @@ 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>] "
-       "[basic-rates <rate in Mbps,rate2,...>] [key d:0:abcde]",
+       "<SSID> <freq in MHz> [NOHT|HT20|HT40+|HT40-|5MHz|10MHz|80MHz] [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.");