]> git.ipfire.org Git - thirdparty/iw.git/commitdiff
iw: add option to set auth type for connect
authorJianhui Zhao <zhaojh329@gmail.com>
Sun, 30 May 2021 11:25:52 +0000 (19:25 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 18 Jun 2021 09:36:48 +0000 (11:36 +0200)
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
Link: https://lore.kernel.org/r/20210530112552.577329-1-zhaojh329@gmail.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
connect.c

index 3237a277dca3579c9135fa6429c1538fd78f5dc4..e5b177f042e0eab794d08d825f6c976dd71a435a 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -15,6 +15,7 @@ static int iw_conn(struct nl80211_state *state,
 {
        char *end;
        unsigned char bssid[6];
+       bool need_key = false;
        int freq;
        int ret;
 
@@ -48,7 +49,32 @@ static int iw_conn(struct nl80211_state *state,
        if (!argc)
                return 0;
 
-       if (strcmp(*argv, "key") != 0 && strcmp(*argv, "keys") != 0)
+       if (strcmp(*argv, "auth") == 0) {
+               argv++;
+               argc--;
+
+               if (!argc)
+                       return 1;
+
+               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--;
+       }
+
+       if (need_key && !argc)
+               return 1;
+
+       if (argc && strcmp(*argv, "key") != 0 && strcmp(*argv, "keys") != 0)
                return 1;
 
        argv++;
@@ -160,7 +186,7 @@ static int iw_connect(struct nl80211_state *state,
                           &printargs);
        return 0;
 }
-TOPLEVEL(connect, "[-w] <SSID> [<freq in MHz>] [<bssid>] [key 0:abcde d:1:6162636465] [mfp:req/opt/no]",
+TOPLEVEL(connect, "[-w] <SSID> [<freq in MHz>] [<bssid>] [auth open|shared] [key 0:abcde d:1:6162636465] [mfp:req/opt/no]",
        0, 0, CIB_NETDEV, iw_connect,
        "Join the network with the given SSID (and frequency, BSSID).\n"
        "With -w, wait for the connect to finish or fail.");