]> git.ipfire.org Git - thirdparty/iw.git/blobdiff - phy.c
iw: bump version to 4.7
[thirdparty/iw.git] / phy.c
diff --git a/phy.c b/phy.c
index 7f8ce26a70b0290c265e0278151b5d854fda46ea..13e8260ed78a9f4519dbd9833ef970735c0e896a 100644 (file)
--- a/phy.c
+++ b/phy.c
@@ -1,7 +1,9 @@
 #include <stdbool.h>
 #include <errno.h>
-#include <net/if.h>
 #include <strings.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -13,7 +15,6 @@
 #include "iw.h"
 
 static int handle_name(struct nl80211_state *state,
-                      struct nl_cb *cb,
                       struct nl_msg *msg,
                       int argc, char **argv,
                       enum id_input id)
@@ -43,7 +44,7 @@ static int handle_freqs(struct nl_msg *msg, int argc, char **argv)
                { .name = "160", .val = NL80211_CHAN_WIDTH_160, },
        };
        uint32_t freq;
-       int i, bwval = NL80211_CHAN_WIDTH_20_NOHT;
+       unsigned int i, bwval = NL80211_CHAN_WIDTH_20_NOHT;
        char *end;
 
        if (argc < 1)
@@ -102,7 +103,7 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
        };
        unsigned int htval = NL80211_CHAN_NO_HT;
        unsigned int freq;
-       int i;
+       unsigned int i;
 
        if (!argc || argc > 4)
                return 1;
@@ -113,8 +114,11 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
        if (*end)
                return 1;
 
-       if (chan)
-               freq = ieee80211_channel_to_frequency(freq);
+       if (chan) {
+               enum nl80211_band band;
+               band = freq <= 14 ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
+               freq = ieee80211_channel_to_frequency(freq, band);
+       }
 
        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
 
@@ -138,8 +142,7 @@ static int handle_freqchan(struct nl_msg *msg, bool chan,
        return -ENOBUFS;
 }
 
