ibss: use correct "MHz" instead of "MHZ"

[thirdparty/iw.git] / connect.c

diff --git a/connect.c b/connect.c
index a58e44e5ba76142e35bce071cd4d84aba4cdceb2..56771249e234bc14bd5234a68b5565f08688eb14 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -9,7 +9,7 @@
 #include "nl80211.h"
 #include "iw.h"
 
-static int iw_conn(struct nl80211_state *state, struct nl_cb *cb,
+static int iw_conn(struct nl80211_state *state,
                   struct nl_msg *msg, int argc, char **argv,
                   enum id_input id)
 {
@@ -59,7 +59,6 @@ static int iw_conn(struct nl80211_state *state, struct nl_cb *cb,
 }
 
 static int disconnect(struct nl80211_state *state,
-                     struct nl_cb *cb,
                      struct nl_msg *msg,
                      int argc, char **argv,
                      enum id_input id)
@@ -70,7 +69,7 @@ TOPLEVEL(disconnect, NULL,
        NL80211_CMD_DISCONNECT, 0, CIB_NETDEV, disconnect,
        "Disconnect from the current network.");
 
-static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
+static int iw_connect(struct nl80211_state *state,
                      struct nl_msg *msg, int argc, char **argv,
                      enum id_input id)
 {
@@ -94,21 +93,21 @@ static int iw_connect(struct nl80211_state *state, struct nl_cb *cb,
                argv++;
        }
 
+       err = __prepare_listen_events(state);
+       if (err)
+               return err;
+
        conn_argc = 3 + argc;
        conn_argv = calloc(conn_argc, sizeof(*conn_argv));
        if (!conn_argv)
                return -ENOMEM;
 
-       err = __prepare_listen_events(state);
-       if (err)
-               return err;
-
        conn_argv[0] = dev;
        conn_argv[1] = "connect";
        conn_argv[2] = "establish";
        for (i = 0; i < argc; i++)
                conn_argv[i + 3] = argv[i];
-       err = handle_cmd(state, II_NETDEV, conn_argc, conn_argv);
+       err = handle_cmd(state, id, conn_argc, conn_argv);
        free(conn_argv);
        if (err)
                return err;
@@ -145,3 +144,74 @@ TOPLEVEL(connect, "[-w] <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1:616263
        "Join the network with the given SSID (and frequency, BSSID).\n"
        "With -w, wait for the connect to finish or fail.");
 HIDDEN(connect, establish, "", NL80211_CMD_CONNECT, 0, CIB_NETDEV, iw_conn);
+
+static int iw_auth(struct nl80211_state *state,
+                  struct nl_msg *msg, int argc, char **argv,
+                  enum id_input id)
+{
+       char *end;
+       unsigned char bssid[6];
+       int freq;
+       bool need_key = false;
+
+       if (argc < 4)
+               return 1;
+
+       /* SSID */
+       NLA_PUT(msg, NL80211_ATTR_SSID, strlen(argv[0]), argv[0]);
+       argv++;
+       argc--;
+
+       /* bssid */
+       if (mac_addr_a2n(bssid, argv[0]) == 0) {
+               NLA_PUT(msg, NL80211_ATTR_MAC, 6, bssid);
+               argv++;
+               argc--;
+       } else {
+               return 1;
+       }
+
+       /* FIXME */
+       if (strcmp(argv[0], "open") == 0) {
+               NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE,
+                           NL80211_AUTHTYPE_OPEN_SYSTEM);
+       } else if (strcmp(argv[0], "shared") == 0) {
+               NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE,
+                           NL80211_AUTHTYPE_SHARED_KEY);
+               need_key = true;
+       } else {
+               return 1;
+       }
+       argv++;
+       argc--;
+
+       freq = strtoul(argv[0], &end, 10);
+       if (*end == '\0') {
+               NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
+               argv++;
+               argc--;
+       } else {
+               return 1;
+       }
+
+       if (!argc && need_key)
+               return 1;
+       if (argc && !need_key)
+               return 1;
+       if (!argc)
+               return 0;
+
+       if (strcmp(*argv, "key") != 0 && strcmp(*argv, "keys") != 0)
+               return 1;
+
+       argv++;
+       argc--;
+
+       return parse_keys(msg, argv, argc);
+ nla_put_failure:
+       return -ENOSPC;
+}
+
+TOPLEVEL(auth, "<SSID> <bssid> <type:open|shared> <freq in MHz> [key 0:abcde d:1:6162636465]",
+        NL80211_CMD_AUTHENTICATE, 0, CIB_NETDEV, iw_auth,
+        "Authenticate with the given network.\n");