Add support for virtual interface creation/deletion
[mech_eap.git] / wpa_supplicant / wpa_cli.c
index 2f06c35..27f10f1 100644 (file)
@@ -608,35 +608,57 @@ static char ** wpa_cli_complete_set(const char *str, int pos)
                "uapsd", "ps", "wifi_display", "bssid_filter", "disallow_aps",
                "no_keep_alive",
                /* global configuration parameters */
-               "eapol_version", "ap_scan", "disable_scan_offload",
-               "fast_reauth", "opensc_engine_path", "pkcs11_engine_path",
-               "pkcs11_module_path", "openssl_ciphers",
-               "pcsc_reader", "pcsc_pin",
-               "driver_param", "dot11RSNAConfigPMKLifetime",
+#ifdef CONFIG_CTRL_IFACE
+               "ctrl_interface", "no_ctrl_interface", "ctrl_interface_group",
+#endif /* CONFIG_CTRL_IFACE */
+               "eapol_version", "ap_scan", "bgscan",
+#ifdef CONFIG_MESH
+               "user_mpm", "max_peer_links", "mesh_max_inactivity",
+#endif /* CONFIG_MESH */
+               "disable_scan_offload", "fast_reauth", "opensc_engine_path",
+               "pkcs11_engine_path", "pkcs11_module_path", "openssl_ciphers",
+               "pcsc_reader", "pcsc_pin", "external_sim", "driver_param",
+               "dot11RSNAConfigPMKLifetime",
                "dot11RSNAConfigPMKReauthThreshold",
                "dot11RSNAConfigSATimeout",
-               "update_config", "load_dynamic_eap", "uuid", "device_name",
-               "manufacturer", "model_name", "model_number", "serial_number",
-               "device_type", "os_version", "config_methods",
-               "wps_cred_processing", "wps_vendor_ext_m1", "sec_device_type",
+#ifndef CONFIG_NO_CONFIG_WRITE
+               "update_config",
+#endif /* CONFIG_NO_CONFIG_WRITE */
+               "load_dynamic_eap",
+#ifdef CONFIG_WPS
+               "uuid", "device_name", "manufacturer", "model_name",
+               "model_number", "serial_number", "device_type", "os_version",
+               "config_methods", "wps_cred_processing", "wps_vendor_ext_m1",
+#endif /* CONFIG_WPS */
+#ifdef CONFIG_P2P
+               "sec_device_type",
                "p2p_listen_reg_class", "p2p_listen_channel",
-               "p2p_oper_reg_class", "p2p_oper_channel",
-               "p2p_go_intent", "p2p_ssid_postfix", "persistent_reconnect",
-               "p2p_intra_bss", "p2p_group_idle", "p2p_pref_chan",
-               "p2p_no_go_freq",
-               "p2p_go_ht40", "p2p_disabled", "p2p_no_group_iface",
-               "p2p_go_vht",
-               "p2p_ignore_shared_freq", "country", "bss_max_count",
-               "bss_expiration_age", "bss_expiration_scan_count",
-               "filter_ssids", "filter_rssi", "max_num_sta",
-               "disassoc_low_ack", "hs20", "interworking", "hessid",
-               "access_network_type", "pbc_in_m1", "autoscan",
-               "wps_nfc_dev_pw_id", "wps_nfc_dh_pubkey", "wps_nfc_dh_privkey",
-               "wps_nfc_dev_pw", "ext_password_backend",
+               "p2p_oper_reg_class", "p2p_oper_channel", "p2p_go_intent",
+               "p2p_ssid_postfix", "persistent_reconnect", "p2p_intra_bss",
+               "p2p_group_idle", "p2p_passphrase_len", "p2p_pref_chan",
+               "p2p_no_go_freq", "p2p_add_cli_chan",
+               "p2p_optimize_listen_chan", "p2p_go_ht40", "p2p_go_vht",
+               "p2p_disabled", "p2p_go_ctwindow", "p2p_no_group_iface",
+               "p2p_ignore_shared_freq", "ip_addr_go", "ip_addr_mask",
+               "ip_addr_start", "ip_addr_end",
+#endif /* CONFIG_P2P */
+               "country", "bss_max_count", "bss_expiration_age",
+               "bss_expiration_scan_count", "filter_ssids", "filter_rssi",
+               "max_num_sta", "disassoc_low_ack",
+#ifdef CONFIG_HS20
+               "hs20",
+#endif /* CONFIG_HS20 */
+               "interworking", "hessid", "access_network_type", "pbc_in_m1",
+               "autoscan", "wps_nfc_dev_pw_id", "wps_nfc_dh_pubkey",
+               "wps_nfc_dh_privkey", "wps_nfc_dev_pw", "ext_password_backend",
                "p2p_go_max_inactivity", "auto_interworking", "okc", "pmf",