-static int handle_freq(struct nl80211_state *state,
-                      struct nl_cb *cb, struct nl_msg *msg,
+static int handle_freq(struct nl80211_state *state, struct nl_msg *msg,
                       int argc, char **argv,
                       enum id_input id)
 {
@@ -153,8 +156,7 @@ COMMAND(set, freq, "<freq> [HT20|HT40+|HT40-]\n"
                   "<control freq> [20|40|80|80+80|160] [<center freq 1>] [<center freq 2>]",
        NL80211_CMD_SET_WIPHY, 0, CIB_NETDEV, handle_freq, NULL);
 
-static int handle_chan(struct nl80211_state *state,
-                      struct nl_cb *cb, struct nl_msg *msg,
+static int handle_chan(struct nl80211_state *state, struct nl_msg *msg,
                       int argc, char **argv,
                       enum id_input id)
 {
@@ -166,7 +168,7 @@ COMMAND(set, channel, "<channel> [HT20|HT40+|HT40-]",
        NL80211_CMD_SET_WIPHY, 0, CIB_NETDEV, handle_chan, NULL);
 
 static int handle_fragmentation(struct nl80211_state *state,
-                               struct nl_cb *cb, struct nl_msg *msg,
+                               struct nl_msg *msg,
                                int argc, char **argv,
                                enum id_input id)
 {
@@ -198,7 +200,7 @@ COMMAND(set, frag, "<fragmentation threshold|off>",
        "Set fragmentation threshold.");
 
 static int handle_rts(struct nl80211_state *state,
-                     struct nl_cb *cb, struct nl_msg *msg,
+                     struct nl_msg *msg,
                      int argc, char **argv,
                      enum id_input id)
 {
@@ -229,36 +231,132 @@ COMMAND(set, rts, "<rts threshold|off>",
        NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_rts,
        "Set rts threshold.");
 
+static int handle_retry(struct nl80211_state *state,
+                       struct nl_msg *msg,
+                       int argc, char **argv, enum id_input id)
+{
+       unsigned int retry_short = 0, retry_long = 0;
+       bool have_retry_s = false, have_retry_l = false;
+       int i;
+       enum {
+               S_NONE,
+               S_SHORT,
+               S_LONG,
+       } parser_state = S_NONE;
+
+       if (!argc || (argc != 2 && argc != 4))
+               return 1;
+
+       for (i = 0; i < argc; i++) {
+               char *end;
+               unsigned int tmpul;
+
+               if (strcmp(argv[i], "short") == 0) {
+                       if (have_retry_s)
+                               return 1;
+                       parser_state = S_SHORT;
+                       have_retry_s = true;
+               } else if (strcmp(argv[i], "long") == 0) {
+                       if (have_retry_l)
+                               return 1;
+                       parser_state = S_LONG;
+                       have_retry_l = true;
+               } else {
+                       tmpul = strtoul(argv[i], &end, 10);
+                       if (*end != '\0')
+                               return 1;
+                       if (!tmpul || tmpul > 255)
+                               return -EINVAL;
+                       switch (parser_state) {
+                       case S_SHORT:
+                               retry_short = tmpul;
+                               break;
+                       case S_LONG:
+                               retry_long = tmpul;
+                               break;
+                       default:
+                               return 1;
+                       }
+               }
+       }
+
+       if (!have_retry_s && !have_retry_l)
+               return 1;
+       if (have_retry_s)
+               NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_RETRY_SHORT, retry_short);
+       if (have_retry_l)
+               NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_RETRY_LONG, retry_long);
+
+       return 0;
+ nla_put_failure:
+       return -ENOBUFS;
+}
+COMMAND(set, retry, "[short <limit>] [long <limit>]",
+       NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_retry,
+       "Set retry limit.");
+
+#ifndef NETNS_RUN_DIR
+#define NETNS_RUN_DIR "/var/run/netns"
+#endif
+static int netns_get_fd(const char *name)
+{
+       char pathbuf[MAXPATHLEN];
+       const char *path, *ptr;
+
+       path = name;
+       ptr = strchr(name, '/');
+       if (!ptr) {
+               snprintf(pathbuf, sizeof(pathbuf), "%s/%s",
+                       NETNS_RUN_DIR, name );
+               path = pathbuf;
+       }
+       return open(path, O_RDONLY);
+}
+
 static int handle_netns(struct nl80211_state *state,
-                       struct nl_cb *cb,
                        struct nl_msg *msg,
                        int argc, char **argv,
                        enum id_input id)
 {
        char *end;
+       int fd;
 
-       if (argc != 1)
+       if (argc < 1 || !*argv[0])
                return 1;
 
-       if (!*argv[0])
+       if (argc == 1) {
+               NLA_PUT_U32(msg, NL80211_ATTR_PID,
+                               strtoul(argv[0], &end, 10));
+               if (*end != '\0') {
+                       printf("Invalid parameter: pid(%s)\n", argv[0]);
+                       return 1;
+               }
+               return 0;
+       }
+
+       if (argc != 2 || strcmp(argv[0], "name"))
                return 1;
 
-       NLA_PUT_U32(msg, NL80211_ATTR_PID,
-                   strtoul(argv[0], &end, 10));
+       if ((fd = netns_get_fd(argv[1])) >= 0) {
+               NLA_PUT_U32(msg, NL80211_ATTR_NETNS_FD, fd);
+               return 0;
+       } else {
+               printf("Invalid parameter: nsname(%s)\n", argv[0]);
+       }
 
-       if (*end != '\0')
-               return 1;
+       return 1;
 
-       return 0;
  nla_put_failure:
        return -ENOBUFS;
 }
-COMMAND(set, netns, "<pid>",
+COMMAND(set, netns, "{ <pid> | name <nsname> }",
        NL80211_CMD_SET_WIPHY_NETNS, 0, CIB_PHY, handle_netns,
-       "Put this wireless device into a different network namespace");
+       "Put this wireless device into a different network namespace:\n"
+       "    <pid>    - change network namespace by process id\n"
+       "    <nsname> - change network namespace by name from "NETNS_RUN_DIR"\n"
+       "               or by absolute path (man ip-netns)\n");
 
 static int handle_coverage(struct nl80211_state *state,
-                       struct nl_cb *cb,
                        struct nl_msg *msg,
                        int argc, char **argv,
                        enum id_input id)
@@ -290,48 +388,53 @@ COMMAND(set, coverage, "<coverage class>",
        "Valid values: 0 - 255.");
 
 static int handle_distance(struct nl80211_state *state,
-                       struct nl_cb *cb,
                        struct nl_msg *msg,
                        int argc, char **argv,
                        enum id_input id)
 {
-       char *end;
-       unsigned int distance, coverage;
-
        if (argc != 1)
                return 1;
 
        if (!*argv[0])
                return 1;
 
-       distance = strtoul(argv[0], &end, 10);
+       if (strcmp("auto", argv[0]) == 0) {
+               NLA_PUT_FLAG(msg, NL80211_ATTR_WIPHY_DYN_ACK);
+       } else {
+               char *end;
+               unsigned int distance, coverage;
 
-       if (*end)
-               return 1;
+               distance = strtoul(argv[0], &end, 10);
 
-       /*
-        * Divide double the distance by the speed of light in m/usec (300) to
-        * get round-trip time in microseconds and then divide the result by
-        * three to get coverage class as specified in IEEE 802.11-2007 table
-        * 7-27. Values are rounded upwards.
-        */
-       coverage = (distance + 449) / 450;
-       if (coverage > 255)
-               return 1;
+               if (*end)
+                       return 1;
 
-       NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage);
+               /*
+                * Divide double the distance by the speed of light
+                * in m/usec (300) to get round-trip time in microseconds
+                * and then divide the result by three to get coverage class
+                * as specified in IEEE 802.11-2007 table 7-27.
+                * Values are rounded upwards.
+                */
+               coverage = (distance + 449) / 450;
+               if (coverage > 255)
+                       return 1;
+
+               NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS, coverage);
+       }
 
        return 0;
  nla_put_failure:
        return -ENOBUFS;
 }
-COMMAND(set, distance, "<distance>",
+COMMAND(set, distance, "<auto|distance>",
        NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_distance,
-       "Set appropriate coverage class for given link distance in meters.\n"
+       "Enable ACK timeout estimation algorithm (dynack) or set appropriate\n"
+       "coverage class for given link distance in meters.\n"
+       "To disable dynack set valid value for coverage class.\n"
        "Valid values: 0 - 114750");
 
 static int handle_txpower(struct nl80211_state *state,
-                         struct nl_cb *cb,
                          struct nl_msg *msg,
                          int argc, char **argv,
                          enum id_input id)
@@ -383,7 +486,6 @@ COMMAND(set, txpower, "<auto|fixed|limit> [<tx power in mBm>]",
        "Specify transmit power level and setting type.");
 
 static int handle_antenna(struct nl80211_state *state,
-                         struct nl_cb *cb,
                          struct nl_msg *msg,
                          int argc, char **argv,
                          enum id_input id)