diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2015-09-21 15:32:25 +0200 |
---|---|---|
committer | Jiří Klimeš <jklimes@redhat.com> | 2015-09-21 15:32:25 +0200 |
commit | e9f9f4ecb91783c867cfdd7f42b2d70d6b057940 (patch) | |
tree | cac1aa3cf9645ca9d75a6d3cbea0c75279be5005 | |
parent | 5221180a208c5e182c597e454b1d5285c933d45c (diff) | |
parent | 290c1626b9788aa90861ca423c0dffb59fe29876 (diff) | |
download | NetworkManager-e9f9f4ecb91783c867cfdd7f42b2d70d6b057940.tar.gz |
merge: fix ADSL in nmcli and libnm-core/libnm-utils (rh #1264089)
- implements 'nmcli connection add type adsl'
- initializes adsl.protocol for 'nmcli con edit type adsl'
- fixes errors in adsl properties in libnm-core/libnm-util
-rw-r--r-- | clients/cli/connections.c | 149 | ||||
-rw-r--r-- | clients/cli/nmcli-completion | 19 | ||||
-rw-r--r-- | libnm-core/nm-setting-adsl.c | 7 | ||||
-rw-r--r-- | libnm-util/nm-setting-adsl.c | 7 | ||||
-rw-r--r-- | man/nmcli.1.in | 12 |
5 files changed, 189 insertions, 5 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 9c87b5d19f..cd4fb5ff92 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -390,6 +390,10 @@ usage_connection_add (void) " olpc-mesh: ssid <SSID>\n" " [channel <1-13>]\n" " [dhcp-anycast <MAC address>]\n\n" + " adsl: username <username>\n" + " protocol pppoa|pppoe|ipoatm\n" + " [password <password>]\n" + " [encapsulation vcmux|llc]\n\n" " SLAVE_OPTIONS:\n" " bridge: [priority <0-63>]\n" " [path-cost <1-65535>]\n" @@ -3022,6 +3026,29 @@ check_infiniband_mode (char **mode, GError **error) return check_valid_enumeration (mode, modes, "mode", _("InfiniBand transport mode"), error); } +/* Checks ADSL protocol */ +static gboolean +check_adsl_protocol (char **protocol, GError **error) +{ + const char *protos[] = { NM_SETTING_ADSL_PROTOCOL_PPPOA, + NM_SETTING_ADSL_PROTOCOL_PPPOE, + NM_SETTING_ADSL_PROTOCOL_IPOATM, + NULL }; + + return check_valid_enumeration (protocol, protos, "protocol", _("ADSL protocol"), error); +} + +/* Checks ADSL encapsulation */ +static gboolean +check_adsl_encapsulation (char **encapsulation, GError **error) +{ + const char *modes[] = { NM_SETTING_ADSL_ENCAPSULATION_VCMUX, + NM_SETTING_ADSL_ENCAPSULATION_LLC, + NULL }; + + return check_valid_enumeration (encapsulation, modes, "encapsulation", _("ADSL encapsulation"), error); +} + static gboolean check_and_convert_vlan_flags (const char *flags, guint32 *flags_int, GError **error) { @@ -4027,6 +4054,33 @@ do_questionnaire_olpc (char **channel, char **dhcp_anycast) } } +#define PROMPT_ADSL_ENCAP "(" NM_SETTING_ADSL_ENCAPSULATION_VCMUX "/" NM_SETTING_ADSL_ENCAPSULATION_LLC ") [none]: " +static void +do_questionnaire_adsl (char **password, char **encapsulation) +{ + gboolean once_more; + GError *error = NULL; + + /* Ask for optional 'adsl' arguments. */ + if (!want_provide_opt_args (_("ADSL"), 2)) + return; + + if (!*password) + *password = nmc_readline (_("Password [none]: ")); + + if (!*encapsulation) { + do { + *encapsulation = nmc_readline (_("ADSL encapsulation %s"), PROMPT_ADSL_ENCAP); + once_more = !check_adsl_encapsulation (encapsulation, &error); + if (once_more) { + g_print ("%s\n", error->message); + g_clear_error (&error); + g_free (*encapsulation); + } + } while (once_more); + } +} + static gboolean split_address (char* str, char **ip, char **rest) { @@ -4385,6 +4439,7 @@ complete_connection_by_type (NMConnection *connection, NMSettingBridgePort *s_bridge_port; NMSettingVpn *s_vpn; NMSettingOlpcMesh *s_olpc_mesh; + NMSettingAdsl *s_adsl; const char *slave_type; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -5429,6 +5484,74 @@ cleanup_olpc: if (!success) return FALSE; + } else if (!strcmp (con_type, NM_SETTING_ADSL_SETTING_NAME)) { + /* Build up the settings required for 'adsl' */ + gboolean success = FALSE; + char *username_ask = NULL; + const char *username = NULL; + char *protocol_ask = NULL; + const char *protocol = NULL; + const char *password_c = NULL; + char *password = NULL; + const char *encapsulation_c = NULL; + char *encapsulation = NULL; + nmc_arg_t exp_args[] = { {"username", TRUE, &username, !ask}, + {"protocol", TRUE, &protocol, !ask}, + {"password", TRUE, &password_c, FALSE}, + {"encapsulation", TRUE, &encapsulation_c, FALSE}, + {NULL} }; + + if (!nmc_parse_args (exp_args, FALSE, &argc, &argv, error)) + return FALSE; + + if (!username && ask) + username = username_ask = nmc_readline (_("Username: ")); + if (!username) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: 'username' is required.")); + goto cleanup_adsl; + } + +#define PROMPT_ADSL_PROTO "(" NM_SETTING_ADSL_PROTOCOL_PPPOA "/" NM_SETTING_ADSL_PROTOCOL_PPPOE "/" NM_SETTING_ADSL_PROTOCOL_IPOATM "): " + if (!protocol && ask) + protocol = protocol_ask = nmc_readline (_("Protocol %s"), PROMPT_ADSL_PROTO); + if (!protocol) { + g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: 'protocol' is required.")); + goto cleanup_adsl; + } + if (!check_adsl_protocol (&protocol_ask, error)) + goto cleanup_adsl; + + /* Also ask for all optional arguments if '--ask' is specified. */ + password = g_strdup (password_c); + encapsulation = g_strdup (encapsulation_c); + if (ask) + do_questionnaire_adsl (&password, &encapsulation); + + if (!check_adsl_encapsulation (&encapsulation, error)) + goto cleanup_adsl; + + /* Add ADSL setting */ + s_adsl = (NMSettingAdsl *) nm_setting_adsl_new (); + nm_connection_add_setting (connection, NM_SETTING (s_adsl)); + + g_object_set (s_adsl, + NM_SETTING_ADSL_USERNAME, username, + NM_SETTING_ADSL_PROTOCOL, protocol, + NM_SETTING_ADSL_PASSWORD, password, + NM_SETTING_ADSL_ENCAPSULATION, encapsulation, + NULL); + + success = TRUE; +cleanup_adsl: + g_free (username_ask); + g_free (password); + g_free (protocol_ask); + g_free (encapsulation); + if (!success) + return FALSE; + } else if (!strcmp (con_type, NM_SETTING_GENERIC_SETTING_NAME)) { /* Add 'generic' setting */ s_generic = (NMSettingGeneric *) nm_setting_generic_new (); @@ -5813,6 +5936,20 @@ gen_func_bond_mon_mode (const char *text, int state) } static char * +gen_func_adsl_proto (const char *text, int state) +{ + const char *words[] = { "pppoe", "pppoa", "ipoatm", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} + +static char * +gen_func_adsl_encap (const char *text, int state) +{ + const char *words[] = { "vcmux", "llc", NULL }; + return nmc_rl_gen_func_basic (text, state, words); +} + +static char * gen_func_master_ifnames (const char *text, int state) { int i; @@ -5898,6 +6035,10 @@ nmcli_con_add_tab_completion (const char *text, int start, int end) generator_func = gen_func_bond_mode; else if (g_str_has_suffix (rl_prompt, PROMPT_BOND_MON_MODE)) generator_func = gen_func_bond_mon_mode; + else if (g_str_has_suffix (rl_prompt, PROMPT_ADSL_PROTO)) + generator_func = gen_func_adsl_proto; + else if (g_str_has_suffix (rl_prompt, PROMPT_ADSL_ENCAP)) + generator_func = gen_func_adsl_encap; if (generator_func) match_array = rl_completion_matches (text, generator_func); @@ -8699,6 +8840,14 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection) nmc_setting_custom_init (base_setting); } + /* ADSL */ + if (g_strcmp0 (con_type, NM_SETTING_ADSL_SETTING_NAME) == 0) { + /* Initialize a protocol */ + g_object_set (NM_SETTING_ADSL (base_setting), + NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE, + NULL); + } + /* Always add IPv4 and IPv6 settings for non-slave connections */ setting = nm_setting_ip4_config_new (); nmc_setting_custom_init (setting); diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index 909c00e299..2f0ccd8994 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -387,7 +387,7 @@ _nmcli_compl_ARGS() # user friendly. Only complete them, if the current word already starts with an "8". _nmcli_list "802-3-ethernet 802-11-wireless 802-11-olpc-mesh" else - _nmcli_list "ethernet wifi wimax gsm cdma infiniband bluetooth vpn olpc-mesh vlan bond bridge team pppoe" + _nmcli_list "ethernet wifi wimax gsm cdma infiniband bluetooth vpn olpc-mesh vlan bond bridge team pppoe adsl" fi return 0 fi @@ -563,6 +563,18 @@ _nmcli_compl_ARGS() return 0 fi ;; + encapsulation) + if [[ "${#words[@]}" -eq 2 ]]; then + _nmcli_list "vcmux llc" + return 0 + fi + ;; + protocol) + if [[ "${#words[@]}" -eq 2 ]]; then + _nmcli_list "pppoa pppoe ipoatm" + return 0 + fi + ;; *) return 1 ;; @@ -1054,6 +1066,11 @@ _nmcli() OPTIONS_TYPED=(username password service mtu mac) OPTIONS_MANDATORY=(username) ;; + a|ad|ads|adsl) + OPTIONS_TYPE=adsl + OPTIONS_TYPED=(username password protocol encapsulation) + OPTIONS_MANDATORY=(username protocol) + ;; *) # for an unknown connection type, we stop completion here return 0 diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c index e3c188747f..900e973eb7 100644 --- a/libnm-core/nm-setting-adsl.c +++ b/libnm-core/nm-setting-adsl.c @@ -266,6 +266,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object); + const char *str; switch (prop_id) { case PROP_USERNAME: @@ -281,11 +282,13 @@ set_property (GObject *object, guint prop_id, break; case PROP_PROTOCOL: g_free (priv->protocol); - priv->protocol = g_ascii_strdown (g_value_get_string (value), -1); + str = g_value_get_string (value); + priv->protocol = str ? g_ascii_strdown (str, -1) : NULL; break; case PROP_ENCAPSULATION: g_free (priv->encapsulation); - priv->encapsulation = g_ascii_strdown (g_value_get_string (value), -1); + str = g_value_get_string (value); + priv->encapsulation = str ? g_ascii_strdown (str, -1) : NULL; break; case PROP_VPI: priv->vpi = g_value_get_uint (value); diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index c97d0a63c2..55d04ce185 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -286,6 +286,7 @@ set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (object); + const char *str; switch (prop_id) { case PROP_USERNAME: @@ -301,11 +302,13 @@ set_property (GObject *object, guint prop_id, break; case PROP_PROTOCOL: g_free (priv->protocol); - priv->protocol = g_ascii_strdown (g_value_get_string (value), -1); + str = g_value_get_string (value); + priv->protocol = str ? g_ascii_strdown (str, -1) : NULL; break; case PROP_ENCAPSULATION: g_free (priv->encapsulation); - priv->encapsulation = g_ascii_strdown (g_value_get_string (value), -1); + str = g_value_get_string (value); + priv->encapsulation = str ? g_ascii_strdown (str, -1) : NULL; break; case PROP_VPI: priv->vpi = g_value_get_uint (value); diff --git a/man/nmcli.1.in b/man/nmcli.1.in index 15781c4964..464f23ca24 100644 --- a/man/nmcli.1.in +++ b/man/nmcli.1.in @@ -639,6 +639,18 @@ The value can be prefixed with \fBifname/\fP, \fBuuid/\fP or \fBid/\fP to disamb .RE .RS .TP +.B adsl: +.IP "\fIusername <username>\fP" 42 +\(en ADSL user name +.IP "\fIprotocol pppoa|pppoe|ipoatm\fP" 42 +\(en ADSL protocol +.IP "\fI[password <password>]\fP" 42 +\(en ADSL password +.IP "\fI[encapsulation vcmux|llc]\fP" 42 +\(en ADSL encapsulation +.RE +.RS +.TP .B SLAVE_OPTIONS: .RE .RS |