-               "sae_groups", "dtim_period", "beacon_int", "ap_vendor_elements",
-               "ignore_old_scan_res", "freq_list", "external_sim",
-               "tdls_external_control", "p2p_search_delay"
+               "sae_groups", "dtim_period", "beacon_int",
+               "ap_vendor_elements", "ignore_old_scan_res", "freq_list",
+               "scan_cur_freq", "sched_scan_interval",
+               "tdls_external_control", "osu_dir", "wowlan_triggers",
+               "p2p_search_delay", "mac_addr", "rand_addr_lifetime",
+               "preassoc_mac_addr", "key_mgmt_offload", "passive_scan",
+               "reassoc_same_bss_optim"
        };
        int i, num_fields = ARRAY_SIZE(fields);
 
@@ -658,6 +680,11 @@ static char ** wpa_cli_complete_set(const char *str, int pos)
        return NULL;
 }
 
+static int wpa_cli_cmd_dump(struct wpa_ctrl *ctrl, int argc, char *argv[])
+{
+       return wpa_ctrl_command(ctrl, "DUMP");
+}
+
 
 static int wpa_cli_cmd_get(struct wpa_ctrl *ctrl, int argc, char *argv[])
 {
@@ -665,6 +692,74 @@ static int wpa_cli_cmd_get(struct wpa_ctrl *ctrl, int argc, char *argv[])
 }
 
 
+static char ** wpa_cli_complete_get(const char *str, int pos)
+{
+       int arg = get_cmd_arg_num(str, pos);
+       const char *fields[] = {
+#ifdef CONFIG_CTRL_IFACE
+               "ctrl_interface", "ctrl_interface_group",
+#endif /* CONFIG_CTRL_IFACE */
+               "eapol_version", "ap_scan",
+#ifdef CONFIG_MESH
+               "user_mpm", "max_peer_links", "mesh_max_inactivity",
+#endif /* CONFIG_MESH */
+               "disable_scan_offload", "fast_reauth", "opensc_engine_path",
+               "pkcs11_engine_path", "pkcs11_module_path", "openssl_ciphers",
+               "pcsc_reader", "pcsc_pin", "external_sim", "driver_param",
+               "dot11RSNAConfigPMKLifetime",
+               "dot11RSNAConfigPMKReauthThreshold",
+               "dot11RSNAConfigSATimeout",
+#ifndef CONFIG_NO_CONFIG_WRITE
+               "update_config",
+#endif /* CONFIG_NO_CONFIG_WRITE */
+#ifdef CONFIG_WPS
+               "device_name", "manufacturer", "model_name", "model_number",
+               "serial_number", "config_methods", "wps_cred_processing",
+#endif /* CONFIG_WPS */
+#ifdef CONFIG_P2P
+               "p2p_listen_reg_class", "p2p_listen_channel",
+               "p2p_oper_reg_class", "p2p_oper_channel", "p2p_go_intent",
+               "p2p_ssid_postfix", "persistent_reconnect", "p2p_intra_bss",
+               "p2p_group_idle", "p2p_passphrase_len", "p2p_add_cli_chan",
+               "p2p_optimize_listen_chan", "p2p_go_ht40", "p2p_go_vht",
+               "p2p_disabled", "p2p_go_ctwindow", "p2p_no_group_iface",
+               "p2p_ignore_shared_freq", "ip_addr_go", "ip_addr_mask",
+               "ip_addr_start", "ip_addr_end",
+#endif /* CONFIG_P2P */
+               "bss_max_count", "bss_expiration_age",
+               "bss_expiration_scan_count", "filter_ssids", "filter_rssi",
+               "max_num_sta", "disassoc_low_ack",
+#ifdef CONFIG_HS20
+               "hs20",
+#endif /* CONFIG_HS20 */
+               "interworking", "access_network_type", "pbc_in_m1", "autoscan",
+               "wps_nfc_dev_pw_id", "ext_password_backend",
+               "p2p_go_max_inactivity", "auto_interworking", "okc", "pmf",
+               "dtim_period", "beacon_int", "ignore_old_scan_res",
+               "scan_cur_freq", "sched_scan_interval",
+               "tdls_external_control", "osu_dir", "wowlan_triggers",
+               "p2p_search_delay", "mac_addr", "rand_addr_lifetime",
+               "preassoc_mac_addr", "key_mgmt_offload", "passive_scan",
+               "reassoc_same_bss_optim"
+       };
+       int i, num_fields = ARRAY_SIZE(fields);
+
+       if (arg == 1) {
+               char **res = os_calloc(num_fields + 1, sizeof(char *));
+               if (res == NULL)
+                       return NULL;
+               for (i = 0; i < num_fields; i++) {
+                       res[i] = os_strdup(fields[i]);
+                       if (res[i] == NULL)
+                               return res;
+               }
+               return res;
+       }
+
+       return NULL;
+}
+
+
 static int wpa_cli_cmd_logoff(struct wpa_ctrl *ctrl, int argc, char *argv[])
 {
        return wpa_ctrl_command(ctrl, "LOGOFF");
@@ -1616,20 +1711,20 @@ static int wpa_cli_cmd_interface_add(struct wpa_ctrl *ctrl, int argc,
                printf("Invalid INTERFACE_ADD command: needs at least one "
                       "argument (interface name)\n"
                       "All arguments: ifname confname driver ctrl_interface "
-                      "driver_param bridge_name\n");
+                      "driver_param bridge_name [create]\n");
                return -1;
        }
 
        /*
         * INTERFACE_ADD <ifname>TAB<confname>TAB<driver>TAB<ctrl_interface>TAB
-        * <driver_param>TAB<bridge_name>
+        * <driver_param>TAB<bridge_name>[TAB<create>]
         */
        res = os_snprintf(cmd, sizeof(cmd),
-                         "INTERFACE_ADD %s\t%s\t%s\t%s\t%s\t%s",
+                         "INTERFACE_ADD %s\t%s\t%s\t%s\t%s\t%s\t%s",
                          argv[0],
                          argc > 1 ? argv[1] : "", argc > 2 ? argv[2] : "",
                          argc > 3 ? argv[3] : "", argc > 4 ? argv[4] : "",
-                         argc > 5 ? argv[5] : "");
+                         argc > 5 ? argv[5] : "", argc > 6 ? argv[6] : "");
        if (os_snprintf_error(sizeof(cmd), res))
                return -1;
        cmd[sizeof(cmd) - 1] = '\0';
