iw: Add support to send a request to set the regulatory domain

You can set the regulatory domain with this now.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

diff --git a/COPYING b/COPYING
index 1ba9ded0a69304f026101c3f82c3e2e20d5655ca..fc9a519b0fc14208b4b149e346856231b4882bd1 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,7 @@
 Copyright (c) 2007, 2008       Johannes Berg
 Copyright (c) 2007             Andy Lutomirski
 Copyright (c) 2007             Mike Kershaw
+Copyright (c) 2008             Luis R. Rodriguez
 
 All rights reserved.
 

diff --git a/Makefile b/Makefile
index c6990cc9c1a279359af05a5fc3512f40bbf0eb26..0c0bfbeaffcb56921e02fdf73d6a33e2f8cdf38c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS += -I/lib/modules/`uname -r`/build/include
 CFLAGS += -O2 -g
 LDFLAGS += -lnl
 
-OBJS = iw.o interface.o info.o station.o util.o mpath.o
+OBJS = iw.o interface.o info.o station.o util.o mpath.o reg.o
 ALL = iw
 
 ifeq ($(V),1)

diff --git a/iw.c b/iw.c
index 2661d7c19ad24774df23c507c075d20ddbfcf8a7..09a04cbeb36abbd41aebd910ef8610ee4b234411 100644 (file)
--- a/iw.c
+++ b/iw.c
@@ -93,7 +93,8 @@ static int get_phy_or_dev(int *argc, char ***argv, char **name)
 static void usage(char *argv0)
 {
        fprintf(stderr, "Usage: %1$s dev <phydev> <OBJECT> <COMMAND> [OPTIONS]"
-                       "\n     %1$s dev <phydev> info\n"
+                       "\n     %1$s dev <phydev> info"
+                       "\n     %1$s reg set <ISO/IEC 3166-1 alpha2>\n"
                        "\n"
                        "where OBJECT := { interface | station | mpath | info }\n"
                        "and COMMAND := { add | del | set | get | dump }\n",
@@ -119,6 +120,13 @@ int main(int argc, char **argv)
                goto out;
        }
 
+       if (strcmp(argv[0], "reg") == 0) {
+               argc--;
+               argv++;
+               err = handle_reg(&nlstate, argc, argv);
+               goto out;
+       }
+
        pod = get_phy_or_dev(&argc, &argv, &ifname);
        if (pod == 0) {
                err = 1;

diff --git a/iw.h b/iw.h
index 0ece3af791ae5f1a136772ee93c015695aa8ad62..e02305990a3b48e5954156339b0aa287d939193f 100644 (file)
--- a/iw.h
+++ b/iw.h
@@ -25,6 +25,9 @@ int handle_station(struct nl80211_state *state,
 int handle_mpath(struct nl80211_state *state,
                   char *dev, int argc, char **argv);
 
+int handle_reg(struct nl80211_state *state,
+                  int argc, char **argv);
+
 int mac_addr_a2n(unsigned char *mac_addr, char *arg);
 int mac_addr_n2a(char *mac_addr, unsigned char *arg);
 

diff --git a/reg.c b/reg.c
new file mode 100644 (file)
index 0000000..37d198d
--- /dev/null
+++ b/reg.c
@@ -0,0 +1,155 @@
+#include <linux/nl80211.h>
+#include <net/if.h>
+#include <errno.h>
+#include <string.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 "iw.h"
+
+static int wait_handler(struct nl_msg *msg, void *arg)
+{
+       int *finished = arg;
+
+       *finished = 1;
+       return NL_STOP;
+}
+
+static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
+                        void *arg)
+{
+       fprintf(stderr, "nl80211 error %d\n", err->error);
+       exit(err->error);
+}
+
+static int reg_handler(struct nl_msg *msg, void *arg)
+{
+        return NL_SKIP;
+}
+
+int isalpha_upper(char letter)
+{
+       if (letter >= 65 && letter <= 90)
+               return 1;
+       return 0;
+}
+
+static int is_alpha2(char *alpha2)
+{
+       if (isalpha_upper(alpha2[0]) && isalpha_upper(alpha2[1]))
+               return 1;
+       return 0;
+}
+
+static int is_world_regdom(char *alpha2)
+{
+       /* ASCII 0 */
+       if (alpha2[0] == 48 && alpha2[1] == 48)
+               return 1;
+       return 0;
+}
+
+static int handle_reg_set(struct nl80211_state *state,
+                       int argc, char **argv)
+{
+       struct nl_msg *msg;
+       struct nl_cb *cb = NULL;
+       int ret = -1;
+       int err;
+       int finished = 0;
+       char alpha2[3];
+
+       if (argc < 1) {
+               fprintf(stderr, "not enough arguments\n");
+               return -1;
+       }
+
+       if (!is_alpha2(argv[0]) && !is_world_regdom(argv[0])) {
+               fprintf(stderr, "not a valid ISO/IEC 3166-1 alpha2\n");
+               fprintf(stderr, "Special non-alph2 usable entries:\n");
+               fprintf(stderr, "\t00\tWorld Regulatory domain\n");
+               return -1;
+       }
+
+       alpha2[0] = argv[0][0];
+       alpha2[1] = argv[0][1];
+       alpha2[2] = '\0';
+
+       argc--;
+       argv++;
+
+       if (argc) {
+               fprintf(stderr, "too many arguments\n");
+               return -1;
+       }
+
+       msg = nlmsg_alloc();
+       if (!msg)
+               goto out;
+
+       genlmsg_put(msg, 0, 0, genl_family_get_id(state->nl80211), 0,
+                   0, NL80211_CMD_REQ_SET_REG, 0);
+
+       NLA_PUT_STRING(msg, NL80211_ATTR_REG_ALPHA2, alpha2);
+
+       cb = nl_cb_alloc(NL_CB_CUSTOM);
+       if (!cb)
+               goto out;
+
+       err = nl_send_auto_complete(state->nl_handle, msg);
+
+       if (err < 0) {
+               fprintf(stderr, "failed to send reg set command\n");
+               goto out;
+       }
+
+       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, reg_handler, NULL);
+       nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, wait_handler, &finished);
+       nl_cb_err(cb, NL_CB_CUSTOM, error_handler, NULL);
+
+       err = nl_recvmsgs(state->nl_handle, cb);
+
+       if (!finished) {
+               err = nl_wait_for_ack(state->nl_handle);
+       }
+
+       if (err < 0)
+               goto out;
+
+       ret = 0;
+
+ out:
+       nl_cb_put(cb);
+ nla_put_failure:
+       nlmsg_free(msg);
+       return ret;
+}
+
+int handle_reg(struct nl80211_state *state,
+                  int argc, char **argv)
+{
+       char *cmd = argv[0];
+
+       if (argc < 1) {
+               fprintf(stderr, "you must specify an station command\n");
+               return -1;
+       }
+
+       argc--;
+       argv++;
+
+       /* XXX: write support for getting the currently set regdomain
+       if (strcmp(cmd, "get") == 0)
+               return handle_reg_get(state, argc, argv);
+       */
+
+       if (strcmp(cmd, "set") == 0)
+               return handle_reg_set(state, argc, argv);
+
+       printf("invalid regulatory command %s\n", cmd);
+       return -1;
+}