info: macro-ify ext_feat_print()

[thirdparty/iw.git] / ibss.c

diff --git a/ibss.c b/ibss.c
index 62a11106615f33d6d48abc73c5bd3e8ecaea4086..f6cbc4ca88017ecdbcf3df60bcd0e335ebddba57 100644 (file)
--- a/ibss.c
+++ b/ibss.c
@@ -1,44 +1,26 @@
-#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>
-#include <netlink/genl/ctrl.h>
-#include <netlink/msg.h>
-#include <netlink/attr.h>
-
 #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;
+       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 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;
+       int parsed, err;
 
        if (argc < 2)
                return 1;
@@ -48,29 +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;
 
-       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--;
-               }
+       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);
@@ -146,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;
 }
@@ -162,7 +131,7 @@ 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> [HT20|HT40+|HT40-|NOHT] [fixed-freq] [<fixed bssid>] [beacon-interval <TU>]"
+       "<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,