@@ -2309,6 +2404,13 @@ static int wpa_cli_cmd_interworking_connect(struct wpa_ctrl *ctrl, int argc,
 }
 
 
+static int wpa_cli_cmd_interworking_add_network(struct wpa_ctrl *ctrl, int argc,
+                                               char *argv[])
+{
+       return wpa_cli_cmd(ctrl, "INTERWORKING_ADD_NETWORK", 1, argc, argv);
+}
+
+
 static int wpa_cli_cmd_anqp_get(struct wpa_ctrl *ctrl, int argc, char *argv[])
 {
        return wpa_cli_cmd(ctrl, "ANQP_GET", 2, argc, argv);
@@ -2609,7 +2711,10 @@ static struct wpa_cli_cmd wpa_cli_commands[] = {
          cli_cmd_flag_none,
          "= set variables (shows list of variables when run without "
          "arguments)" },
-       { "get", wpa_cli_cmd_get, NULL,
+       { "dump", wpa_cli_cmd_dump, NULL,
+         cli_cmd_flag_none,
+         "= dump config variables" },
+       { "get", wpa_cli_cmd_get, wpa_cli_complete_get,
          cli_cmd_flag_none,
          "<name> = get information" },
        { "logon", wpa_cli_cmd_logon, NULL,
@@ -2997,6 +3102,9 @@ static struct wpa_cli_cmd wpa_cli_commands[] = {
        { "interworking_connect", wpa_cli_cmd_interworking_connect,
          wpa_cli_complete_bss, cli_cmd_flag_none,
          "<BSSID> = connect using Interworking credentials" },
+       { "interworking_add_network", wpa_cli_cmd_interworking_add_network,
+         wpa_cli_complete_bss, cli_cmd_flag_none,
+         "<BSSID> = connect using Interworking credentials" },
        { "anqp_get", wpa_cli_cmd_anqp_get, wpa_cli_complete_bss,
          cli_cmd_flag_none,
          "<addr> <info id>[,<info id>]... = request ANQP information" },
@@ -3673,7 +3781,11 @@ static void start_edit(void)
        ps = wpa_ctrl_get_remote_ifname(ctrl_conn);
 #endif /* CONFIG_CTRL_IFACE_UDP_REMOTE */
 
+#ifdef CONFIG_WPA_CLI_HISTORY_DIR
+       home = CONFIG_WPA_CLI_HISTORY_DIR;
+#else /* CONFIG_WPA_CLI_HISTORY_DIR */
        home = getenv("HOME");
+#endif /* CONFIG_WPA_CLI_HISTORY_DIR */
        if (home) {
                const char *fname = ".wpa_cli_history";
                int hfile_len = os_strlen(home) + 1 + os_strlen(fname) + 1;