colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: 'device wifi connect' - ask for SSID/BSSID and password if not provided

Browse Source 
when '--ask' parameter is specified
This commit is contained in:
Jiří Klimeš
2012-11-22 14:32:45 +01:00
committed by Dan Williams
parent 9e8013314e
commit 0db4b4db90
1 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cli/src/devices.c
View File

@@ -1629,6 +1629,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
{ {
NMDevice *device = NULL; NMDevice *device = NULL;
NMAccessPoint *ap = NULL; NMAccessPoint *ap = NULL;
NM80211ApFlags ap_flags;
NM80211ApSecurityFlags ap_wpa_flags;
NM80211ApSecurityFlags ap_rsn_flags;
NMConnection *connection = NULL; NMConnection *connection = NULL;
NMSettingConnection *s_con; NMSettingConnection *s_con;
NMSettingWireless *s_wifi; NMSettingWireless *s_wifi;
@@ -1646,6 +1649,8 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
GByteArray *bssid2_arr = NULL; GByteArray *bssid2_arr = NULL;
const GPtrArray *devices; const GPtrArray *devices;
int devices_idx; int devices_idx;
char *ssid_ask = NULL;
char *passwd_ask = NULL;
/* Default timeout for waiting for operation completion */ /* Default timeout for waiting for operation completion */
nmc->timeout = 90; nmc->timeout = 90;
@@ -1658,10 +1663,17 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
argc--; argc--;
argv++; argv++;
} else { } else {
if (nmc->ask) {
ssid_ask = nmc_get_user_input ("SSID or BSSID: ");
param_user = ssid_ask ? ssid_ask : "";
bssid1_arr = nm_utils_hwaddr_atoba (param_user, ARPHRD_ETHER);
}
if (!ssid_ask) {
g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing.")); g_string_printf (nmc->return_text, _("Error: SSID or BSSID are missing."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error; goto error;
} }
}
/* Get the rest of the parameters */ /* Get the rest of the parameters */
while (argc > 0) { while (argc > 0) {
@@ -1826,36 +1838,44 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv)
/* 'bssid' parameter is used to restrict the conenction only to the BSSID */ /* 'bssid' parameter is used to restrict the conenction only to the BSSID */
g_object_set (s_wifi, NM_SETTING_WIRELESS_BSSID, bssid2_arr, NULL); g_object_set (s_wifi, NM_SETTING_WIRELESS_BSSID, bssid2_arr, NULL);
} }
if (password) {
NM80211ApFlags flags = nm_access_point_get_flags (ap);
NM80211ApSecurityFlags wpa_flags = nm_access_point_get_wpa_flags (ap);
NM80211ApSecurityFlags rsn_flags = nm_access_point_get_rsn_flags (ap);
/* handle password */
ap_flags = nm_access_point_get_flags (ap);
ap_wpa_flags = nm_access_point_get_wpa_flags (ap);
ap_rsn_flags = nm_access_point_get_rsn_flags (ap);
/* Set password for WEP or WPA-PSK. */
if (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) {
/* Ask for missing password when one is expected and '--ask' is used */
if (!password && nmc->ask)
password = passwd_ask = nmc_get_user_input ("Password: ");
if (password) {
if (!connection)
connection = nm_connection_new ();
s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
nm_connection_add_setting (connection, NM_SETTING (s_wsec)); nm_connection_add_setting (connection, NM_SETTING (s_wsec));
/* Set password for WEP or WPA-PSK. */ if (ap_wpa_flags == NM_802_11_AP_SEC_NONE && ap_rsn_flags == NM_802_11_AP_SEC_NONE) {
if (flags & NM_802_11_AP_FLAGS_PRIVACY) {
if (wpa_flags == NM_802_11_AP_SEC_NONE && rsn_flags == NM_802_11_AP_SEC_NONE) {
/* WEP */ /* WEP */
nm_setting_wireless_security_set_wep_key (s_wsec, 0, password); nm_setting_wireless_security_set_wep_key (s_wsec, 0, password);
g_object_set (G_OBJECT (s_wsec), g_object_set (G_OBJECT (s_wsec),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE,
wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY, wep_passphrase ? NM_WEP_KEY_TYPE_PASSPHRASE: NM_WEP_KEY_TYPE_KEY,
NULL); NULL);
} else if ( !(wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) } else if ( !(ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
&& !(rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { && !(ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
/* WPA PSK */ /* WPA PSK */
g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL); g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_PSK, password, NULL);
} }
} }
}
// FIXME: WPA-Enterprise is not supported yet. // FIXME: WPA-Enterprise is not supported yet.
// We are not able to determine and fill all the parameters for // We are not able to determine and fill all the parameters for
// 802.1X authentication automatically without user providing // 802.1X authentication automatically without user providing
// the data. Adding nmcli options for the 8021x setting would // the data. Adding nmcli options for the 8021x setting would
// clutter the command. However, that could be solved later by // clutter the command. However, that could be solved later by
// implementing add/edit connections support for nmcli. // implementing add/edit connections support for nmcli.
}
/* nowait_flag indicates user input. should_wait says whether quit in start(). /* nowait_flag indicates user input. should_wait says whether quit in start().
* We have to delay exit after add_and_activate_cb() is called, even if * We have to delay exit after add_and_activate_cb() is called, even if
@@ -1880,6 +1900,8 @@ error:
g_byte_array_free (bssid1_arr, TRUE); g_byte_array_free (bssid1_arr, TRUE);
if (bssid2_arr) if (bssid2_arr)
g_byte_array_free (bssid2_arr, TRUE); g_byte_array_free (bssid2_arr, TRUE);
g_free (ssid_ask);
g_free (passwd_ask);
return nmc->return_value; return nmc->return_value;
} }