fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-21 04:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/clients/cli/settings.c

7001 lines
225 KiB
C
Raw Normal View History

cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
/* nmcli - command-line tool to control NetworkManager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
nmcli: add support for bridge multicast-snooping property
2015-02-20 12:58:30 +01:00
* Copyright 2010 - 2015 Red Hat, Inc.
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
*/
build: cleanup default includes - "gsystem-local-alloc.h" and <gio/gio.h> are already included via "nm-default.h". No need to include them separately. - include "nm-macros-internal.h" via "nm-default.h" and drop all explict includes. - in the modified files, ensure that we always include "config.h" and "nm-default.h" first. As second, include the header file for the current source file (if applicable). Then follow external includes and finally internal nm includes. - include nm headers inside source code files with quotes - internal header files don't need to include default headers. They can savely assume that "nm-default.h" is already included and with it glib, nm-glib.h, nm-macros-internal.h, etc.
2016-02-12 14:44:52 +01:00
#include "nm-default.h"
all: cleanup includes and let "nm-default.h" include "config.h" - All internal source files (except "examples", which are not internal) should include "config.h" first. As also all internal source files should include "nm-default.h", let "config.h" be included by "nm-default.h" and include "nm-default.h" as first in every source file. We already wanted to include "nm-default.h" before other headers because it might contains some fixes (like "nm-glib.h" compatibility) that is required first. - After including "nm-default.h", we optinally allow for including the corresponding header file for the source file at hand. The idea is to ensure that each header file is self contained. - Don't include "config.h" or "nm-default.h" in any header file (except "nm-sd-adapt.h"). Public headers anyway must not include these headers, and internal headers are never included after "nm-default.h", as of the first previous point. - Include all internal headers with quotes instead of angle brackets. In practice it doesn't matter, because in our public headers we must include other headers with angle brackets. As we use our public headers also to compile our interal source files, effectively the result must be the same. Still do it for consistency. - Except for <config.h> itself. Include it with angle brackets as suggested by https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers
2016-02-19 14:57:48 +01:00
build: cleanup default includes - "gsystem-local-alloc.h" and <gio/gio.h> are already included via "nm-default.h". No need to include them separately. - include "nm-macros-internal.h" via "nm-default.h" and drop all explict includes. - in the modified files, ensure that we always include "config.h" and "nm-default.h" first. As second, include the header file for the current source file (if applicable). Then follow external includes and finally internal nm includes. - include nm headers inside source code files with quotes - internal header files don't need to include default headers. They can savely assume that "nm-default.h" is already included and with it glib, nm-glib.h, nm-macros-internal.h, etc.
2016-02-12 14:44:52 +01:00
#include "settings.h"
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
#include <stdlib.h>
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
#include <arpa/inet.h>
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
device: extend MAC address handling including randomization for ethernet and wifi Extend the "ethernet.cloned-mac-address" and "wifi.cloned-mac-address" settings. Instead of specifying an explicit MAC address, the additional special values "permanent", "preserve", "random", "random-bia", "stable" and "stable-bia" are supported. "permanent" means to use the permanent hardware address. Previously that was the default if no explict cloned-mac-address was set. The default is thus still "permanent", but it can be overwritten by global configuration. "preserve" means not to configure the MAC address when activating the device. That was actually the default behavior before introducing MAC address handling with commit 1b49f941a69af910b0e68530be7339e8053068e5. "random" and "random-bia" use a randomized MAC address for each connection. "stable" and "stable-bia" use a generated, stable address based on some token. The "bia" suffix says to generate a burned-in address. The stable method by default uses as token the connection UUID, but the token can be explicitly choosen via "stable:<TOKEN>" and "stable-bia:<TOKEN>". On a D-Bus level, the "cloned-mac-address" is a bytestring and thus cannot express the new forms. It is replaced by the new "assigned-mac-address" field. For the GObject property, libnm's API, nmcli, keyfile, etc. the old name "cloned-mac-address" is still used. Deprecating the old field seems more complicated then just extending the use of the existing "cloned-mac-address" field, although the name doesn't match well with the extended meaning. There is some overlap with the "wifi.mac-address-randomization" setting. https://bugzilla.gnome.org/show_bug.cgi?id=705545 https://bugzilla.gnome.org/show_bug.cgi?id=708820 https://bugzilla.gnome.org/show_bug.cgi?id=758301
2016-05-24 15:57:16 +02:00
#include "nm-common-macros.h"
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
#include "utils.h"
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
#include "common.h"
nmcli: when adding a vpn store the full service name in vpn-type When NM looks for vpn plugins, it would expect the full service name otherwise it will not be able to retrieve the correct plugin. Fixes VPN configurations generated with "nmcli connection add".
2016-06-24 15:44:58 +02:00
#include "nm-vpn-helpers.h"
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
/*****************************************************************************/
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static gboolean validate_int (NMSetting *setting, const char* prop, gint val, GError **error);
static gboolean validate_uint (NMSetting *setting, const char* prop, guint val, GError **error);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
static gboolean validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error);
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
static char *secret_flags_to_string (guint32 flags, NmcPropertyGetType get_type);
#define ALL_SECRET_FLAGS \
(NM_SETTING_SECRET_FLAG_NONE | \
NM_SETTING_SECRET_FLAG_AGENT_OWNED | \
NM_SETTING_SECRET_FLAG_NOT_SAVED | \
NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
#define HIDDEN_TEXT "<hidden>"
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
/*****************************************************************************/
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
#define ARGS_DESCRIBE_FCN \
const NmcSettingInfo *setting_info, const NmcPropertyInfo *property_info
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
#define ARGS_GET_FCN \
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
const NmcSettingInfo *setting_info, const NmcPropertyInfo *property_info, NMSetting *setting, NmcPropertyGetType get_type, gboolean show_secrets
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
#define ARGS_SET_FCN \
const NmcSettingInfo *setting_info, const NmcPropertyInfo *property_info, NMSetting *setting, const char *value, GError **error
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
#define ARGS_REMOVE_FCN \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
const NmcSettingInfo *setting_info, const NmcPropertyInfo *property_info, NMSetting *setting, const char *value, guint32 idx, GError **error
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
#define ARGS_VALUES_FCN \
const NmcSettingInfo *setting_info, const NmcPropertyInfo *property_info
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_name (ARGS_GET_FCN)
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
{
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
nm_assert (nm_streq0 (nm_setting_get_name (setting), setting_info->general->setting_name));
return g_strdup (setting_info->general->setting_name);
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
}
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_nmc_with_default (ARGS_GET_FCN)
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
{
const char *s;
char *s_full;
GValue val = G_VALUE_INIT;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) {
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup ("");
return g_strdup (_("(default)"));
}
g_value_init (&val, G_TYPE_STRING);
g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
s = g_value_get_string (&val);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
s_full = g_strdup (s && *s ? s : " ");
else
s_full = s ? g_strdup_printf ("\"%s\"", s) : g_strdup ("");
g_value_unset (&val);
return s_full;
}
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_gobject (ARGS_GET_FCN)
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
{
char *s;
GValue val = G_VALUE_INIT;
g_value_init (&val, G_TYPE_STRING);
g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
s = g_value_dup_string (&val);
g_value_unset (&val);
return s;
}
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_gobject_mtu (ARGS_GET_FCN)
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
{
guint32 mtu;
if ( !property_info->property_typ_data
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
|| !property_info->property_typ_data->subtype.mtu.get_fcn)
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
return _get_fcn_gobject (setting_info, property_info, setting, get_type, show_secrets);
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting);
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
if (mtu == 0) {
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup ("auto");
else
return g_strdup (_("auto"));
}
return g_strdup_printf ("%u", (unsigned) mtu);
}
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_gobject_secret_flags (ARGS_GET_FCN)
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
{
guint v;
GValue val = G_VALUE_INIT;
g_value_init (&val, G_TYPE_UINT);
g_object_get_property (G_OBJECT (setting), property_info->property_name, &val);
v = g_value_get_uint (&val);
g_value_unset (&val);
return secret_flags_to_string (v, get_type);
}
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
/*****************************************************************************/
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_string (ARGS_SET_FCN)
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
{
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
if ( property_info->property_typ_data
&& property_info->property_typ_data->values_static) {
value = nmc_string_is_valid (value,
(const char **) property_info->property_typ_data->values_static,
error);
if (!value)
return FALSE;
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
g_object_set (setting, property_info->property_name, value, NULL);
return TRUE;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_bool (ARGS_SET_FCN)
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
{
gboolean val_bool;
if (!nmc_string_to_bool (value, &val_bool, error))
return FALSE;
g_object_set (setting, property_info->property_name, val_bool, NULL);
return TRUE;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_trilean (ARGS_SET_FCN)
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
{
long int val_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!nmc_string_to_int (value, TRUE, -1, 1, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid value; use -1, 0 or 1"), value);
return FALSE;
}
g_object_set (setting, property_info->property_name, val_int, NULL);
return TRUE;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_int (ARGS_SET_FCN)
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
{
long int val_int;
if (!nmc_string_to_int (value, TRUE, G_MININT, G_MAXINT, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
return FALSE;
}
/* Validate the number according to the property spec */
if (!validate_int (setting, property_info->property_name, (gint) val_int, error))
return FALSE;
g_object_set (setting, property_info->property_name, (gint) val_int, NULL);
return TRUE;
}
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_int64 (ARGS_SET_FCN)
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
{
long val_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!nmc_string_to_int (value, FALSE, 0, 0, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
return FALSE;
}
/* Validate the number according to the property spec */
if (!validate_int64 (setting, property_info->property_name, (gint64) val_int, error))
return FALSE;
g_object_set (setting, property_info->property_name, (gint64) val_int, NULL);
return TRUE;
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_uint (ARGS_SET_FCN)
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
{
unsigned long val_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
return FALSE;
}
/* Validate the number according to the property spec */
if (!validate_uint (setting, property_info->property_name, (guint) val_int, error))
return FALSE;
g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
return TRUE;
}
cli: add property-info for NMSettingPpp
2017-03-26 14:30:17 +02:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_mtu (ARGS_SET_FCN)
cli: add property-info for NMSettingPpp
2017-03-26 14:30:17 +02:00
{
if (nm_streq0 (value, "auto"))
value = "0";
return _set_fcn_gobject_uint (setting_info, property_info, setting, value, error);
}
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_mac (ARGS_SET_FCN)
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
NmcPropertyTypeMacMode mode;
gboolean valid;
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
if (property_info->property_typ_data)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
mode = property_info->property_typ_data->subtype.mac.mode;
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
else
mode = NMC_PROPERTY_TYPE_MAC_MODE_DEFAULT;
if (mode == NMC_PROPERTY_TYPE_MAC_MODE_INFINIBAND)
valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN);
else {
valid = nm_utils_hwaddr_valid (value, ETH_ALEN)
|| ( mode == NMC_PROPERTY_TYPE_MAC_MODE_CLONED
&& NM_CLONED_MAC_IS_SPECIAL (value));
}
if (!valid) {
g_set_error (error, 1, 0, _("'%s' is not a valid Ethernet MAC"), value);
return FALSE;
}
g_object_set (setting, property_info->property_name, value, NULL);
return TRUE;
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
}
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_gobject_secret_flags (ARGS_SET_FCN)
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
{
char **strv = NULL, **iter;
unsigned long flags = 0, val_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
strv = nmc_strsplit_set (value, " \t,", 0);
for (iter = strv; iter && *iter; iter++) {
if (!nmc_string_to_uint (*iter, TRUE, 0, ALL_SECRET_FLAGS, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid flag number; use <0-%d>"),
*iter, ALL_SECRET_FLAGS);
g_strfreev (strv);
return FALSE;
}
flags += val_int;
}
g_strfreev (strv);
/* Validate the flags number */
if (flags > ALL_SECRET_FLAGS) {
flags = ALL_SECRET_FLAGS;
g_print (_("Warning: '%s' sum is higher than all flags => all flags set\n"), value);
}
g_object_set (setting, property_info->property_name, (guint) flags, NULL);
return TRUE;
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
/*****************************************************************************/
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
static const char *const*
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_values_fcn_gobject_enum (ARGS_VALUES_FCN)
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
{
static GHashTable *cache = NULL;
const char **v;
if (G_UNLIKELY (!cache))
cache = g_hash_table_new (NULL, NULL);
v = g_hash_table_lookup (cache, property_info);
if (!v) {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
bool has_minmax = property_info->property_typ_data->subtype.gobject_enum.min
|| property_info->property_typ_data->subtype.gobject_enum.max;
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
v = nm_utils_enum_get_values ( property_info->property_typ_data->subtype.gobject_enum.get_gtype (),
has_minmax ? property_info->property_typ_data->subtype.gobject_enum.min : G_MININT,
has_minmax ? property_info->property_typ_data->subtype.gobject_enum.max : G_MAXINT);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_hash_table_insert (cache, (gpointer) property_info, v);
}
return (const char *const*) v;
}
/*****************************************************************************/
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
static const NmcSettingInfo *
_meta_find_setting_info_by_name (const char *setting_name)
{
const NMMetaSettingInfo *meta_setting_info;
const NmcSettingInfo *setting_info;
g_return_val_if_fail (setting_name, NULL);
meta_setting_info = nm_meta_setting_infos_by_name (setting_name);
if (!meta_setting_info)
return NULL;
g_return_val_if_fail (nm_streq0 (meta_setting_info->setting_name, setting_name), NULL);
if (meta_setting_info->meta_type >= G_N_ELEMENTS (nmc_setting_infos))
return NULL;
setting_info = &nmc_setting_infos[meta_setting_info->meta_type];
g_return_val_if_fail (setting_info->general == meta_setting_info, NULL);
return setting_info;
}
static const NmcSettingInfo *
_meta_find_setting_info_by_gtype (GType gtype)
{
const NMMetaSettingInfo *meta_setting_info;
const NmcSettingInfo *setting_info;
meta_setting_info = nm_meta_setting_infos_by_gtype (gtype);
if (!meta_setting_info)
return NULL;
g_return_val_if_fail (meta_setting_info->get_setting_gtype, NULL);
g_return_val_if_fail (meta_setting_info->get_setting_gtype () == gtype, NULL);
if (meta_setting_info->meta_type >= G_N_ELEMENTS (nmc_setting_infos))
return NULL;
setting_info = &nmc_setting_infos[meta_setting_info->meta_type];
g_return_val_if_fail (setting_info->general == meta_setting_info, NULL);
return setting_info;
}
static const NmcSettingInfo *
_meta_find_setting_info_by_setting (NMSetting *setting)
{
const NmcSettingInfo *setting_info;
g_return_val_if_fail (NM_IS_SETTING (setting), NULL);
setting_info = _meta_find_setting_info_by_gtype (G_OBJECT_TYPE (setting));
if (!setting_info)
return NULL;
g_return_val_if_fail (setting_info == _meta_find_setting_info_by_name (nm_setting_get_name (setting)), NULL);
return setting_info;
}
static const NmcPropertyInfo *
_meta_setting_info_find_property_info (const NmcSettingInfo *setting_info, const char *property_name)
{
guint i;
g_return_val_if_fail (setting_info, NULL);
g_return_val_if_fail (property_name, NULL);
for (i = 0; i < setting_info->properties_num; i++) {
if (nm_streq (setting_info->properties[i].property_name, property_name))
return &setting_info->properties[i];
}
return NULL;
}
static const NmcPropertyInfo *
_meta_find_property_info_by_name (const char *setting_name, const char *property_name, const NmcSettingInfo **out_setting_info)
{
const NmcSettingInfo *setting_info;
setting_info = _meta_find_setting_info_by_name (setting_name);
NM_SET_OUT (out_setting_info, setting_info);
if (!setting_info)
return NULL;
return _meta_setting_info_find_property_info (setting_info, property_name);
}
static const NmcPropertyInfo *
_meta_find_property_info_by_setting (NMSetting *setting, const char *property_name, const NmcSettingInfo **out_setting_info)
{
const NmcSettingInfo *setting_info;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
const NmcPropertyInfo *property_info;
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
setting_info = _meta_find_setting_info_by_setting (setting);
NM_SET_OUT (out_setting_info, setting_info);
if (!setting_info)
return NULL;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
property_info = _meta_setting_info_find_property_info (setting_info, property_name);
nm_assert (property_info == _meta_find_property_info_by_name (nm_setting_get_name (setting), property_name, NULL));
return property_info;
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
}
/*****************************************************************************/
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
static const NmcOutputField *
_get_nmc_output_fields (const NmcSettingInfo *setting_info)
{
static NmcOutputField *fields[_NM_META_SETTING_TYPE_NUM + 1] = { };
NmcOutputField **field;
guint i;
g_return_val_if_fail (setting_info, NULL);
g_return_val_if_fail (setting_info->general->meta_type < _NM_META_SETTING_TYPE_NUM, NULL);
field = &fields[setting_info->general->meta_type];
if (G_UNLIKELY (!*field)) {
*field = g_new0 (NmcOutputField, setting_info->properties_num + 1);
for (i = 0; i < setting_info->properties_num; i++) {
NmcOutputField *f = &(*field)[i];
f->name = setting_info->properties[i].property_name;
f->name_l10n = setting_info->properties[i].property_name;
}
}
return *field;
}
/*****************************************************************************/
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
static char *
wep_key_type_to_string (NMWepKeyType type)
{
switch (type) {
case NM_WEP_KEY_TYPE_KEY:
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
return g_strdup_printf (_("%d (key)"), type);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
case NM_WEP_KEY_TYPE_PASSPHRASE:
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
return g_strdup_printf (_("%d (passphrase)"), type);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
case NM_WEP_KEY_TYPE_UNKNOWN:
default:
return g_strdup_printf (_("%d (unknown)"), type);
}
}
static char *
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
bytes_to_string (GBytes *bytes)
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
{
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
const guint8 *data;
gsize len;
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
GString *cert = NULL;
int i;
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
if (!bytes)
return NULL;
data = g_bytes_get_data (bytes, &len);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
cert = g_string_new (NULL);
for (i = 0; i < len; i++)
g_string_append_printf (cert, "%02X", data[i]);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
return g_string_free (cert, FALSE);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
}
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
static char *
nmcli: output just the raw value of vlan.flags when in terse mode
2017-01-10 14:23:04 +01:00
vlan_flags_to_string (guint32 flags, NmcPropertyGetType get_type)
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
{
GString *flag_str;
nmcli: output just the raw value of vlan.flags when in terse mode
2017-01-10 14:23:04 +01:00
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%u", flags);
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
if (flags == 0)
return g_strdup (_("0 (NONE)"));
flag_str = g_string_new (NULL);
g_string_printf (flag_str, "%d (", flags);
if (flags & NM_VLAN_FLAG_REORDER_HEADERS)
g_string_append (flag_str, _("REORDER_HEADERS, "));
if (flags & NM_VLAN_FLAG_GVRP)
g_string_append (flag_str, _("GVRP, "));
if (flags & NM_VLAN_FLAG_LOOSE_BINDING)
g_string_append (flag_str, _("LOOSE_BINDING, "));
vlan: (all) add VLAN MVRP flag http://patchwork.ozlabs.org/patch/219364/
2015-10-13 10:05:19 +02:00
if (flags & NM_VLAN_FLAG_MVRP)
g_string_append (flag_str, _("MVRP, "));
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
if (flag_str->str[flag_str->len-1] == '(')
cli: fix displaying unknown flags/bands
2013-05-06 13:57:15 +02:00
g_string_append (flag_str, _("unknown"));
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
else
g_string_truncate (flag_str, flag_str->len-2); /* chop off trailing ', ' */
g_string_append_c (flag_str, ')');
return g_string_free (flag_str, FALSE);
}
static char *
vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map)
{
GString *priorities;
int i;
priorities = g_string_new (NULL);
for (i = 0; i < nm_setting_vlan_get_num_priorities (s_vlan, map); i++) {
guint32 from, to;
Fix a few misc issues noticed by Coverity
2012-04-05 13:30:09 -04:00
if (nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to))
g_string_append_printf (priorities, "%d:%d,", from, to);
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
}
Fix a few misc issues noticed by Coverity
2012-04-05 13:30:09 -04:00
if (priorities->len)
g_string_truncate (priorities, priorities->len-1); /* chop off trailing ',' */
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
return g_string_free (priorities, FALSE);
}
cli: add 'ip6-privacy' property of ipv6 setting
2012-07-18 12:56:31 +02:00
static char *
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NmcPropertyGetType get_type)
cli: add 'ip6-privacy' property of ipv6 setting
2012-07-18 12:56:31 +02:00
{
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%d", ip6_privacy);
cli: add 'ip6-privacy' property of ipv6 setting
2012-07-18 12:56:31 +02:00
switch (ip6_privacy) {
case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
return g_strdup_printf (_("%d (disabled)"), ip6_privacy);
case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR:
return g_strdup_printf (_("%d (enabled, prefer public IP)"), ip6_privacy);
case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR:
return g_strdup_printf (_("%d (enabled, prefer temporary IP)"), ip6_privacy);
default:
return g_strdup_printf (_("%d (unknown)"), ip6_privacy);
}
}
cli: add support for connection.autoconnect-slaves property
2015-05-06 11:55:17 +02:00
static char *
autoconnect_slaves_to_string (NMSettingConnectionAutoconnectSlaves autoconnect_slaves,
NmcPropertyGetType get_type)
{
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%d", autoconnect_slaves);
switch (autoconnect_slaves) {
case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO:
return g_strdup_printf (_("%d (no)"), autoconnect_slaves);
case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES:
return g_strdup_printf (_("%d (yes)"), autoconnect_slaves);
case NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_DEFAULT:
default:
return g_strdup_printf (_("%d (default)"), autoconnect_slaves);
}
}
cli: add missing properties (mainly secrets flags, and some others)
2013-01-30 15:25:36 +01:00
static char *
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
secret_flags_to_string (guint32 flags, NmcPropertyGetType get_type)
cli: add missing properties (mainly secrets flags, and some others)
2013-01-30 15:25:36 +01:00
{
GString *flag_str;
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%u", flags);
cli: add missing properties (mainly secrets flags, and some others)
2013-01-30 15:25:36 +01:00
if (flags == 0)
return g_strdup (_("0 (none)"));
flag_str = g_string_new (NULL);
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
g_string_printf (flag_str, "%u (", flags);
cli: add missing properties (mainly secrets flags, and some others)
2013-01-30 15:25:36 +01:00
if (flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
g_string_append (flag_str, _("agent-owned, "));
if (flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)
g_string_append (flag_str, _("not saved, "));
if (flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED)
g_string_append (flag_str, _("not required, "));
if (flag_str->str[flag_str->len-1] == '(')
cli: fix displaying unknown flags/bands
2013-05-06 13:57:15 +02:00
g_string_append (flag_str, _("unknown"));
cli: add missing properties (mainly secrets flags, and some others)
2013-01-30 15:25:36 +01:00
else
g_string_truncate (flag_str, flag_str->len-2); /* chop off trailing ', ' */
g_string_append_c (flag_str, ')');
return g_string_free (flag_str, FALSE);
}
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
static void
vpn_data_item (const char *key, const char *value, gpointer user_data)
{
GString *ret_str = (GString *) user_data;
if (ret_str->len != 0)
g_string_append (ret_str, ", ");
g_string_append_printf (ret_str, "%s = %s", key, value);
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_STR_LIST_MULTI(def_func, s_macro, set_func) \
static gboolean \
def_func (NMSetting *setting, \
const char *prop, \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
const char *value, \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
const char **valid_strv, \
GError **error) \
cli: simplify property functions for allowed values with a macro DEFINE_ALLOWED_FOR_ENUMS (cherry picked from commit 5f90f48467cea8cdc5427f1a5b814ab5f78564e9)
2017-01-20 21:51:58 +01:00
{ \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char **strv = NULL, **iter; \
const char *item; \
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
strv = nmc_strsplit_set (value, " \t,", 0); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = strv; iter && *iter; iter++) { \
if (!(item = nmc_string_is_valid (g_strstrip (*iter), valid_strv, error))) { \
g_strfreev (strv); \
return FALSE; \
} \
set_func (s_macro (setting), item); \
} \
g_strfreev (strv); \
return TRUE; \
cli: simplify property functions for allowed values with a macro DEFINE_ALLOWED_FOR_ENUMS (cherry picked from commit 5f90f48467cea8cdc5427f1a5b814ab5f78564e9)
2017-01-20 21:51:58 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_OPTIONS(def_func, s_macro, s_type, add_func, valid_func1, valid_func2) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_SET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
char **strv = NULL, **iter; \
const char **(*valid_func1_p) (s_type *) = valid_func1; \
const char * (*valid_func2_p) (const char *, const char *, GError **) = valid_func2; \
const char *opt_name, *opt_val; \
\
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
\
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
strv = nmc_strsplit_set (value, ",", 0); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = strv; iter && *iter; iter++) { \
char *left = g_strstrip (*iter); \
char *right = strchr (left, '='); \
if (!right) { \
g_set_error (error, 1, 0, _("'%s' is not valid; use <option>=<value>"), *iter); \
g_strfreev (strv); \
return FALSE; \
} \
*right++ = '\0'; \
\
if (valid_func1_p) { \
const char **valid_options = valid_func1_p (s_macro (setting)); \
if (!(opt_name = nmc_string_is_valid (g_strstrip (left), valid_options, error))) { \
g_strfreev (strv); \
return FALSE; \
} \
} else \
opt_name = g_strstrip (left);\
\
opt_val = g_strstrip (right); \
if (valid_func2_p) { \
if (!(opt_val = valid_func2_p ((const char *) left, (const char *) opt_val, error))) { \
g_strfreev (strv); \
return FALSE; \
}\
}\
add_func (s_macro (setting), opt_name, opt_val); \
} \
g_strfreev (strv); \
return TRUE; \
}
cli: simplify property functions for allowed values with a macro DEFINE_ALLOWED_FOR_ENUMS (cherry picked from commit 5f90f48467cea8cdc5427f1a5b814ab5f78564e9)
2017-01-20 21:51:58 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_REMOVER_INDEX_OR_VALUE(def_func, s_macro, num_func, rem_func_idx, rem_func_val) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_REMOVE_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
guint32 num; \
if (value) { \
gboolean ret; \
char *value_stripped = g_strstrip (g_strdup (value)); \
ret = rem_func_val (s_macro (setting), value_stripped, error); \
g_free (value_stripped); \
return ret; \
} \
num = num_func (s_macro (setting)); \
if (num == 0) { \
g_set_error_literal (error, 1, 0, _("no item to remove")); \
return FALSE; \
} \
if (idx >= num) { \
g_set_error (error, 1, 0, _("index '%d' is not in range <0-%d>"), idx, num - 1); \
return FALSE; \
} \
rem_func_idx (s_macro (setting), idx); \
return TRUE; \
}
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_REMOVER_OPTION(def_func, s_macro, rem_func) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_REMOVE_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
gboolean success = FALSE; \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (value && *value) { \
success = rem_func (s_macro (setting), value); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (!success) \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_set_error (error, 1, 0, _("invalid option '%s'"), value); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
} else \
g_set_error_literal (error, 1, 0, _("missing option")); \
return success; \
cli: support printing the pkcs11: URI scheme
2016-12-19 12:48:30 +01:00
}
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_ALLOWED_VAL_FUNC(def_func, valid_values) \
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static const char *const* \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
def_func (NMSetting *setting, const char *prop) \
{ \
return valid_values; \
}
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_MAC_BLACKLIST(def_func, s_macro, add_func) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_SET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
guint8 buf[32]; \
char **list = NULL, **iter; \
GSList *macaddr_blacklist = NULL; \
\
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
\
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
list = nmc_strsplit_set (value, " \t,", 0); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = list; iter && *iter; iter++) { \
if (!nm_utils_hwaddr_aton (*iter, buf, ETH_ALEN)) { \
g_set_error (error, 1, 0, _("'%s' is not a valid MAC"), *iter); \
g_strfreev (list); \
g_slist_free (macaddr_blacklist); \
return FALSE; \
} \
} \
\
for (iter = list; iter && *iter; iter++) \
add_func (s_macro (setting), *iter); \
\
g_strfreev (list); \
return TRUE; \
cli: support printing the pkcs11: URI scheme
2016-12-19 12:48:30 +01:00
}
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: hide secret certificate blobs unless --show-secrets is passed Client certificate and private key blobs should be considered private as other secrets and not shown unless the --show-secrets option is passed. https://bugzilla.redhat.com/show_bug.cgi?id=1184530
2016-05-12 15:59:23 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
verify_string_list (char **strv,
const char *prop,
gboolean (*validate_func) (const char *),
GError **error)
cli: hide secret certificate blobs unless --show-secrets is passed Client certificate and private key blobs should be considered private as other secrets and not shown unless the --show-secrets option is passed. https://bugzilla.redhat.com/show_bug.cgi?id=1184530
2016-05-12 15:59:23 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char **iter;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = strv; iter && *iter; iter++) {
if (**iter == '\0')
continue;
if (validate_func) {
if (!validate_func (*iter)) {
g_set_error (error, 1, 0, _("'%s' is not valid"),
*iter);
return FALSE;
}
}
cli: add support for IP tunnel settings
2015-09-01 15:14:03 +02:00
}
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
validate_int (NMSetting *setting, const char* prop, gint val, GError **error)
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GParamSpec *pspec;
GValue value = G_VALUE_INIT;
gboolean success = TRUE;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_init (&value, G_TYPE_INT);
g_value_set_int (&value, val);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
g_assert (G_IS_PARAM_SPEC (pspec));
if (g_param_value_validate (pspec, &value)) {
GParamSpecInt *pspec_int = (GParamSpecInt *) pspec;
g_set_error (error, 1, 0, _("'%d' is not valid; use <%d-%d>"),
val, pspec_int->minimum, pspec_int->maximum);
success = FALSE;
libnm-core: change DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES Change all DBUS_TYPE_G_UCHAR_ARRAY properties to G_TYPE_BYTES, and update corresponding APIs. Notably, this means they are now refcounted rather than being copied. Update the rest of NM for the changes. The daemon still converts SSIDs to GByteArrays internally, because changing it to use GBytes has lots of trickle-down effects. It can possibly be changed later.
2014-06-26 10:42:11 -04:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_unset (&value);
return success;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
validate_int64 (NMSetting *setting, const char* prop, gint64 val, GError **error)
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GParamSpec *pspec;
GValue value = G_VALUE_INIT;
gboolean success = TRUE;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_init (&value, G_TYPE_INT64);
g_value_set_int64 (&value, val);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
g_assert (G_IS_PARAM_SPEC (pspec));
if (g_param_value_validate (pspec, &value)) {
GParamSpecInt64 *pspec_int = (GParamSpecInt64 *) pspec;
G_STATIC_ASSERT (sizeof (long long) >= sizeof (gint64));
g_set_error (error, 1, 0, _("'%lld' is not valid; use <%lld-%lld>"),
(long long) val, (long long) pspec_int->minimum, (long long) pspec_int->maximum);
success = FALSE;
}
g_value_unset (&value);
return success;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
validate_uint (NMSetting *setting, const char* prop, guint val, GError **error)
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GParamSpec *pspec;
GValue value = G_VALUE_INIT;
gboolean success = TRUE;
wifi: don't touch by default current powersave setting Some drivers (or things outside NM like 'powertop') may turn powersave on, so don't touch it unless explicitly configured by user. To achieve this, add new 'default' and 'ignore' options; the former can be used to fall back to a globally configured setting, while the latter tells NM not to touch the current setting. When 'default' is specified, a missing global default configuration is equivalent to 'ignore'. It is possible to enable Wi-Fi power saving for all connections by dropping a file in /etc/NetworkManager/conf.d with the following content: [connection] wifi.powersave=3 https://bugzilla.gnome.org/show_bug.cgi?id=760125
2016-02-10 16:46:34 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_init (&value, G_TYPE_UINT);
g_value_set_uint (&value, val);
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
g_assert (G_IS_PARAM_SPEC (pspec));
if (g_param_value_validate (pspec, &value)) {
GParamSpecUInt *pspec_uint = (GParamSpecUInt *) pspec;
g_set_error (error, 1, 0, _("'%u' is not valid; use <%u-%u>"),
val, pspec_uint->minimum, pspec_uint->maximum);
success = FALSE;
}
g_value_unset (&value);
return success;
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
}
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
static char *
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
flag_values_to_string (GFlagsValue *array, guint n)
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GString *str;
guint i;
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
str = g_string_new (NULL);
for (i = 0; i < n; i++)
g_string_append_printf (str, "%u, ", array[i].value);
if (str->len)
g_string_truncate (str, str->len-2); /* chop off trailing ', ' */
return g_string_free (str, FALSE);
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
validate_flags (NMSetting *setting, const char* prop, guint val, GError **error)
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GParamSpec *pspec;
GValue value = G_VALUE_INIT;
gboolean success = TRUE;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
g_assert (G_IS_PARAM_SPEC (pspec));
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_init (&value, pspec->value_type);
g_value_set_flags (&value, val);
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (g_param_value_validate (pspec, &value)) {
GParamSpecFlags *pspec_flags = (GParamSpecFlags *) pspec;
char *flag_values = flag_values_to_string (pspec_flags->flags_class->values,
pspec_flags->flags_class->n_values);
g_set_error (error, 1, 0, _("'%u' flags are not valid; use combination of %s"),
val, flag_values);
g_free (flag_values);
success = FALSE;
}
g_value_unset (&value);
return success;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
check_and_set_string (NMSetting *setting,
const char *prop,
const char *val,
const char **valid_strv,
GError **error)
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
const char *checked_val;
cli: add property get functions - returning property value for presentation Simplify code by using property get functions, with most of them autogenerated based on GObject properties and GValue transforms. Based on a patch from Jiří Klimeš
2013-03-25 10:44:15 -04:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: macsec support
2016-07-01 11:56:33 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
checked_val = nmc_string_is_valid (val, valid_strv, error);
if (!checked_val)
return FALSE;
cli: macsec support
2016-07-01 11:56:33 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_object_set (setting, prop, checked_val, NULL);
return TRUE;
cli: macsec support
2016-07-01 11:56:33 +02:00
}
cli: add macvlan support
2015-09-18 11:03:17 +02:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_gobject_flags (ARGS_SET_FCN)
cli: add macvlan support
2015-09-18 11:03:17 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
unsigned long val_int;
cli: add macvlan support
2015-09-18 11:03:17 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add macvlan support
2015-09-18 11:03:17 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_string_to_uint (value, TRUE, 0, G_MAXUINT, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid number (or out of range)"), value);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: add macvlan support
2015-09-18 11:03:17 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* Validate the flags according to the property spec */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!validate_flags (setting, property_info->property_name, (guint) val_int, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) val_int, NULL);
cli: add macvlan support
2015-09-18 11:03:17 +02:00
return TRUE;
}
proxy: change semantics of pac-script libnm-core: pac-script property in NMSettingProxy now represents the script itself not the location. It ensures that the connection is self contained. nmcli: Supports loading of PAC Script via file path or written explicitly.
2016-09-23 15:53:56 +05:30
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_gobject_ssid (ARGS_SET_FCN)
proxy: change semantics of pac-script libnm-core: pac-script property in NMSettingProxy now represents the script itself not the location. It ensures that the connection is self contained. nmcli: Supports loading of PAC Script via file path or written explicitly.
2016-09-23 15:53:56 +05:30
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
GBytes *ssid;
proxy: change semantics of pac-script libnm-core: pac-script property in NMSettingProxy now represents the script itself not the location. It ensures that the connection is self contained. nmcli: Supports loading of PAC Script via file path or written explicitly.
2016-09-23 15:53:56 +05:30
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (strlen (value) > 32) {
g_set_error (error, 1, 0, _("'%s' is not valid"), value);
proxy: change semantics of pac-script libnm-core: pac-script property in NMSettingProxy now represents the script itself not the location. It ensures that the connection is self contained. nmcli: Supports loading of PAC Script via file path or written explicitly.
2016-09-23 15:53:56 +05:30
return FALSE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ssid = g_bytes_new (value, strlen (value));
g_object_set (setting, property_info->property_name, ssid, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_bytes_unref (ssid);
proxy: change semantics of pac-script libnm-core: pac-script property in NMSettingProxy now represents the script itself not the location. It ensures that the connection is self contained. nmcli: Supports loading of PAC Script via file path or written explicitly.
2016-09-23 15:53:56 +05:30
return TRUE;
}
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_gobject_ifname (ARGS_SET_FCN)
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nm_utils_is_valid_iface_name (value, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, value, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_vpn_service_type (ARGS_SET_FCN)
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
gs_free char *service_name = NULL;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
service_name = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), value);
g_object_set (setting, property_info->property_name, service_name ? : value, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
nmc_util_is_domain (const char *domain)
{
//FIXME: implement
return TRUE;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
nmc_property_set_byte_array (NMSetting *setting, const char *prop, const char *value, GError **error)
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char **strv = NULL, **iter;
char *val_strip;
const char *delimiters = " \t,";
long int val_int;
GBytes *bytes;
GByteArray *array = NULL;
gboolean success = TRUE;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
val_strip = g_strstrip (g_strdup (value));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* First try hex string in the format of AAbbCCDd */
bytes = nm_utils_hexstr2bin (val_strip);
if (bytes) {
array = g_bytes_unref_to_array (bytes);
goto done;
}
/* Otherwise, consider the following format: AA b 0xCc D */
strv = nmc_strsplit_set (val_strip, delimiters, 0);
array = g_byte_array_sized_new (g_strv_length (strv));
for (iter = strv; iter && *iter; iter++) {
if (!nmc_string_to_int_base (g_strstrip (*iter), 16, TRUE, 0, 255, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid hex character"), *iter);
success = FALSE;
goto done;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_byte_array_append (array, (const guint8 *) &val_int, 1);
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
done:
if (success)
g_object_set (setting, prop, array, NULL);
g_strfreev (strv);
if (array)
g_byte_array_free (array, TRUE);
return success;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
/*****************************************************************************/
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_802_1x_ca_cert (ARGS_GET_FCN)
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *ca_cert_str = NULL;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (nm_setting_802_1x_get_ca_cert_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
ca_cert_str = bytes_to_string (nm_setting_802_1x_get_ca_cert_blob (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
ca_cert_str = g_strdup (nm_setting_802_1x_get_ca_cert_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
}
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return ca_cert_str;
}
static char *
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
_get_fcn_802_1x_client_cert (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *cert_str = NULL;
switch (nm_setting_802_1x_get_client_cert_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if (show_secrets)
cert_str = bytes_to_string (nm_setting_802_1x_get_client_cert_blob (s_8021X));
else
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
cert_str = g_strdup (_(HIDDEN_TEXT));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
cert_str = g_strdup (nm_setting_802_1x_get_client_cert_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
cert_str = g_strdup (nm_setting_802_1x_get_client_cert_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return cert_str;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_802_1x_phase2_ca_cert (ARGS_GET_FCN)
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *phase2_ca_cert_str = NULL;
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (nm_setting_802_1x_get_phase2_ca_cert_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
phase2_ca_cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_ca_cert_blob (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
phase2_ca_cert_str = g_strdup (nm_setting_802_1x_get_phase2_ca_cert_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return phase2_ca_cert_str;
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
_get_fcn_802_1x_phase2_client_cert (ARGS_GET_FCN)
cli: check IP configuration when setting connection.master in editor If IPv4 and/or IPv6 are present on setting connection.master, offer their removal.
2014-10-27 12:55:55 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *cert_str = NULL;
cli: check IP configuration when setting connection.master in editor If IPv4 and/or IPv6 are present on setting connection.master, offer their removal.
2014-10-27 12:55:55 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (nm_setting_802_1x_get_phase2_client_cert_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if (show_secrets)
cert_str = bytes_to_string (nm_setting_802_1x_get_phase2_client_cert_blob (s_8021X));
else
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
cert_str = g_strdup (_(HIDDEN_TEXT));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
cert_str = g_strdup (nm_setting_802_1x_get_phase2_client_cert_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
cli: check IP configuration when setting connection.master in editor If IPv4 and/or IPv6 are present on setting connection.master, offer their removal.
2014-10-27 12:55:55 +01:00
}
cli: connect IP addresses/method handlers for existing connections (rh #998137) The handlers detecting changes of IP addresses/method in nmcli interactive editor were connected only for newly created connection. That's why the automagic feature of setting 'method' when 'addresses' are changed and vice versa worked just for new connections, but not while editing existing connections.
2013-09-02 13:20:04 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return cert_str;
cli: connect IP addresses/method handlers for existing connections (rh #998137) The handlers detecting changes of IP addresses/method in nmcli interactive editor were connected only for newly created connection. That's why the automagic feature of setting 'method' when 'addresses' are changed and vice versa worked just for new connections, but not while editing existing connections.
2013-09-02 13:20:04 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_802_1x_password_raw (ARGS_GET_FCN)
nmcli: Add Proxy support to nmcli nmcli fixed to allow users edit proxy properties.
2016-08-16 05:56:00 +05:30
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
return bytes_to_string (nm_setting_802_1x_get_password_raw (s_8021X));
nmcli: Add Proxy support to nmcli nmcli fixed to allow users edit proxy properties.
2016-08-16 05:56:00 +05:30
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
_get_fcn_802_1x_private_key (ARGS_GET_FCN)
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *key_str = NULL;
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (nm_setting_802_1x_get_private_key_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if (show_secrets)
key_str = bytes_to_string (nm_setting_802_1x_get_private_key_blob (s_8021X));
else
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
key_str = g_strdup (_(HIDDEN_TEXT));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
key_str = g_strdup (nm_setting_802_1x_get_private_key_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
key_str = g_strdup (nm_setting_802_1x_get_private_key_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
}
return key_str;
cli: show warning when setting band/channel for infra mode (rh #1000096) The band/channel property is not considered when connecting to an access point. Print a warning, when setting one of these values in edit mode. For now, don't forbid the user to make such setting. Also, because in the future, wpa_supplicant might support this. https://bugzilla.redhat.com/show_bug.cgi?id=999997 https://bugzilla.redhat.com/show_bug.cgi?id=1000096 Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-13 12:20:52 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
_get_fcn_802_1x_phase2_private_key (ARGS_GET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021x *s_8021X = NM_SETTING_802_1X (setting);
char *key_str = NULL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (nm_setting_802_1x_get_phase2_private_key_scheme (s_8021X)) {
case NM_SETTING_802_1X_CK_SCHEME_BLOB:
if (show_secrets)
key_str = bytes_to_string (nm_setting_802_1x_get_phase2_private_key_blob (s_8021X));
else
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
key_str = g_strdup (_(HIDDEN_TEXT));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
break;
case NM_SETTING_802_1X_CK_SCHEME_PATH:
key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_path (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_PKCS11:
key_str = g_strdup (nm_setting_802_1x_get_phase2_private_key_uri (s_8021X));
break;
case NM_SETTING_802_1X_CK_SCHEME_UNKNOWN:
break;
cli: editor: automagic changes of IP 'addresses'/'method' if the other is set
2013-07-16 14:16:12 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return key_str;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_STR_LIST(def_func, set_func) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_SET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
char **strv = NULL; \
guint i = 0; \
\
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \
\
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
strv = nmc_strsplit_set (value, " \t,", 0); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
while (strv && strv[i]) \
set_func (NM_SETTING_802_1X (setting), strv[i++]); \
g_strfreev (strv); \
return TRUE; \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_CERT(def_func, set_func) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_SET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
char *val_strip = g_strstrip (g_strdup (value)); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char *p = val_strip; \
NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
gboolean success; \
\
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
\
success = set_func (NM_SETTING_802_1X (setting), p, scheme, NULL, error); \
g_free (val_strip); \
return success; \
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_SETTER_PRIV_KEY(def_func, pwd_func, set_func) \
static gboolean \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
def_func (ARGS_SET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
char **strv = NULL; \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
char *val_strip = g_strstrip (g_strdup (value)); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char *p = val_strip; \
const char *path, *password; \
cli: fix setting of private key password We can't pass the password obtained from nm_setting_802_1x_get_*private_key_password() to nm_setting_802_1x_set_*private_key() as the latter also frees the old password. Fixes: afd281102879168f13fb4d1deff9535542ad6fc5
2017-02-13 15:39:48 +01:00
gs_free char *password_free = NULL; \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting8021xCKScheme scheme = NM_SETTING_802_1X_CK_SCHEME_PATH; \
gboolean success; \
\
if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PKCS11)) == 0) \
scheme = NM_SETTING_802_1X_CK_SCHEME_PKCS11; \
else if (strncmp (val_strip, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0) \
p += NM_STRLEN (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); \
\
strv = nmc_strsplit_set (p, " \t,", 2); \
path = strv[0]; \
if (g_strv_length (strv) == 2) \
password = strv[1]; \
else \
cli: fix setting of private key password We can't pass the password obtained from nm_setting_802_1x_get_*private_key_password() to nm_setting_802_1x_set_*private_key() as the latter also frees the old password. Fixes: afd281102879168f13fb4d1deff9535542ad6fc5
2017-02-13 15:39:48 +01:00
password = password_free = g_strdup (pwd_func (NM_SETTING_802_1X (setting))); \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
success = set_func (NM_SETTING_802_1X (setting), path, password, scheme, NULL, error); \
g_free (val_strip); \
g_strfreev (strv); \
return success; \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
_validate_and_remove_eap_method (NMSetting8021x *setting,
const char *eap,
GError **error)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
gboolean ret;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
ret = nm_setting_802_1x_remove_eap_method_by_value(setting, eap);
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain EAP method '%s'"), eap);
return ret;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_eap,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_802_1X,
nm_setting_802_1x_get_num_eap_methods,
nm_setting_802_1x_remove_eap_method,
_validate_and_remove_eap_method)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_CERT (_set_fcn_802_1x_ca_cert, nm_setting_802_1x_set_ca_cert)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_altsubject_matches, nm_setting_802_1x_add_altsubject_match)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: fix verifying flag-based properties (rh #1244048) Some of the properties changed from GParamSpecUInt to GParamSpecFlags, namely NM_SETTING_VLAN_FLAGS NM_SETTING_DCB_APP_FCOE_FLAGS NM_SETTING_DCB_APP_ISCSI_FLAGS NM_SETTING_DCB_APP_FIP_FLAGS NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS NM_SETTING_DCB_PRIORITY_GROUP_FLAGS (commit fcfb4b40badbb5cd944cee0c9819cb2649d0bb58) https://bugzilla.redhat.com/show_bug.cgi?id=1244048
2015-07-17 11:24:31 +02:00
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
_validate_and_remove_altsubject_match (NMSetting8021x *setting,
const char *altsubject_match,
GError **error)
cli: fix verifying flag-based properties (rh #1244048) Some of the properties changed from GParamSpecUInt to GParamSpecFlags, namely NM_SETTING_VLAN_FLAGS NM_SETTING_DCB_APP_FCOE_FLAGS NM_SETTING_DCB_APP_ISCSI_FLAGS NM_SETTING_DCB_APP_FIP_FLAGS NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS NM_SETTING_DCB_PRIORITY_GROUP_FLAGS (commit fcfb4b40badbb5cd944cee0c9819cb2649d0bb58) https://bugzilla.redhat.com/show_bug.cgi?id=1244048
2015-07-17 11:24:31 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
gboolean ret;
cli: fix verifying flag-based properties (rh #1244048) Some of the properties changed from GParamSpecUInt to GParamSpecFlags, namely NM_SETTING_VLAN_FLAGS NM_SETTING_DCB_APP_FCOE_FLAGS NM_SETTING_DCB_APP_ISCSI_FLAGS NM_SETTING_DCB_APP_FIP_FLAGS NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS NM_SETTING_DCB_PRIORITY_GROUP_FLAGS (commit fcfb4b40badbb5cd944cee0c9819cb2649d0bb58) https://bugzilla.redhat.com/show_bug.cgi?id=1244048
2015-07-17 11:24:31 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
ret = nm_setting_802_1x_remove_altsubject_match_by_value (setting, altsubject_match);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain alternative subject match '%s'"),
altsubject_match);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_altsubject_matches,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_802_1X,
nm_setting_802_1x_get_num_altsubject_matches,
nm_setting_802_1x_remove_altsubject_match,
_validate_and_remove_altsubject_match)
cli: fix verifying flag-based properties (rh #1244048) Some of the properties changed from GParamSpecUInt to GParamSpecFlags, namely NM_SETTING_VLAN_FLAGS NM_SETTING_DCB_APP_FCOE_FLAGS NM_SETTING_DCB_APP_ISCSI_FLAGS NM_SETTING_DCB_APP_FIP_FLAGS NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS NM_SETTING_DCB_PRIORITY_GROUP_FLAGS (commit fcfb4b40badbb5cd944cee0c9819cb2649d0bb58) https://bugzilla.redhat.com/show_bug.cgi?id=1244048
2015-07-17 11:24:31 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_CERT (_set_fcn_802_1x_client_cert, nm_setting_802_1x_set_client_cert)
cli: fix verifying flag-based properties (rh #1244048) Some of the properties changed from GParamSpecUInt to GParamSpecFlags, namely NM_SETTING_VLAN_FLAGS NM_SETTING_DCB_APP_FCOE_FLAGS NM_SETTING_DCB_APP_ISCSI_FLAGS NM_SETTING_DCB_APP_FIP_FLAGS NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS NM_SETTING_DCB_PRIORITY_GROUP_FLAGS (commit fcfb4b40badbb5cd944cee0c9819cb2649d0bb58) https://bugzilla.redhat.com/show_bug.cgi?id=1244048
2015-07-17 11:24:31 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_ca_cert, nm_setting_802_1x_set_phase2_ca_cert)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_STR_LIST (_set_fcn_802_1x_phase2_altsubject_matches, nm_setting_802_1x_add_phase2_altsubject_match)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
_validate_and_remove_phase2_altsubject_match (NMSetting8021x *setting,
const char *phase2_altsubject_match,
GError **error)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
gboolean ret;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
ret = nm_setting_802_1x_remove_phase2_altsubject_match_by_value (setting, phase2_altsubject_match);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain \"phase2\" alternative subject match '%s'"),
phase2_altsubject_match);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_802_1x_phase2_altsubject_matches,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_802_1X,
nm_setting_802_1x_get_num_phase2_altsubject_matches,
nm_setting_802_1x_remove_phase2_altsubject_match,
_validate_and_remove_phase2_altsubject_match)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_CERT (_set_fcn_802_1x_phase2_client_cert, nm_setting_802_1x_set_phase2_client_cert)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_private_key,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
nm_setting_802_1x_get_private_key_password,
nm_setting_802_1x_set_private_key)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_PRIV_KEY (_set_fcn_802_1x_phase2_private_key,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
nm_setting_802_1x_get_phase2_private_key_password,
nm_setting_802_1x_set_phase2_private_key)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add utility methods for gint64 types Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-08-28 18:51:11 +02:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_802_1x_password_raw (ARGS_SET_FCN)
cli: add utility methods for gint64 types Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-08-28 18:51:11 +02:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return nmc_property_set_byte_array (setting, property_info->property_name, value, error);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
}
cli: add utility methods for gint64 types Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-08-28 18:51:11 +02:00
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_802_1x_phase1_auth_flags (ARGS_GET_FCN)
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
{
NMSetting8021x *s_8021x = NM_SETTING_802_1X (setting);
NMSetting8021xAuthFlags flags;
char *tmp, *str;
flags = nm_setting_802_1x_get_phase1_auth_flags (s_8021x);
tmp = nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (), flags);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
else
str = g_strdup_printf ("%d (%s)", flags, tmp && *tmp ? tmp : "none");
g_free (tmp);
return str;
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_802_1x_phase1_auth_flags (ARGS_SET_FCN)
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
{
NMSetting8021xAuthFlags flags;
gs_free char *err_token = NULL;
gboolean ret;
long int t;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE,
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
NM_SETTING_802_1X_AUTH_FLAGS_NONE,
NM_SETTING_802_1X_AUTH_FLAGS_ALL,
&t))
flags = (NMSetting8021xAuthFlags) t;
else {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_setting_802_1x_auth_flags_get_type (), value,
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
(int *) &flags, &err_token);
if (!ret) {
if (g_ascii_strcasecmp (err_token, "none") == 0)
flags = NM_SETTING_802_1X_AUTH_FLAGS_NONE;
else {
g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s]"),
err_token,
nm_utils_enum_to_str (nm_setting_802_1x_auth_flags_get_type (),
NM_SETTING_802_1X_AUTH_FLAGS_ALL));
return FALSE;
}
}
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) flags, NULL);
cli: support 802-1x.phase1-auth-flags
2017-02-17 21:50:39 +01:00
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_bond_options (ARGS_GET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingBond *s_bond = NM_SETTING_BOND (setting);
GString *bond_options_s;
int i;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
bond_options_s = g_string_new (NULL);
for (i = 0; i < nm_setting_bond_get_num_options (s_bond); i++) {
const char *key, *value;
gs_free char *tmp_value = NULL;
char *p;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
nm_setting_bond_get_option (s_bond, i, &key, &value);
if (nm_streq0 (key, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
value = tmp_value = g_strdup (value);
for (p = tmp_value; p && *p; p++) {
if (*p == ',')
*p = ' ';
}
}
g_string_append_printf (bond_options_s, "%s=%s,", key, value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_string_truncate (bond_options_s, bond_options_s->len-1); /* chop off trailing ',' */
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return g_string_free (bond_options_s, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* example: miimon=100,mode=balance-rr, updelay=5 */
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
_validate_and_remove_bond_option (NMSettingBond *setting, const char *option)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
const char *opt;
const char **valid_options;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
valid_options = nm_setting_bond_get_valid_options (setting);
opt = nmc_string_is_valid (option, valid_options, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (opt)
return nm_setting_bond_remove_option (setting, opt);
else
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static const char *
_validate_bond_option_value (const char *option, const char *value, GError **error)
device: extend MAC address handling including randomization for ethernet and wifi Extend the "ethernet.cloned-mac-address" and "wifi.cloned-mac-address" settings. Instead of specifying an explicit MAC address, the additional special values "permanent", "preserve", "random", "random-bia", "stable" and "stable-bia" are supported. "permanent" means to use the permanent hardware address. Previously that was the default if no explict cloned-mac-address was set. The default is thus still "permanent", but it can be overwritten by global configuration. "preserve" means not to configure the MAC address when activating the device. That was actually the default behavior before introducing MAC address handling with commit 1b49f941a69af910b0e68530be7339e8053068e5. "random" and "random-bia" use a randomized MAC address for each connection. "stable" and "stable-bia" use a generated, stable address based on some token. The "bia" suffix says to generate a burned-in address. The stable method by default uses as token the connection UUID, but the token can be explicitly choosen via "stable:<TOKEN>" and "stable-bia:<TOKEN>". On a D-Bus level, the "cloned-mac-address" is a bytestring and thus cannot express the new forms. It is replaced by the new "assigned-mac-address" field. For the GObject property, libnm's API, nmcli, keyfile, etc. the old name "cloned-mac-address" is still used. Deprecating the old field seems more complicated then just extending the use of the existing "cloned-mac-address" field, although the name doesn't match well with the extended meaning. There is some overlap with the "wifi.mac-address-randomization" setting. https://bugzilla.gnome.org/show_bug.cgi?id=705545 https://bugzilla.gnome.org/show_bug.cgi?id=708820 https://bugzilla.gnome.org/show_bug.cgi?id=758301
2016-05-24 15:57:16 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (!g_strcmp0 (option, NM_SETTING_BOND_OPTION_MODE))
return nmc_bond_validate_mode (value, error);
return value;
device: extend MAC address handling including randomization for ethernet and wifi Extend the "ethernet.cloned-mac-address" and "wifi.cloned-mac-address" settings. Instead of specifying an explicit MAC address, the additional special values "permanent", "preserve", "random", "random-bia", "stable" and "stable-bia" are supported. "permanent" means to use the permanent hardware address. Previously that was the default if no explict cloned-mac-address was set. The default is thus still "permanent", but it can be overwritten by global configuration. "preserve" means not to configure the MAC address when activating the device. That was actually the default behavior before introducing MAC address handling with commit 1b49f941a69af910b0e68530be7339e8053068e5. "random" and "random-bia" use a randomized MAC address for each connection. "stable" and "stable-bia" use a generated, stable address based on some token. The "bia" suffix says to generate a burned-in address. The stable method by default uses as token the connection UUID, but the token can be explicitly choosen via "stable:<TOKEN>" and "stable-bia:<TOKEN>". On a D-Bus level, the "cloned-mac-address" is a bytestring and thus cannot express the new forms. It is replaced by the new "assigned-mac-address" field. For the GObject property, libnm's API, nmcli, keyfile, etc. the old name "cloned-mac-address" is still used. Deprecating the old field seems more complicated then just extending the use of the existing "cloned-mac-address" field, although the name doesn't match well with the extended meaning. There is some overlap with the "wifi.mac-address-randomization" setting. https://bugzilla.gnome.org/show_bug.cgi?id=705545 https://bugzilla.gnome.org/show_bug.cgi?id=708820 https://bugzilla.gnome.org/show_bug.cgi?id=758301
2016-05-24 15:57:16 +02:00
}
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
_bond_add_option (NMSettingBond *setting,
const char *name,
const char *value)
device: extend MAC address handling including randomization for ethernet and wifi Extend the "ethernet.cloned-mac-address" and "wifi.cloned-mac-address" settings. Instead of specifying an explicit MAC address, the additional special values "permanent", "preserve", "random", "random-bia", "stable" and "stable-bia" are supported. "permanent" means to use the permanent hardware address. Previously that was the default if no explict cloned-mac-address was set. The default is thus still "permanent", but it can be overwritten by global configuration. "preserve" means not to configure the MAC address when activating the device. That was actually the default behavior before introducing MAC address handling with commit 1b49f941a69af910b0e68530be7339e8053068e5. "random" and "random-bia" use a randomized MAC address for each connection. "stable" and "stable-bia" use a generated, stable address based on some token. The "bia" suffix says to generate a burned-in address. The stable method by default uses as token the connection UUID, but the token can be explicitly choosen via "stable:<TOKEN>" and "stable-bia:<TOKEN>". On a D-Bus level, the "cloned-mac-address" is a bytestring and thus cannot express the new forms. It is replaced by the new "assigned-mac-address" field. For the GObject property, libnm's API, nmcli, keyfile, etc. the old name "cloned-mac-address" is still used. Deprecating the old field seems more complicated then just extending the use of the existing "cloned-mac-address" field, although the name doesn't match well with the extended meaning. There is some overlap with the "wifi.mac-address-randomization" setting. https://bugzilla.gnome.org/show_bug.cgi?id=705545 https://bugzilla.gnome.org/show_bug.cgi?id=708820 https://bugzilla.gnome.org/show_bug.cgi?id=758301
2016-05-24 15:57:16 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
gs_free char *tmp_value = NULL;
char *p;
if (nm_streq0 (name, NM_SETTING_BOND_OPTION_ARP_IP_TARGET)) {
value = tmp_value = g_strdup (value);
for (p = tmp_value; p && *p; p++)
if (*p == ' ')
*p = ',';
}
return nm_setting_bond_add_option (setting, name, value);
device: extend MAC address handling including randomization for ethernet and wifi Extend the "ethernet.cloned-mac-address" and "wifi.cloned-mac-address" settings. Instead of specifying an explicit MAC address, the additional special values "permanent", "preserve", "random", "random-bia", "stable" and "stable-bia" are supported. "permanent" means to use the permanent hardware address. Previously that was the default if no explict cloned-mac-address was set. The default is thus still "permanent", but it can be overwritten by global configuration. "preserve" means not to configure the MAC address when activating the device. That was actually the default behavior before introducing MAC address handling with commit 1b49f941a69af910b0e68530be7339e8053068e5. "random" and "random-bia" use a randomized MAC address for each connection. "stable" and "stable-bia" use a generated, stable address based on some token. The "bia" suffix says to generate a burned-in address. The stable method by default uses as token the connection UUID, but the token can be explicitly choosen via "stable:<TOKEN>" and "stable-bia:<TOKEN>". On a D-Bus level, the "cloned-mac-address" is a bytestring and thus cannot express the new forms. It is replaced by the new "assigned-mac-address" field. For the GObject property, libnm's API, nmcli, keyfile, etc. the old name "cloned-mac-address" is still used. Deprecating the old field seems more complicated then just extending the use of the existing "cloned-mac-address" field, although the name doesn't match well with the extended meaning. There is some overlap with the "wifi.mac-address-randomization" setting. https://bugzilla.gnome.org/show_bug.cgi?id=705545 https://bugzilla.gnome.org/show_bug.cgi?id=708820 https://bugzilla.gnome.org/show_bug.cgi?id=758301
2016-05-24 15:57:16 +02:00
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_OPTIONS (_set_fcn_bond_options,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_BOND,
NMSettingBond,
_bond_add_option,
nm_setting_bond_get_valid_options,
_validate_bond_option_value)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_OPTION (_remove_fcn_bond_options,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_BOND,
_validate_and_remove_bond_option)
static const char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_describe_fcn_bond_options (ARGS_DESCRIBE_FCN)
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *desc = NULL;
const char **valid_options;
char *options_str;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (G_UNLIKELY (desc == NULL)) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
valid_options = nm_setting_bond_get_valid_options (NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
options_str = g_strjoinv (", ", (char **) valid_options);
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
desc = g_strdup_printf (_("Enter a list of bonding options formatted as:\n"
" option = <value>, option = <value>,... \n"
"Valid options are: %s\n"
"'mode' can be provided as a name or a number:\n"
"balance-rr = 0\n"
"active-backup = 1\n"
"balance-xor = 2\n"
"broadcast = 3\n"
"802.3ad = 4\n"
"balance-tlb = 5\n"
"balance-alb = 6\n\n"
"Example: mode=2,miimon=120\n"), options_str);
g_free (options_str);
}
return desc;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
}
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static const char *const*
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_values_fcn_bond_options (ARGS_VALUES_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return nm_setting_bond_get_valid_options (NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_connection_autoconnect_retires (ARGS_GET_FCN)
nmcli: when adding a vpn store the full service name in vpn-type When NM looks for vpn plugins, it would expect the full service name otherwise it will not be able to retrieve the correct plugin. Fixes VPN configurations generated with "nmcli connection add".
2016-06-24 15:44:58 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
gint retries;
nmcli: when adding a vpn store the full service name in vpn-type When NM looks for vpn plugins, it would expect the full service name otherwise it will not be able to retrieve the correct plugin. Fixes VPN configurations generated with "nmcli connection add".
2016-06-24 15:44:58 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
retries = nm_setting_connection_get_autoconnect_retries (s_con);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%d", retries);
nmcli: when adding a vpn store the full service name in vpn-type When NM looks for vpn plugins, it would expect the full service name otherwise it will not be able to retrieve the correct plugin. Fixes VPN configurations generated with "nmcli connection add".
2016-06-24 15:44:58 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
switch (retries) {
case -1:
return g_strdup_printf (_("%d (default)"), retries);
case 0:
return g_strdup_printf (_("%d (forever)"), retries);
default:
return g_strdup_printf ("%d", retries);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_connection_permissions (ARGS_GET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
GString *perm = NULL;
const char *perm_item;
const char *perm_type;
int i;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
perm = g_string_new (NULL);
for (i = 0; i < nm_setting_connection_get_num_permissions (s_con); i++) {
if (nm_setting_connection_get_permission (s_con, i, &perm_type, &perm_item, NULL))
g_string_append_printf (perm, "%s:%s,", perm_type, perm_item);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
nmcli: always print "--" for empty or unset values in normal/pretty output This was already true for tabular ouput mode. Align to this behavior when printing in multiline mode.
2017-01-17 11:58:40 +01:00
if (perm->len > 0) {
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_string_truncate (perm, perm->len-1); /* remove trailing , */
nmcli: always print "--" for empty or unset values in normal/pretty output This was already true for tabular ouput mode. Align to this behavior when printing in multiline mode.
2017-01-17 11:58:40 +01:00
return g_string_free (perm, FALSE);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
nmcli: always print "--" for empty or unset values in normal/pretty output This was already true for tabular ouput mode. Align to this behavior when printing in multiline mode.
2017-01-17 11:58:40 +01:00
/* No value from get_permission */
return g_string_free (perm, TRUE);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_connection_autoconnect_slaves (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
return autoconnect_slaves_to_string (nm_setting_connection_get_autoconnect_slaves (s_con), get_type);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
nmcli: streamline connection addition This is a huge refactoring in attempt to 1.) reduce the horrible redundancy in the connection addition path and 2.) reduce confusion between various sources of property value (command line, properties, interactive mode). * The conversions from the strings was done all over the place: settings.c already does for all sensible properties. The rest is removed. * The validations are done randomly and redundantly: server does some validation, and per-property client validations useful for interactive mode are done in settings.c The rest is removed. * The information about defaults and required options was redundantly scattered in per-type completion functions and interactive mode questionnaries. This is now driven by the option_info[] table. In general, we do our best to just map the command line options to properties and allow mixing them. For the rest there's the check_and_set() callbacks (basically to keep compatibility with previous nmcli versions). This this is now all possible: $ nmcli c add type ethernet ifname '*' This always worked $ nmcli c add type bond-slave save no -- connection.autoconnect no The "save" and "--" still work $ nmcli c add connection.type ethernet ifname eth0 Properties can now be used $ nmcli c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever There's no implementation mandated order of the properties (the type still must be known to determine which properties make sense) $ nmcli --ask c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever The interactive mode asks only for properties that weren't specified on command line
2016-05-20 20:43:58 +02:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_type (ARGS_SET_FCN)
nmcli: streamline connection addition This is a huge refactoring in attempt to 1.) reduce the horrible redundancy in the connection addition path and 2.) reduce confusion between various sources of property value (command line, properties, interactive mode). * The conversions from the strings was done all over the place: settings.c already does for all sensible properties. The rest is removed. * The validations are done randomly and redundantly: server does some validation, and per-property client validations useful for interactive mode are done in settings.c The rest is removed. * The information about defaults and required options was redundantly scattered in per-type completion functions and interactive mode questionnaries. This is now driven by the option_info[] table. In general, we do our best to just map the command line options to properties and allow mixing them. For the rest there's the check_and_set() callbacks (basically to keep compatibility with previous nmcli versions). This this is now all possible: $ nmcli c add type ethernet ifname '*' This always worked $ nmcli c add type bond-slave save no -- connection.autoconnect no The "save" and "--" still work $ nmcli c add connection.type ethernet ifname eth0 Properties can now be used $ nmcli c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever There's no implementation mandated order of the properties (the type still must be known to determine which properties make sense) $ nmcli --ask c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever The interactive mode asks only for properties that weren't specified on command line
2016-05-20 20:43:58 +02:00
{
gs_free char *uuid = NULL;
if (nm_setting_connection_get_uuid (NM_SETTING_CONNECTION (setting))) {
/* Don't allow setting type unless the connection is brand new.
* Just because it's a bad idea and the user wouldn't probably want that.
* No technical reason, really.
* Also, using uuid to see if the connection is brand new is a bit
* hacky: we can not see if the type is already set, because
* nmc_setting_set_property() is called only after the property
* we're setting (type) has been removed. */
g_set_error (error, 1, 0, _("Can not change the connection type"));
return FALSE;
}
uuid = nm_utils_uuid_generate ();
g_object_set (G_OBJECT (setting),
NM_SETTING_CONNECTION_UUID, uuid,
NULL);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
g_object_set (G_OBJECT (setting), property_info->property_name, value, NULL);
nmcli: streamline connection addition This is a huge refactoring in attempt to 1.) reduce the horrible redundancy in the connection addition path and 2.) reduce confusion between various sources of property value (command line, properties, interactive mode). * The conversions from the strings was done all over the place: settings.c already does for all sensible properties. The rest is removed. * The validations are done randomly and redundantly: server does some validation, and per-property client validations useful for interactive mode are done in settings.c The rest is removed. * The information about defaults and required options was redundantly scattered in per-type completion functions and interactive mode questionnaries. This is now driven by the option_info[] table. In general, we do our best to just map the command line options to properties and allow mixing them. For the rest there's the check_and_set() callbacks (basically to keep compatibility with previous nmcli versions). This this is now all possible: $ nmcli c add type ethernet ifname '*' This always worked $ nmcli c add type bond-slave save no -- connection.autoconnect no The "save" and "--" still work $ nmcli c add connection.type ethernet ifname eth0 Properties can now be used $ nmcli c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever There's no implementation mandated order of the properties (the type still must be known to determine which properties make sense) $ nmcli --ask c add type ethernet ip4 1.2.3.4 mac 80:86:66:77:88:99 con-name whatever The interactive mode asks only for properties that weren't specified on command line
2016-05-20 20:43:58 +02:00
return TRUE;
}
all: port everything to libnm Since the API has not changed at this point, this is mostly just a matter of updating Makefiles, and changing references to the library name in comments. NetworkManager cannot link to libnm due to the duplicated type/symbol names. So it links to libnm-core.la directly, which means that NetworkManager gets a separate copy of that code from libnm.so. Everything else links to libnm.
2014-05-19 13:44:02 -04:00
/* define from libnm-core/nm-setting-connection.c */
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
#define PERM_USER_PREFIX "user:"
static gboolean
permissions_valid (const char *perm)
{
if (!perm || perm[0] == '\0')
return FALSE;
if (strncmp (perm, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0) {
if ( strlen (perm) <= strlen (PERM_USER_PREFIX)
|| strchr (perm + strlen (PERM_USER_PREFIX), ':'))
return FALSE;
} else {
if (strchr (perm, ':'))
return FALSE;
}
return TRUE;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_permissions (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL;
guint i = 0;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
if (!verify_string_list (strv, property_info->property_name, permissions_valid, error)) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
for (i = 0; strv && strv[i]; i++) {
const char *user;
if (strncmp (strv[i], PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0)
user = strv[i]+strlen (PERM_USER_PREFIX);
else
user = strv[i];
nm_setting_connection_add_permission (NM_SETTING_CONNECTION (setting), "user", user, NULL);
}
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_connection_permission (NMSettingConnection *setting,
const char *perm,
GError **error)
{
gboolean ret;
ret = nm_setting_connection_remove_permission_by_value (setting, "user", perm, NULL);
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain permission '%s'"), perm);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_permissions,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_CONNECTION,
nm_setting_connection_get_num_permissions,
nm_setting_connection_remove_permission,
_validate_and_remove_connection_permission)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_master (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if (!value)
cli: allow resetting the connection.master to NULL Without this patch, the following two commands fail: nmcli connection modify em1 connection.master nmcli connection modify em1 connection.master "" Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-02-24 09:33:48 +01:00
;
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
else if (!*value)
value = NULL;
else if ( !nm_utils_is_valid_iface_name (value, NULL)
&& !nm_utils_is_uuid (value)) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_set_error (error, 1, 0,
_("'%s' is not valid master; use ifname or connection UUID"),
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
g_object_set (setting, property_info->property_name, value, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_secondaries (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
const GPtrArray *connections;
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
NMConnection *con;
char **strv = NULL, **iter;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
guint i = 0;
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
connections = nm_client_get_connections (nm_cli.client);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
for (iter = strv; iter && *iter; iter++) {
if (**iter == '\0')
continue;
if (nm_utils_is_uuid (*iter)) {
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
con = nmc_find_connection (connections, "uuid", *iter, NULL, FALSE);
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
if (!con)
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter);
cli: only allow setting VPN connection as secondaries in editor
2014-05-23 09:17:10 +02:00
else {
/* Currenly NM only supports VPN connections as secondaries */
if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
g_strfreev (strv);
return FALSE;
}
}
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
} else {
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
con = nmc_find_connection (connections, "id", *iter, NULL, FALSE);
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
if (!con) {
g_set_error (error, 1, 0, _("'%s' is not a name of any exiting profile"), *iter);
g_strfreev (strv);
return FALSE;
}
cli: only allow setting VPN connection as secondaries in editor
2014-05-23 09:17:10 +02:00
/* Currenly NM only supports VPN connections as secondaries */
if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) {
g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter);
g_strfreev (strv);
return FALSE;
}
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
/* translate id to uuid */
g_free (*iter);
*iter = g_strdup (nm_connection_get_uuid (con));
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
while (strv && strv[i])
nm_setting_connection_add_secondary (NM_SETTING_CONNECTION (setting), strv[i++]);
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_connection_secondary (NMSettingConnection *setting,
const char *secondary_uuid,
GError **error)
{
gboolean ret;
if (!nm_utils_is_uuid (secondary_uuid)) {
g_set_error (error, 1, 0,
_("the value '%s' is not a valid UUID"), secondary_uuid);
return FALSE;
}
ret = nm_setting_connection_remove_secondary_by_value (setting, secondary_uuid);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain UUID '%s'"), secondary_uuid);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_connection_secondaries,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_CONNECTION,
nm_setting_connection_get_num_secondaries,
nm_setting_connection_remove_secondary,
_validate_and_remove_connection_secondary)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_connection_metered (ARGS_GET_FCN)
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
{
NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
cli: fix metered to string property nmc_property_connection_get_metered() must return non-localized strings that can be parsed by nmc_property_connection_set_metered(). Fixes: f0aebfd7462dea9b3ebc579a49248027f6d23905
2015-06-10 11:49:04 +02:00
if (get_type == NMC_PROPERTY_GET_PARSABLE) {
switch (nm_setting_connection_get_metered (s_conn)) {
case NM_METERED_YES:
return g_strdup ("yes");
case NM_METERED_NO:
return g_strdup ("no");
case NM_METERED_UNKNOWN:
default:
return g_strdup ("unknown");
}
}
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
switch (nm_setting_connection_get_metered (s_conn)) {
case NM_METERED_YES:
return g_strdup (_("yes"));
case NM_METERED_NO:
return g_strdup (_("no"));
case NM_METERED_UNKNOWN:
default:
return g_strdup (_("unknown"));
}
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_metered (ARGS_SET_FCN)
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
{
NMMetered metered;
NMCTriStateValue ts_val;
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if (!nmc_string_to_tristate (value, &ts_val, error))
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
return FALSE;
switch (ts_val) {
case NMC_TRI_STATE_YES:
metered = NM_METERED_YES;
break;
case NMC_TRI_STATE_NO:
metered = NM_METERED_NO;
break;
case NMC_TRI_STATE_UNKNOWN:
metered = NM_METERED_UNKNOWN;
break;
default:
g_assert_not_reached();
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
g_object_set (setting, property_info->property_name, metered, NULL);
cli: add support for 'metered' connection property
2015-04-30 09:58:20 +02:00
return TRUE;
}
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_connection_lldp (ARGS_GET_FCN)
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
{
NMSettingConnection *s_conn = NM_SETTING_CONNECTION (setting);
NMSettingConnectionLldp lldp;
char *tmp, *str;
lldp = nm_setting_connection_get_lldp (s_conn);
tmp = nm_utils_enum_to_str (nm_setting_connection_lldp_get_type (), lldp);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "default");
else
str = g_strdup_printf ("%d (%s)", lldp, tmp && *tmp ? tmp : "default");
g_free (tmp);
return str;
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_connection_lldp (ARGS_SET_FCN)
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
{
NMSettingConnectionLldp lldp;
gboolean ret;
long int t;
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if (nmc_string_to_int_base (value, 0, TRUE,
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
NM_SETTING_CONNECTION_LLDP_DEFAULT,
NM_SETTING_CONNECTION_LLDP_ENABLE_RX,
&t))
lldp = t;
else {
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
ret = nm_utils_enum_from_str (nm_setting_connection_lldp_get_type (), value,
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
(int *) &lldp, NULL);
if (!ret) {
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if (g_ascii_strcasecmp (value, "enable") == 0)
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
lldp = NM_SETTING_CONNECTION_LLDP_ENABLE_RX;
else {
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
value, "default,disable,enable-rx,enable");
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
return FALSE;
}
}
}
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
g_object_set (setting, property_info->property_name, lldp, NULL);
cli: add support for 'connection.lldp' property
2015-10-08 18:45:46 +02:00
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
dcb_flags_to_string (NMSettingDcbFlags flags)
{
GString *flag_str;
if (flags == 0)
return g_strdup (_("0 (disabled)"));
flag_str = g_string_new (NULL);
g_string_printf (flag_str, "%d (", flags);
if (flags & NM_SETTING_DCB_FLAG_ENABLE)
g_string_append (flag_str, _("enabled, "));
if (flags & NM_SETTING_DCB_FLAG_ADVERTISE)
g_string_append (flag_str, _("advertise, "));
if (flags & NM_SETTING_DCB_FLAG_WILLING)
g_string_append (flag_str, _("willing, "));
if (flag_str->str[flag_str->len-1] == '(')
g_string_append (flag_str, _("unknown"));
else
g_string_truncate (flag_str, flag_str->len-2); /* chop off trailing ', ' */
g_string_append_c (flag_str, ')');
return g_string_free (flag_str, FALSE);
}
#define DEFINE_DCB_FLAGS_GETTER(func_name, property_name) \
static char * \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
func_name (ARGS_GET_FCN) \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{ \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint v; \
GValue val = G_VALUE_INIT; \
g_value_init (&val, G_TYPE_UINT); \
g_object_get_property (G_OBJECT (setting), property_name, &val); \
v = g_value_get_uint (&val); \
g_value_unset (&val); \
return dcb_flags_to_string (v); \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
dcb_app_priority_to_string (gint priority)
{
return (priority == -1) ? g_strdup (_("-1 (unset)")) : g_strdup_printf ("%d", priority);
}
#define DEFINE_DCB_APP_PRIORITY_GETTER(func_name, property_name) \
static char * \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
func_name (ARGS_GET_FCN) \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{ \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
int v; \
GValue val = G_VALUE_INIT; \
g_value_init (&val, G_TYPE_INT); \
g_object_get_property (G_OBJECT (setting), property_name, &val); \
v = g_value_get_int (&val); \
g_value_unset (&val); \
return dcb_app_priority_to_string (v); \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DEFINE_DCB_BOOL_GETTER(func_name, getter_func_name) \
static char * \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
func_name (ARGS_GET_FCN) \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{ \
NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
GString *str; \
guint i; \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
\
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
str = g_string_new (NULL); \
for (i = 0; i < 8; i++) { \
if (getter_func_name (s_dcb, i)) \
g_string_append_c (str, '1'); \
else \
g_string_append_c (str, '0'); \
\
if (i < 7) \
g_string_append_c (str, ','); \
} \
\
return g_string_free (str, FALSE); \
}
#define DEFINE_DCB_UINT_GETTER(func_name, getter_func_name) \
static char * \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
func_name (ARGS_GET_FCN) \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{ \
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingDcb *s_dcb = NM_SETTING_DCB (setting); \
GString *str; \
guint i; \
\
str = g_string_new (NULL); \
for (i = 0; i < 8; i++) { \
g_string_append_printf (str, "%u", getter_func_name (s_dcb, i)); \
if (i < 7) \
g_string_append_c (str, ','); \
} \
\
return g_string_free (str, FALSE); \
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fcoe_flags, NM_SETTING_DCB_APP_FCOE_FLAGS)
DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fcoe_priority, NM_SETTING_DCB_APP_FCOE_PRIORITY)
DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_iscsi_flags, NM_SETTING_DCB_APP_ISCSI_FLAGS)
DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_iscsi_priority, NM_SETTING_DCB_APP_ISCSI_PRIORITY)
DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_app_fip_flags, NM_SETTING_DCB_APP_FIP_FLAGS)
DEFINE_DCB_APP_PRIORITY_GETTER (_get_fcn_dcb_app_fip_priority, NM_SETTING_DCB_APP_FIP_PRIORITY)
cli: add missing nmc_property_802_1X_allowed_eap() function
2015-04-22 13:09:35 +02:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_flow_control_flags, NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS)
DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_flow_control, nm_setting_dcb_get_priority_flow_control)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_DCB_FLAGS_GETTER (_get_fcn_dcb_priority_group_flags, NM_SETTING_DCB_PRIORITY_GROUP_FLAGS)
DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_id, nm_setting_dcb_get_priority_group_id)
DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_group_bandwidth, nm_setting_dcb_get_priority_group_bandwidth)
DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_bandwidth, nm_setting_dcb_get_priority_bandwidth)
DEFINE_DCB_BOOL_GETTER (_get_fcn_dcb_priority_strict, nm_setting_dcb_get_priority_strict_bandwidth)
DEFINE_DCB_UINT_GETTER (_get_fcn_dcb_priority_traffic_class, nm_setting_dcb_get_priority_traffic_class)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
#define DCB_ALL_FLAGS (NM_SETTING_DCB_FLAG_ENABLE | NM_SETTING_DCB_FLAG_ADVERTISE | NM_SETTING_DCB_FLAG_WILLING)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_flags (ARGS_SET_FCN)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char **strv = NULL, **iter;
NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
long int t;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* Check for overall hex numeric value */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
flags = (guint) t;
else {
/* Check for individual flag numbers */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
strv = nmc_strsplit_set (value, " \t,", 0);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = strv; iter && *iter; iter++) {
if (!nmc_string_to_int_base (*iter, 0, TRUE, 0, DCB_ALL_FLAGS, &t))
t = -1;
cli: add missing nmc_property_802_1X_allowed_eap() function
2015-04-22 13:09:35 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if ( g_ascii_strcasecmp (*iter, "enable") == 0
|| g_ascii_strcasecmp (*iter, "enabled") == 0
|| t == NM_SETTING_DCB_FLAG_ENABLE)
flags |= NM_SETTING_DCB_FLAG_ENABLE;
else if ( g_ascii_strcasecmp (*iter, "advertise") == 0
|| t == NM_SETTING_DCB_FLAG_ADVERTISE)
flags |= NM_SETTING_DCB_FLAG_ADVERTISE;
else if ( g_ascii_strcasecmp (*iter, "willing") == 0
|| t == NM_SETTING_DCB_FLAG_WILLING)
flags |= NM_SETTING_DCB_FLAG_WILLING;
else if ( g_ascii_strcasecmp (*iter, "disable") == 0
|| g_ascii_strcasecmp (*iter, "disabled") == 0
|| t == 0) {
/* pass */
} else {
g_set_error (error, 1, 0, _("'%s' is not a valid DCB flag"), *iter);
return FALSE;
}
}
g_strfreev (strv);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* Validate the flags according to the property spec */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!validate_flags (setting, property_info->property_name, (guint) flags, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: add description for certificate properties in editor (rh #1182575)
2015-01-16 21:00:13 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) flags, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority (ARGS_SET_FCN)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
long int priority = 0;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_string_to_int (value, FALSE, -1, 7, &priority)) {
g_set_error (error, 1, 0, _("'%s' is not a DCB app priority"), value);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: add description for certificate properties in editor (rh #1182575)
2015-01-16 21:00:13 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* Validate the number according to the property spec */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!validate_int (setting, property_info->property_name, (gint) priority, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (gint) priority, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
cli: add description for certificate properties in editor (rh #1182575)
2015-01-16 21:00:13 +01:00
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dcb_parse_uint_array (const char *val,
guint max,
guint other,
guint *out_array,
GError **error)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char **items, **iter;
guint i = 0;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (out_array != NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
items = g_strsplit_set (val, ",", -1);
if (g_strv_length (items) != 8) {
g_set_error_literal (error, 1, 0, _("must contain 8 comma-separated numbers"));
goto error;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (iter = items; iter && *iter; iter++) {
long int num = 0;
gboolean success;
cli: add description for certificate properties in editor (rh #1182575)
2015-01-16 21:00:13 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
*iter = g_strstrip (*iter);
success = nmc_string_to_int_base (*iter, 10, TRUE, 0, other ? other : max, &num);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* If number is greater than 'max' it must equal 'other' */
if (success && other && (num > max) && (num != other))
success = FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (!success) {
if (other) {
g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive) or %u"),
*iter, max, other);
} else {
g_set_error (error, 1, 0, _("'%s' not a number between 0 and %u (inclusive)"),
*iter, max);
}
goto error;
}
out_array[i++] = (guint) num;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
error:
g_strfreev (items);
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
dcb_check_feature_enabled (NMSettingDcb *s_dcb, const char *flags_prop)
{
NMSettingDcbFlags flags = NM_SETTING_DCB_FLAG_NONE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_object_get (s_dcb, flags_prop, &flags, NULL);
if (!(flags & NM_SETTING_DCB_FLAG_ENABLE))
g_print (_("Warning: changes will have no effect until '%s' includes 1 (enabled)\n\n"), flags_prop);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_flow_control (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 1, 0, nums, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_flow_control (NM_SETTING_DCB (setting), i, !!nums[i]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS);
return TRUE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_group_id (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 7, 15, nums, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_group_id (NM_SETTING_DCB (setting), i, nums[i]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_group_bandwidth (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0, sum = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 100, 0, nums, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (i = 0; i < 8; i++)
sum += nums[i];
if (sum != 100) {
g_set_error_literal (error, 1, 0, _("bandwidth percentages must total 100%%"));
return FALSE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_group_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_bandwidth (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 100, 0, nums, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_bandwidth (NM_SETTING_DCB (setting), i, nums[i]);
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_strict (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 1, 0, nums, error))
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_strict_bandwidth (NM_SETTING_DCB (setting), i, !!nums[i]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: allow setting multiple IPs in bond 'arp_ip_target' option The bond 'arp_ip_target' option contains a list of comma-separated IP addresses; but comma is also used to separate options and so at the moment it is not possible to specify multiple IPs as the command $ nmcli c m b1 bond.options \ mode=0,arp_interval=1,arp_ip_target=1.1.1.1,2.2.2.2 interprets 2.2.2.2 as the next option. Allows spaces to be used as separators for the IPs of the 'arp_ip_target': $ nmcli c m b1 bond.options \ "mode=0,arp_interval=1,arp_ip_target=1.1.1.1 2.2.2.2"
2016-03-16 10:20:45 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_dcb_priority_traffic_class (ARGS_SET_FCN)
cli: allow setting multiple IPs in bond 'arp_ip_target' option The bond 'arp_ip_target' option contains a list of comma-separated IP addresses; but comma is also used to separate options and so at the moment it is not possible to specify multiple IPs as the command $ nmcli c m b1 bond.options \ mode=0,arp_interval=1,arp_ip_target=1.1.1.1,2.2.2.2 interprets 2.2.2.2 as the next option. Allows spaces to be used as separators for the IPs of the 'arp_ip_target': $ nmcli c m b1 bond.options \ "mode=0,arp_interval=1,arp_ip_target=1.1.1.1 2.2.2.2"
2016-03-16 10:20:45 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
guint i = 0;
guint nums[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
cli: allow setting multiple IPs in bond 'arp_ip_target' option The bond 'arp_ip_target' option contains a list of comma-separated IP addresses; but comma is also used to separate options and so at the moment it is not possible to specify multiple IPs as the command $ nmcli c m b1 bond.options \ mode=0,arp_interval=1,arp_ip_target=1.1.1.1,2.2.2.2 interprets 2.2.2.2 as the next option. Allows spaces to be used as separators for the IPs of the 'arp_ip_target': $ nmcli c m b1 bond.options \ "mode=0,arp_interval=1,arp_ip_target=1.1.1.1 2.2.2.2"
2016-03-16 10:20:45 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: allow setting multiple IPs in bond 'arp_ip_target' option The bond 'arp_ip_target' option contains a list of comma-separated IP addresses; but comma is also used to separate options and so at the moment it is not possible to specify multiple IPs as the command $ nmcli c m b1 bond.options \ mode=0,arp_interval=1,arp_ip_target=1.1.1.1,2.2.2.2 interprets 2.2.2.2 as the next option. Allows spaces to be used as separators for the IPs of the 'arp_ip_target': $ nmcli c m b1 bond.options \ "mode=0,arp_interval=1,arp_ip_target=1.1.1.1 2.2.2.2"
2016-03-16 10:20:45 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!dcb_parse_uint_array (value, 7, 0, nums, error))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
for (i = 0; i < 8; i++)
nm_setting_dcb_set_priority_traffic_class (NM_SETTING_DCB (setting), i, nums[i]);
dcb_check_feature_enabled (NM_SETTING_DCB (setting), NM_SETTING_DCB_PRIORITY_GROUP_FLAGS);
return TRUE;
cli: allow setting multiple IPs in bond 'arp_ip_target' option The bond 'arp_ip_target' option contains a list of comma-separated IP addresses; but comma is also used to separate options and so at the moment it is not possible to specify multiple IPs as the command $ nmcli c m b1 bond.options \ mode=0,arp_interval=1,arp_ip_target=1.1.1.1,2.2.2.2 interprets 2.2.2.2 as the next option. Allows spaces to be used as separators for the IPs of the 'arp_ip_target': $ nmcli c m b1 bond.options \ "mode=0,arp_interval=1,arp_ip_target=1.1.1.1 2.2.2.2"
2016-03-16 10:20:45 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_gsm_sim_operator_id (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
const char *p = value;
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (strlen (value) != 5 && strlen (value) != 6) {
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
return FALSE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
while (p && *p) {
if (!g_ascii_isdigit (*p++)) {
g_set_error_literal (error, 1, 0, _("SIM operator ID must be a 5 or 6 number MCCMNC code"));
return FALSE;
}
}
g_object_set (G_OBJECT (setting),
NM_SETTING_GSM_SIM_OPERATOR_ID,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NULL);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_infiniband_p_key (ARGS_SET_FCN)
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
{
gboolean p_key_valid = FALSE;
long p_key_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!strncasecmp (value, "0x", 2))
p_key_valid = nmc_string_to_int_base (value + 2, 16, TRUE, 0, G_MAXUINT16, &p_key_int);
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
else
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
p_key_valid = nmc_string_to_int (value, TRUE, -1, G_MAXUINT16, &p_key_int);
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
if (!p_key_valid) {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (strcmp (value, "default") == 0)
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
p_key_int = -1;
else {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_set_error (error, 1, 0, _("'%s' is not a valid IBoIP P_Key"), value);
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
return FALSE;
}
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (gint) p_key_int, NULL);
cli: add support for InfiniBand's 'p-key' and 'parent' to interactive editor
2013-07-22 14:43:39 +02:00
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_infiniband_p_key (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingInfiniband *s_infiniband = NM_SETTING_INFINIBAND (setting);
int p_key;
p_key = nm_setting_infiniband_get_p_key (s_infiniband);
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
if (p_key == -1) {
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup ("default");
else
return g_strdup (_("default"));
} else
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return g_strdup_printf ("0x%04x", p_key);
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_ip_tunnel_mode (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingIPTunnel *s_ip_tunnel = NM_SETTING_IP_TUNNEL (setting);
NMIPTunnelMode mode;
mode = nm_setting_ip_tunnel_get_mode (s_ip_tunnel);
return nm_utils_enum_to_str (nm_ip_tunnel_mode_get_type (), mode);
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_ip_tunnel_mode (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMIPTunnelMode mode;
gboolean ret;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type(), value,
(int *) &mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (!ret) {
gs_free const char **values = NULL;
gs_free char *values_str = NULL;
values = nm_utils_enum_get_values (nm_ip_tunnel_mode_get_type (),
NM_IP_TUNNEL_MODE_UNKNOWN + 1,
G_MAXINT);
values_str = g_strjoinv (",", (char **) values);
g_set_error (error, 1, 0, _("invalid mode '%s', use one of %s"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, values_str);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
static NMIPAddress *
_parse_ip_address (int family, const char *address, GError **error)
{
char *value = g_strdup (address);
NMIPAddress *ipaddr;
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
ipaddr = nmc_parse_and_build_address (family, g_strstrip (value), error);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
g_free (value);
return ipaddr;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_ip_config_addresses (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
GString *printable;
guint32 num_addresses, i;
NMIPAddress *addr;
printable = g_string_new (NULL);
num_addresses = nm_setting_ip_config_get_num_addresses (s_ip);
for (i = 0; i < num_addresses; i++) {
addr = nm_setting_ip_config_get_address (s_ip, i);
if (printable->len > 0)
g_string_append (printable, ", ");
g_string_append_printf (printable, "%s/%u",
nm_ip_address_get_address (addr),
nm_ip_address_get_prefix (addr));
}
return g_string_free (printable, FALSE);
}
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_ip_config_routes (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
GString *printable;
guint32 num_routes, i;
NMIPRoute *route;
printable = g_string_new (NULL);
num_routes = nm_setting_ip_config_get_num_routes (s_ip);
for (i = 0; i < num_routes; i++) {
cli: support route options
2017-02-16 10:16:45 +01:00
gs_free char *attr_str = NULL;
gs_strfreev char **attr_names = NULL;
gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
int j;
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
route = nm_setting_ip_config_get_route (s_ip, i);
cli: support route options
2017-02-16 10:16:45 +01:00
attr_names = nm_ip_route_get_attribute_names (route);
for (j = 0; attr_names && attr_names[j]; j++) {
g_hash_table_insert (hash, attr_names[j],
nm_ip_route_get_attribute (route, attr_names[j]));
}
attr_str = nm_utils_format_variant_attributes (hash, ' ', '=');
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (get_type == NMC_PROPERTY_GET_PARSABLE) {
if (printable->len > 0)
g_string_append (printable, ", ");
g_string_append_printf (printable, "%s/%u",
nm_ip_route_get_dest (route),
nm_ip_route_get_prefix (route));
if (nm_ip_route_get_next_hop (route))
g_string_append_printf (printable, " %s", nm_ip_route_get_next_hop (route));
if (nm_ip_route_get_metric (route) != -1)
g_string_append_printf (printable, " %u", (guint32) nm_ip_route_get_metric (route));
cli: support route options
2017-02-16 10:16:45 +01:00
if (attr_str)
g_string_append_printf (printable, " %s", attr_str);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
} else {
cli: support route options
2017-02-16 10:16:45 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (printable->len > 0)
g_string_append (printable, "; ");
g_string_append (printable, "{ ");
g_string_append_printf (printable, "ip = %s/%u",
nm_ip_route_get_dest (route),
nm_ip_route_get_prefix (route));
if (nm_ip_route_get_next_hop (route)) {
g_string_append_printf (printable, ", nh = %s",
nm_ip_route_get_next_hop (route));
}
if (nm_ip_route_get_metric (route) != -1)
g_string_append_printf (printable, ", mt = %u", (guint32) nm_ip_route_get_metric (route));
cli: support route options
2017-02-16 10:16:45 +01:00
if (attr_str)
g_string_append_printf (printable, " %s", attr_str);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_string_append (printable, " }");
}
}
return g_string_free (printable, FALSE);
}
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_ip4_config_dad_timeout (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingIPConfig *s_ip = NM_SETTING_IP_CONFIG (setting);
gint dad_timeout;
dad_timeout = nm_setting_ip_config_get_dad_timeout (s_ip);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
return g_strdup_printf ("%d", dad_timeout);
switch (dad_timeout) {
case -1:
return g_strdup_printf (_("%d (default)"), dad_timeout);
case 0:
return g_strdup_printf (_("%d (off)"), dad_timeout);
default:
return g_strdup_printf ("%d", dad_timeout);
}
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static const char *ipv4_valid_methods[] = {
NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
NM_SETTING_IP4_CONFIG_METHOD_SHARED,
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
NULL
};
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_method (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
/* Silently accept "static" and convert to "manual" */
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (value && strlen (value) > 1 && matches (value, "static"))
value = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
return check_and_set_string (setting, property_info->property_name, value, ipv4_valid_methods, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_dns (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
libnm-core: improve NMSettingIP4Config / NMSettingIP6Config property types Make the :addresses and :routes properties be GPtrArrays of NMIP4Address, etc, rather than just reflecting the D-Bus data. Make the :dns properties be arrays of strings rather than arrays of binary IP addresses (and update the corresponding APIs as well).
2014-06-24 12:46:03 -04:00
char **strv = NULL, **iter, *addr;
all: replace struct in_addr with guint32
2013-07-31 23:59:50 +02:00
guint32 ip4_addr;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
libnm-core: improve NMSettingIP4Config / NMSettingIP6Config property types Make the :addresses and :routes properties be GPtrArrays of NMIP4Address, etc, rather than just reflecting the D-Bus data. Make the :dns properties be arrays of strings rather than arrays of binary IP addresses (and update the corresponding APIs as well).
2014-06-24 12:46:03 -04:00
addr = g_strstrip (*iter);
if (inet_pton (AF_INET, addr, &ip4_addr) < 1) {
g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv4_dns (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *dns,
GError **error)
{
guint32 ip4_addr;
gboolean ret;
if (inet_pton (AF_INET, dns, &ip4_addr) < 1) {
g_set_error (error, 1, 0, _("invalid IPv4 address '%s'"), dns);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns,
nm_setting_ip_config_remove_dns,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv4_dns)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_dns_search (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL;
guint i = 0;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
while (strv && strv[i])
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv4_dns_search (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *dns_search,
GError **error)
{
gboolean ret;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain DNS search domain '%s'"),
dns_search);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_search,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns_searches,
nm_setting_ip_config_remove_dns_search,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv4_dns_search)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_dns_options (ARGS_SET_FCN)
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
{
char **strv = NULL;
guint i = 0;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: show dns-options default value You can reset the default value via $ nmcli connection modify id CON ipv4.dns-options "" and set an empty value with $ nmcli connection modify id CON ipv4.dns-options " "
2015-05-20 14:55:04 +02:00
nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
while (strv && strv[i])
nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
g_strfreev (strv);
return TRUE;
}
static gboolean
_validate_and_remove_ipv4_dns_option (NMSettingIPConfig *setting,
const char *dns_option,
GError **error)
{
gboolean ret;
ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain DNS option '%s'"),
dns_option);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_dns_options,
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns_options,
nm_setting_ip_config_remove_dns_option,
_validate_and_remove_ipv4_dns_option)
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
static NMIPAddress *
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_parse_ipv4_address (const char *address, GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
return _parse_ip_address (AF_INET, address, error);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_addresses (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL, **iter;
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPAddress *ip4addr;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, ",", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
cli: fix a crash when trying to set a white-space string as IP (rh #1071394) nmcli con modify my-profile ipv4.addr " " nmcli con modify my-profile ipv6.addr " " Note: Empty string should be used to remove IPs, and 'method' might be needed to set to 'auto' simultaneously, as well. $ nmcli con modify profile1 ipv4.addr "" ipv4.method auto https://bugzilla.redhat.com/show_bug.cgi?id=1071394
2014-03-03 12:21:29 +01:00
ip4addr = _parse_ipv4_address (*iter, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
if (!ip4addr) {
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip4addr);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_address_unref (ip4addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv4_address (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *address,
GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPAddress *ip4addr;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
gboolean ret;
ip4addr = _parse_ipv4_address (address, error);
if (!ip4addr)
return FALSE;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_address_by_value (setting, ip4addr);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain IP address '%s'"), address);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_address_unref (ip4addr);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_addresses,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_addresses,
nm_setting_ip_config_remove_address,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv4_address)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_gateway (ARGS_SET_FCN)
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
{
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
NMIPAddress *ip4addr;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (strchr (value, '/')) {
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
g_set_error (error, 1, 0,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
_("invalid gateway address '%s'"), value);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
return FALSE;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
}
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
ip4addr = _parse_ipv4_address (value, error);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
if (!ip4addr)
return FALSE;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_object_set (setting, property_info->property_name, value, NULL);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
nm_ip_address_unref (ip4addr);
return TRUE;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
}
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
static NMIPRoute *
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_parse_ipv4_route (const char *route, GError **error)
{
cli: support route options
2017-02-16 10:16:45 +01:00
return nmc_parse_and_build_route (AF_INET, route, error);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip4_config_routes (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL, **iter;
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPRoute *ip4route;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, ",", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
cli: fix a crash when trying to set a white-space string as IP (rh #1071394) nmcli con modify my-profile ipv4.addr " " nmcli con modify my-profile ipv6.addr " " Note: Empty string should be used to remove IPs, and 'method' might be needed to set to 'auto' simultaneously, as well. $ nmcli con modify profile1 ipv4.addr "" ipv4.method auto https://bugzilla.redhat.com/show_bug.cgi?id=1071394
2014-03-03 12:21:29 +01:00
ip4route = _parse_ipv4_route (*iter, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
if (!ip4route) {
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip4route);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_route_unref (ip4route);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv4_route (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *route,
GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPRoute *ip4route;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
gboolean ret;
ip4route = _parse_ipv4_route (route, error);
if (!ip4route)
return FALSE;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_route_by_value (setting, ip4route);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_route_unref (ip4route);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv4_config_routes,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_routes,
nm_setting_ip_config_remove_route,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv4_route)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_ip6_config_ip6_privacy (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
return ip6_privacy_to_string (nm_setting_ip6_config_get_ip6_privacy (s_ip6), get_type);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static const char *ipv6_valid_methods[] = {
NM_SETTING_IP6_CONFIG_METHOD_IGNORE,
NM_SETTING_IP6_CONFIG_METHOD_AUTO,
NM_SETTING_IP6_CONFIG_METHOD_DHCP,
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
NM_SETTING_IP6_CONFIG_METHOD_MANUAL,
NM_SETTING_IP6_CONFIG_METHOD_SHARED,
NULL
};
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_method (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
/* Silently accept "static" and convert to "manual" */
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (value && strlen (value) > 1 && matches (value, "static"))
value = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
return check_and_set_string (setting, property_info->property_name, value, ipv6_valid_methods, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_dns (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
libnm-core: improve NMSettingIP4Config / NMSettingIP6Config property types Make the :addresses and :routes properties be GPtrArrays of NMIP4Address, etc, rather than just reflecting the D-Bus data. Make the :dns properties be arrays of strings rather than arrays of binary IP addresses (and update the corresponding APIs as well).
2014-06-24 12:46:03 -04:00
char **strv = NULL, **iter, *addr;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
struct in6_addr ip6_addr;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
libnm-core: improve NMSettingIP4Config / NMSettingIP6Config property types Make the :addresses and :routes properties be GPtrArrays of NMIP4Address, etc, rather than just reflecting the D-Bus data. Make the :dns properties be arrays of strings rather than arrays of binary IP addresses (and update the corresponding APIs as well).
2014-06-24 12:46:03 -04:00
addr = g_strstrip (*iter);
if (inet_pton (AF_INET6, addr, &ip6_addr) < 1) {
g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_dns (NM_SETTING_IP_CONFIG (setting), addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv6_dns (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *dns,
GError **error)
{
struct in6_addr ip6_addr;
gboolean ret;
if (inet_pton (AF_INET6, dns, &ip6_addr) < 1) {
g_set_error (error, 1, 0, _("invalid IPv6 address '%s'"), dns);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_dns_by_value (setting, dns);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain DNS server '%s'"), dns);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns,
nm_setting_ip_config_remove_dns,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv6_dns)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_dns_search (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL;
guint i = 0;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
if (!verify_string_list (strv, property_info->property_name, nmc_util_is_domain, error)) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
while (strv && strv[i])
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_dns_search (NM_SETTING_IP_CONFIG (setting), strv[i++]);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv6_dns_search (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *dns_search,
GError **error)
{
gboolean ret;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_dns_search_by_value (setting, dns_search);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain DNS search domain '%s'"),
dns_search);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_search,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns_searches,
nm_setting_ip_config_remove_dns_search,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv6_dns_search)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_dns_options (ARGS_SET_FCN)
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
{
char **strv = NULL;
guint i = 0;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: show dns-options default value You can reset the default value via $ nmcli connection modify id CON ipv4.dns-options "" and set an empty value with $ nmcli connection modify id CON ipv4.dns-options " "
2015-05-20 14:55:04 +02:00
nm_setting_ip_config_clear_dns_options (NM_SETTING_IP_CONFIG (setting), TRUE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, " \t,", 0);
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
while (strv && strv[i])
nm_setting_ip_config_add_dns_option (NM_SETTING_IP_CONFIG (setting), strv[i++]);
g_strfreev (strv);
return TRUE;
}
static gboolean
_validate_and_remove_ipv6_dns_option (NMSettingIPConfig *setting,
const char *dns_option,
GError **error)
{
gboolean ret;
ret = nm_setting_ip_config_remove_dns_option_by_value (setting, dns_option);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain DNS option '%s'"),
dns_option);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_dns_options,
cli: add support for DNS options
2015-03-26 11:14:18 +01:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_dns_options,
nm_setting_ip_config_remove_dns_option,
_validate_and_remove_ipv6_dns_option)
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
static NMIPAddress *
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_parse_ipv6_address (const char *address, GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
return _parse_ip_address (AF_INET6, address, error);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_addresses (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL, **iter;
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPAddress *ip6addr;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, ",", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
cli: fix a crash when trying to set a white-space string as IP (rh #1071394) nmcli con modify my-profile ipv4.addr " " nmcli con modify my-profile ipv6.addr " " Note: Empty string should be used to remove IPs, and 'method' might be needed to set to 'auto' simultaneously, as well. $ nmcli con modify profile1 ipv4.addr "" ipv4.method auto https://bugzilla.redhat.com/show_bug.cgi?id=1071394
2014-03-03 12:21:29 +01:00
ip6addr = _parse_ipv6_address (*iter, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
if (!ip6addr) {
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_address (NM_SETTING_IP_CONFIG (setting), ip6addr);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_address_unref (ip6addr);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv6_address (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *address,
GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPAddress *ip6addr;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
gboolean ret;
ip6addr = _parse_ipv6_address (address, error);
if (!ip6addr)
return FALSE;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_address_by_value (setting, ip6addr);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain IP address '%s'"), address);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_address_unref (ip6addr);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_addresses,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_addresses,
nm_setting_ip_config_remove_address,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv6_address)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_gateway (ARGS_SET_FCN)
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
{
NMIPAddress *ip6addr;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (strchr (value, '/')) {
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
g_set_error (error, 1, 0,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
_("invalid gateway address '%s'"), value);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
return FALSE;
}
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
ip6addr = _parse_ipv6_address (value, error);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
if (!ip6addr)
return FALSE;
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_object_set (setting, property_info->property_name, value, NULL);
libnm-core: add NMSettingIPConfig:gateway, drop NMIPAddress:gateway The gateway is a global property of the IPv4/IPv6 configuration, not an attribute of any particular address. So represent it as such in the API; remove the gateway from NMIPAddress, and add it to NMSettingIPConfig. Behind the scenes, the gateway is still serialized along with the first address in NMSettingIPConfig:addresses, and is deserialized from that if the settings dictionary doesn't contain a 'gateway' key. Adjust nmcli's interactive mode to prompt for IP addresses and gateway separately. (Patch partly from Jirka Klimeš.)
2014-10-20 21:30:56 -04:00
nm_ip_address_unref (ip6addr);
return TRUE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
static NMIPRoute *
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_parse_ipv6_route (const char *route, GError **error)
{
cli: support route options
2017-02-16 10:16:45 +01:00
return nmc_parse_and_build_route (AF_INET6, route, error);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_routes (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **strv = NULL, **iter;
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPRoute *ip6route;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
strv = nmc_strsplit_set (value, ",", 0);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
for (iter = strv; iter && *iter; iter++) {
cli: fix a crash when trying to set a white-space string as IP (rh #1071394) nmcli con modify my-profile ipv4.addr " " nmcli con modify my-profile ipv6.addr " " Note: Empty string should be used to remove IPs, and 'method' might be needed to set to 'auto' simultaneously, as well. $ nmcli con modify profile1 ipv4.addr "" ipv4.method auto https://bugzilla.redhat.com/show_bug.cgi?id=1071394
2014-03-03 12:21:29 +01:00
ip6route = _parse_ipv6_route (*iter, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
if (!ip6route) {
g_strfreev (strv);
return FALSE;
}
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
nm_setting_ip_config_add_route (NM_SETTING_IP_CONFIG (setting), ip6route);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_route_unref (ip6route);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
g_strfreev (strv);
return TRUE;
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
_validate_and_remove_ipv6_route (NMSettingIPConfig *setting,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
const char *route,
GError **error)
{
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
NMIPRoute *ip6route;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
gboolean ret;
ip6route = _parse_ipv6_route (route, error);
if (!ip6route)
return FALSE;
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
ret = nm_setting_ip_config_remove_route_by_value (setting, ip6route);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain route '%s'"), route);
libnm-core, all: merge IPv4 and IPv6 address/route types Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route and NMIP6Route into NMIPRoute. The new types represent IP addresses as strings, rather than in binary, and so are address-family agnostic.
2014-09-16 16:42:46 -04:00
nm_ip_route_unref (ip6route);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_ipv6_config_routes,
libnm-core: extract NMSettingIPConfig superclass out of IP4, IP6 classes Split a base NMSettingIPConfig class out of NMSettingIP4Config and NMSettingIP6Config, and update things accordingly. Further simplifications of now-redundant IPv4-vs-IPv6 code are possible, and should happen in the future.
2014-10-19 17:30:10 -04:00
NM_SETTING_IP_CONFIG,
nm_setting_ip_config_get_num_routes,
nm_setting_ip_config_remove_route,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
_validate_and_remove_ipv6_route)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_ip6_privacy (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
unsigned long val_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (!nmc_string_to_uint (value, FALSE, 0, 0, &val_int)) {
g_set_error (error, 1, 0, _("'%s' is not a number"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
if ( val_int != NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED
&& val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR
&& val_int != NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR) {
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_set_error (error, 1, 0, _("'%s' is not valid; use 0, 1, or 2"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_object_set (setting, property_info->property_name, val_int, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
static char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_get_fcn_ip6_config_addr_gen_mode (ARGS_GET_FCN)
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
{
NMSettingIP6Config *s_ip6 = NM_SETTING_IP6_CONFIG (setting);
NMSettingIP6ConfigAddrGenMode addr_gen_mode;
addr_gen_mode = nm_setting_ip6_config_get_addr_gen_mode (s_ip6);
return nm_utils_enum_to_str (nm_setting_ip6_config_addr_gen_mode_get_type (), addr_gen_mode);
}
static gboolean
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_set_fcn_ip6_config_addr_gen_mode (ARGS_SET_FCN)
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
{
NMSettingIP6ConfigAddrGenMode addr_gen_mode;
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
if (!nm_utils_enum_from_str (nm_setting_ip6_config_addr_gen_mode_get_type (), value,
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
(int *) &addr_gen_mode, NULL)) {
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
value, "eui64,stable-privacy");
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
return FALSE;
}
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
g_object_set (setting, property_info->property_name, addr_gen_mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_macsec_mode (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
NMSettingMacsecMode mode;
mode = nm_setting_macsec_get_mode (s_macsec);
return nm_utils_enum_to_str (nm_setting_macsec_mode_get_type (), mode);
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_macsec_mode (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacsecMode mode;
gs_free char *options = NULL;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nm_utils_enum_from_str (nm_setting_macsec_mode_get_type (), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
(int *) &mode, NULL)) {
options = g_strjoinv (",",
(char **) nm_utils_enum_get_values (nm_setting_macsec_mode_get_type (),
G_MININT,
G_MAXINT));
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, options);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_macsec_validation (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacsec *s_macsec = NM_SETTING_MACSEC (setting);
NMSettingMacsecValidation validation;
validation = nm_setting_macsec_get_validation (s_macsec);
return nm_utils_enum_to_str (nm_setting_macsec_validation_get_type (), validation);
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_macsec_validation (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacsecMode validation;
gs_free char *options = NULL;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nm_utils_enum_from_str (nm_setting_macsec_validation_get_type (), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
(int *) &validation, NULL)) {
options = g_strjoinv (",",
(char **) nm_utils_enum_get_values (nm_setting_macsec_validation_get_type (),
G_MININT,
G_MAXINT));
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, options);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, validation, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_macvlan_mode (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacvlan *s_macvlan = NM_SETTING_MACVLAN (setting);
NMSettingMacvlanMode mode;
char *tmp, *str;
mode = nm_setting_macvlan_get_mode (s_macvlan);
tmp = nm_utils_enum_to_str (nm_setting_macvlan_mode_get_type (), mode);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
str = g_strdup (tmp ? tmp : "");
else
str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
g_free (tmp);
return str;
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_macvlan_mode (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingMacvlanMode mode;
gs_free const char **options = NULL;
gs_free char *options_str = NULL;
long int t;
gboolean ret;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE, 0, _NM_SETTING_MACVLAN_MODE_NUM - 1, &t))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
mode = (NMSettingMacvlanMode) t;
else {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_setting_macvlan_mode_get_type (), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
(int *) &mode, NULL);
if (!ret) {
options = nm_utils_enum_get_values (nm_setting_macvlan_mode_get_type(),
NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
G_MAXINT);
options_str = g_strjoinv (",", (char **) options);
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, options_str);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_olpc_mesh_ssid (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingOlpcMesh *s_olpc_mesh = NM_SETTING_OLPC_MESH (setting);
GBytes *ssid;
char *ssid_str = NULL;
ssid = nm_setting_olpc_mesh_get_ssid (s_olpc_mesh);
if (ssid) {
ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
g_bytes_get_size (ssid));
}
return ssid_str;
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_olpc_mesh_channel (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
unsigned long chan_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_string_to_uint (value, TRUE, 1, 13, &chan_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid channel; use <1-13>"), value);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, chan_int, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_proxy_method (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingProxy *s_proxy = NM_SETTING_PROXY (setting);
NMSettingProxyMethod method;
method = nm_setting_proxy_get_method (s_proxy);
return nm_utils_enum_to_str (nm_setting_proxy_method_get_type (), method);
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_proxy_method (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
int method;
gboolean ret;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_setting_proxy_method_get_type(), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
&method, NULL);
if (!ret) {
gs_free const char **values = NULL;
gs_free char *values_str = NULL;
values = nm_utils_enum_get_values (nm_setting_proxy_method_get_type (),
NM_SETTING_PROXY_METHOD_NONE,
G_MAXINT);
values_str = g_strjoinv (",", (char **) values);
g_set_error (error, 1, 0, _("invalid method '%s', use one of %s"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, values_str);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, method, NULL);
cli: add addr-gen-mode property
2015-10-29 16:11:14 +01:00
return TRUE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_proxy_pac_script (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char *script = NULL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_proxy_check_script (value, &script, error)) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, script, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_free (script);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_serial_parity (ARGS_GET_FCN)
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
{
NMSettingSerial *s_serial = NM_SETTING_SERIAL (setting);
switch (nm_setting_serial_get_parity (s_serial)) {
case NM_SETTING_SERIAL_PARITY_EVEN:
return g_strdup ("even");
case NM_SETTING_SERIAL_PARITY_ODD:
return g_strdup ("odd");
default:
case NM_SETTING_SERIAL_PARITY_NONE:
return g_strdup ("none");
}
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_serial_parity (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
NMSettingSerialParity parity;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (value[0] == 'E' || value[0] == 'e')
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
parity = NM_SETTING_SERIAL_PARITY_EVEN;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
else if (value[0] == 'O' || value[0] == 'o')
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
parity = NM_SETTING_SERIAL_PARITY_ODD;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
else if (value[0] == 'N' || value[0] == 'n')
libnm-core: make NMSettingSerial:parity an enum NMSettingSerial:parity was defined as a char-typed property that could have the (case-sensitive!) values 'n', 'E', or 'o'. This is zany. Add an NMSettingSerialParity enum, and use that instead.
2014-09-24 09:12:46 -04:00
parity = NM_SETTING_SERIAL_PARITY_NONE;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
else {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_set_error (error, 1, 0, _("'%s' is not valid; use [e, o, n]"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, parity, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
cli: support file names for 'config' argument when creating team connections nmcli con add type team config /home/cimrman/team-config.json libteam (and in turn NetworkManager) configures team devices via plain config data in JSON format. However, it is useful and more user-friendly for nmcli to accept also a file name that contains the config data, and read it. Thus the user is not forced to type whole (possibly long) config on the command line.
2013-11-11 17:48:25 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_team_config (ARGS_SET_FCN)
cli: support file names for 'config' argument when creating team connections nmcli con add type team config /home/cimrman/team-config.json libteam (and in turn NetworkManager) configures team devices via plain config data in JSON format. However, it is useful and more user-friendly for nmcli to accept also a file name that contains the config data, and read it. Thus the user is not forced to type whole (possibly long) config on the command line.
2013-11-11 17:48:25 +01:00
{
char *json = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_team_check_config (value, &json, error)) {
cli: support file names for 'config' argument when creating team connections nmcli con add type team config /home/cimrman/team-config.json libteam (and in turn NetworkManager) configures team devices via plain config data in JSON format. However, it is useful and more user-friendly for nmcli to accept also a file name that contains the config data, and read it. Thus the user is not forced to type whole (possibly long) config on the command line.
2013-11-11 17:48:25 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, json, NULL);
cli: support file names for 'config' argument when creating team connections nmcli con add type team config /home/cimrman/team-config.json libteam (and in turn NetworkManager) configures team devices via plain config data in JSON format. However, it is useful and more user-friendly for nmcli to accept also a file name that contains the config data, and read it. Thus the user is not forced to type whole (possibly long) config on the command line.
2013-11-11 17:48:25 +01:00
g_free (json);
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_tun_mode (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingTun *s_tun = NM_SETTING_TUN (setting);
NMSettingTunMode mode;
char *tmp, *str;
mode = nm_setting_tun_get_mode (s_tun);
tmp = nm_utils_enum_to_str (nm_setting_tun_mode_get_type (), mode);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
str = g_strdup_printf ("%s", tmp ? tmp : "");
else
str = g_strdup_printf ("%d (%s)", mode, tmp ? tmp : "");
g_free (tmp);
return str;
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_tun_mode (ARGS_SET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingTunMode mode;
gboolean ret;
long int t;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE, 0, NM_SETTING_TUN_MODE_TAP, &t))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
mode = (NMSettingTunMode) t;
else {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_setting_tun_mode_get_type (), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
(int *) &mode, NULL);
if (!ret) {
g_set_error (error, 1, 0, _("invalid option '%s', use '%s' or '%s'"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, "tun", "tap");
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return FALSE;
}
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) mode, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_vlan_flags (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
nmcli: output just the raw value of vlan.flags when in terse mode
2017-01-10 14:23:04 +01:00
return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_vlan_ingress_priority_map (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
return vlan_priorities_to_string (s_vlan, NM_VLAN_INGRESS_MAP);
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_vlan_egress_priority_map (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting);
return vlan_priorities_to_string (s_vlan, NM_VLAN_EGRESS_MAP);
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_vlan_xgress_priority_map (NMSetting *setting,
const char *value,
NMVlanPriorityMap map_type,
GError **error)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
char **prio_map, **p;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
prio_map = nmc_vlan_parse_priority_maps (value, map_type, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
if (!prio_map)
return FALSE;
for (p = prio_map; p && *p; p++)
nm_setting_vlan_add_priority_str (NM_SETTING_VLAN (setting), map_type, *p);
g_strfreev (prio_map);
return TRUE;
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_vlan_ingress_priority_map (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_INGRESS_MAP, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_vlan_egress_priority_map (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return _set_vlan_xgress_priority_map (setting, value, NM_VLAN_EGRESS_MAP, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_remove_vlan_xgress_priority_map (NMSetting *setting,
const NmcPropertyInfo *property_info,
const char *value,
guint32 idx,
NMVlanPriorityMap map_type,
GError **error)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
guint32 num;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
/* If value != NULL, remove by value */
if (value) {
gboolean ret;
char **prio_map;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
gs_free char *v = g_strdup (value);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
prio_map = nmc_vlan_parse_priority_maps (v, map_type, error);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
if (!prio_map)
return FALSE;
if (prio_map[1])
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: only one mapping at a time is supported; taking the first one (%s)\n"),
prio_map[0]);
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
ret = nm_setting_vlan_remove_priority_str_by_value (NM_SETTING_VLAN (setting),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
map_type,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
prio_map[0]);
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain mapping '%s'"), prio_map[0]);
g_strfreev (prio_map);
return ret;
}
/* Else remove by index */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
num = nm_setting_vlan_get_num_priorities (NM_SETTING_VLAN (setting), map_type);
if (num == 0) {
g_set_error_literal (error, 1, 0, _("no priority to remove"));
return FALSE;
}
if (idx >= num) {
g_set_error (error, 1, 0, _("index '%d' is not in the range of <0-%d>"),
idx, num - 1);
return FALSE;
}
nm_setting_vlan_remove_priority (NM_SETTING_VLAN (setting), map_type, idx);
return TRUE;
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_remove_fcn_vlan_ingress_priority_map (ARGS_REMOVE_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return _remove_vlan_xgress_priority_map (setting,
property_info,
value,
idx,
NM_VLAN_INGRESS_MAP,
error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_remove_fcn_vlan_egress_priority_map (ARGS_REMOVE_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return _remove_vlan_xgress_priority_map (setting,
property_info,
value,
idx,
NM_VLAN_EGRESS_MAP,
error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_vpn_data (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
GString *data_item_str;
data_item_str = g_string_new (NULL);
nm_setting_vpn_foreach_data_item (s_vpn, &vpn_data_item, data_item_str);
return g_string_free (data_item_str, FALSE);
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_vpn_secrets (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
GString *secret_str;
secret_str = g_string_new (NULL);
nm_setting_vpn_foreach_secret (s_vpn, &vpn_data_item, secret_str);
return g_string_free (secret_str, FALSE);
}
static const char *
_validate_vpn_hash_value (const char *option, const char *value, GError **error)
{
/* nm_setting_vpn_add_data_item() and nm_setting_vpn_add_secret() does not
* allow empty strings */
if (!value || !*value) {
g_set_error (error, 1, 0, _("'%s' cannot be empty"), option);
return NULL;
}
return value;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_OPTIONS (_set_fcn_vpn_data,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_VPN,
NMSettingVpn,
nm_setting_vpn_add_data_item,
NULL,
_validate_vpn_hash_value)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_OPTION (_remove_fcn_vpn_data,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_VPN,
nm_setting_vpn_remove_data_item)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_OPTIONS (_set_fcn_vpn_secrets,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_VPN,
NMSettingVpn,
nm_setting_vpn_add_secret,
NULL,
_validate_vpn_hash_value)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_OPTION (_remove_fcn_vpn_secrets,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_VPN,
nm_setting_vpn_remove_secret)
static char *
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
_get_fcn_wired_wake_on_lan (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWired *s_wired = NM_SETTING_WIRED (setting);
NMSettingWiredWakeOnLan wol;
char *tmp, *str;
wol = nm_setting_wired_get_wake_on_lan (s_wired);
tmp = nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (), wol);
if (get_type == NMC_PROPERTY_GET_PARSABLE)
str = g_strdup_printf ("%s", tmp && *tmp ? tmp : "none");
else
str = g_strdup_printf ("%d (%s)", wol, tmp && *tmp ? tmp : "none");
g_free (tmp);
return str;
}
static gboolean
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
_set_fcn_wired_wake_on_lan (ARGS_SET_FCN)
cli: fix an error in nmcli editor when setting vpn.data/vpn.secrets nmcli> set vpn.data haha= (process:3951): libnm-CRITICAL **: nm_setting_vpn_add_data_item: assertion 'strlen (item) > 0' failed nmcli> set vpn.secrets haha= (process:3951): libnm-CRITICAL **: nm_setting_vpn_add_secret: assertion 'strlen (secret) > 0' failed
2015-11-27 21:46:00 +01:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingWiredWakeOnLan wol;
gs_free char *err_token = NULL;
gboolean ret;
long int t;
cli: fix an error in nmcli editor when setting vpn.data/vpn.secrets nmcli> set vpn.data haha= (process:3951): libnm-CRITICAL **: nm_setting_vpn_add_data_item: assertion 'strlen (item) > 0' failed nmcli> set vpn.secrets haha= (process:3951): libnm-CRITICAL **: nm_setting_vpn_add_secret: assertion 'strlen (secret) > 0' failed
2015-11-27 21:46:00 +01:00
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE, 0,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NM_SETTING_WIRED_WAKE_ON_LAN_ALL
| NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS,
&t))
wol = (NMSettingWiredWakeOnLan) t;
else {
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
ret = nm_utils_enum_from_str (nm_setting_wired_wake_on_lan_get_type (), value,
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
(int *) &wol, &err_token);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (!ret) {
if ( g_ascii_strcasecmp (err_token, "none") == 0
|| g_ascii_strcasecmp (err_token, "disable") == 0
|| g_ascii_strcasecmp (err_token, "disabled") == 0)
wol = NM_SETTING_WIRED_WAKE_ON_LAN_NONE;
else {
g_set_error (error, 1, 0, _("invalid option '%s', use a combination of [%s] or 'ignore', 'default' or 'none'"),
err_token,
nm_utils_enum_to_str (nm_setting_wired_wake_on_lan_get_type (),
NM_SETTING_WIRED_WAKE_ON_LAN_ALL));
return FALSE;
}
}
}
if ( NM_FLAGS_ANY (wol, NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS)
&& !nm_utils_is_power_of_two (wol)) {
g_set_error_literal (error, 1, 0, _("'default' and 'ignore' are incompatible with other flags"));
return FALSE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) wol, NULL);
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
return TRUE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wired_mac_address_blacklist,
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NM_SETTING_WIRED,
nm_setting_wired_add_mac_blacklist_item)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_wired_mac_blacklist_item (NMSettingWired *setting,
const char *mac,
GError **error)
{
gboolean ret;
guint8 buf[32];
libnm-core, etc: drop type-based hwaddr funcs, port to length-based ones Drop the arptype-based nm_utils_hwaddr funcs, and rename the length-based ones to no longer have _len in their names. This also switches nm_utils_hwaddr_atoba() to using a length rather than an arptype, and adds a length argument to nm_utils_hwaddr_valid() (making nm_utils_hwaddr_valid() now a replacement for nm_utils_hwaddr_aton() in some places, where we were only using aton() to do validity checking).
2014-07-04 15:59:19 -04:00
if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
return FALSE;
}
ret = nm_setting_wired_remove_mac_blacklist_item_by_value (setting, mac);
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wired_mac_address_blacklist,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_WIRED,
nm_setting_wired_get_num_mac_blacklist_items,
nm_setting_wired_remove_mac_blacklist_item,
_validate_and_remove_wired_mac_blacklist_item)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wired_s390_subchannels (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: fix setting ethernet.s390-subchannels It was not properly updated in a7c4d53d036c0f75b0903c95de7cb8fbdc47413f (when updating stuff to ne libnm). And allow 2 subchannels (libnm and ifcfg-rh allow it too).
2014-11-28 14:11:05 +01:00
char **strv = NULL;
int len;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
strv = nmc_strsplit_set (value, " ,\t", 0);
cli: fix setting ethernet.s390-subchannels It was not properly updated in a7c4d53d036c0f75b0903c95de7cb8fbdc47413f (when updating stuff to ne libnm). And allow 2 subchannels (libnm and ifcfg-rh allow it too).
2014-11-28 14:11:05 +01:00
len = g_strv_length (strv);
if (len != 2 && len != 3) {
g_set_error (error, 1, 0, _("'%s' is not valid; 2 or 3 strings should be provided"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, strv, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_strfreev (strv);
return TRUE;
}
cli: fix an error in setting s390-options in nmcli editor nmcli> set eth.s390-options portno= (process:4711): libnm-CRITICAL **: nm_setting_wired_add_s390_option: assertion 'value_len > 0 && value_len < 200' failed
2015-11-27 21:58:05 +01:00
static const char *
_validate_s390_option_value (const char *option, const char *value, GError **error)
{
/* nm_setting_wired_add_s390_option() requires value len in <1,199> interval */
if (!value || !*value || strlen (value) >= 200) {
cli: fix spelling in user visible texts https://bugzilla.gnome.org/show_bug.cgi?id=759555 Reported-by: Anders Jonsson <anders.jonsson@norsjovallen.se>
2015-12-17 12:22:43 +01:00
g_set_error (error, 1, 0, _("'%s' string value should consist of 1 - 199 characters"), option);
cli: fix an error in setting s390-options in nmcli editor nmcli> set eth.s390-options portno= (process:4711): libnm-CRITICAL **: nm_setting_wired_add_s390_option: assertion 'value_len > 0 && value_len < 200' failed
2015-11-27 21:58:05 +01:00
return NULL;
}
return value;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_OPTIONS (_set_fcn_wired_s390_options,
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NM_SETTING_WIRED,
NMSettingWired,
nm_setting_wired_add_s390_option,
nm_setting_wired_get_valid_s390_options,
cli: fix an error in setting s390-options in nmcli editor nmcli> set eth.s390-options portno= (process:4711): libnm-CRITICAL **: nm_setting_wired_add_s390_option: assertion 'value_len > 0 && value_len < 200' failed
2015-11-27 21:58:05 +01:00
_validate_s390_option_value)
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_OPTION (_remove_fcn_wired_s390_options,
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NM_SETTING_WIRED,
nm_setting_wired_remove_s390_option)
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
static const char *const*
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_values_fcn__wired_s390_options (ARGS_VALUES_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return nm_setting_wired_get_valid_s390_options (NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
static const char *
cli: use define for argument lists in settings.c settings.c basically consists of property-type structures and *a lot* of accessors. All these accessors share the same argument list. It is very repetitive to specify it over and over again. Also, there are so many arguments that one is compelled to wrap the lines. All in all it results in a lot of noise that takes the eye from the important code. Also, the argument list is expected to change, so we possibly only have to change one place.
2017-03-27 18:00:47 +02:00
_describe_fcn_wired_s390_options (ARGS_DESCRIBE_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
static char *desc = NULL;
const char **valid_options;
char *options_str;
if (G_UNLIKELY (desc == NULL)) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
valid_options = nm_setting_wired_get_valid_s390_options (NULL);
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
options_str = g_strjoinv (", ", (char **) valid_options);
desc = g_strdup_printf (_("Enter a list of S/390 options formatted as:\n"
cli: tivial fixup whitespace in command description text Signed-off-by: Thomas Haller <thaller@redhat.com>
2013-11-12 20:45:00 +01:00
" option = <value>, option = <value>,...\n"
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
"Valid options are: %s\n"),
options_str);
g_free (options_str);
}
return desc;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_ssid (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
GBytes *ssid;
char *ssid_str = NULL;
ssid = nm_setting_wireless_get_ssid (s_wireless);
if (ssid) {
ssid_str = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL),
g_bytes_get_size (ssid));
}
return ssid_str;
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_powersave (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (setting);
NMSettingWirelessPowersave powersave;
gs_free char *str = NULL;
char *ret;
powersave = nm_setting_wireless_get_powersave (s_wireless);
str = nm_utils_enum_to_str (nm_setting_wireless_powersave_get_type (), powersave);
if (get_type == NMC_PROPERTY_GET_PARSABLE) {
ret = str;
str = NULL;
return ret;
} else
return g_strdup_printf ("%s (%u)", str, powersave);
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_mac_address_randomization (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWireless *s_wifi = NM_SETTING_WIRELESS (setting);
NMSettingMacRandomization randomization = nm_setting_wireless_get_mac_address_randomization (s_wifi);
if (randomization == NM_SETTING_MAC_RANDOMIZATION_DEFAULT)
return g_strdup (_("default"));
else if (randomization == NM_SETTING_MAC_RANDOMIZATION_NEVER)
return g_strdup (_("never"));
else if (randomization == NM_SETTING_MAC_RANDOMIZATION_ALWAYS)
return g_strdup_printf (_("always"));
else
return g_strdup_printf (_("unknown"));
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_channel (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
unsigned long chan_int;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!nmc_string_to_uint (value, FALSE, 0, 0, &chan_int)) {
g_set_error (error, 1, 0, _("'%s' is not a valid channel"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
if ( !nm_utils_wifi_is_channel_valid (chan_int, "a")
cli: bugfix verification for wifi channel in edit mode This bug caused the edit mode to refuse most of the valid wifi channels. The bug was present since the beginning, so all versions before this commit will have this issue. https://bugzilla.redhat.com/show_bug.cgi?id=999999 Signed-off-by: Thomas Haller <thaller@redhat.com>
2013-08-23 17:10:29 +02:00
&& !nm_utils_wifi_is_channel_valid (chan_int, "bg")) {
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_set_error (error, 1, 0, _("'%ld' is not a valid channel"), chan_int);
return FALSE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, chan_int, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_SETTER_MAC_BLACKLIST (_set_fcn_wireless_mac_address_blacklist,
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NM_SETTING_WIRELESS,
nm_setting_wireless_add_mac_blacklist_item)
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_wifi_mac_blacklist_item (NMSettingWireless *setting,
const char *mac,
GError **error)
{
gboolean ret;
guint8 buf[32];
libnm-core, etc: drop type-based hwaddr funcs, port to length-based ones Drop the arptype-based nm_utils_hwaddr funcs, and rename the length-based ones to no longer have _len in their names. This also switches nm_utils_hwaddr_atoba() to using a length rather than an arptype, and adds a length argument to nm_utils_hwaddr_valid() (making nm_utils_hwaddr_valid() now a replacement for nm_utils_hwaddr_aton() in some places, where we were only using aton() to do validity checking).
2014-07-04 15:59:19 -04:00
if (!nm_utils_hwaddr_aton (mac, buf, ETH_ALEN)) {
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
g_set_error (error, 1, 0, _("'%s' is not a valid MAC address"), mac);
return FALSE;
}
ret = nm_setting_wireless_remove_mac_blacklist_item_by_value (setting, mac);
if (!ret)
g_set_error (error, 1, 0, _("the property doesn't contain MAC address '%s'"), mac);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_mac_address_blacklist,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_WIRELESS,
nm_setting_wireless_get_num_mac_blacklist_items,
nm_setting_wireless_remove_mac_blacklist_item,
_validate_and_remove_wifi_mac_blacklist_item)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_powersave (ARGS_SET_FCN)
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
{
wifi: don't touch by default current powersave setting Some drivers (or things outside NM like 'powertop') may turn powersave on, so don't touch it unless explicitly configured by user. To achieve this, add new 'default' and 'ignore' options; the former can be used to fall back to a globally configured setting, while the latter tells NM not to touch the current setting. When 'default' is specified, a missing global default configuration is equivalent to 'ignore'. It is possible to enable Wi-Fi power saving for all connections by dropping a file in /etc/NetworkManager/conf.d with the following content: [connection] wifi.powersave=3 https://bugzilla.gnome.org/show_bug.cgi?id=760125
2016-02-10 16:46:34 +01:00
NMSettingWirelessPowersave powersave;
gs_free const char **options = NULL;
gs_free char *options_str = NULL;
long int t;
gboolean ret;
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE,
wifi: don't touch by default current powersave setting Some drivers (or things outside NM like 'powertop') may turn powersave on, so don't touch it unless explicitly configured by user. To achieve this, add new 'default' and 'ignore' options; the former can be used to fall back to a globally configured setting, while the latter tells NM not to touch the current setting. When 'default' is specified, a missing global default configuration is equivalent to 'ignore'. It is possible to enable Wi-Fi power saving for all connections by dropping a file in /etc/NetworkManager/conf.d with the following content: [connection] wifi.powersave=3 https://bugzilla.gnome.org/show_bug.cgi?id=760125
2016-02-10 16:46:34 +01:00
NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
NM_SETTING_WIRELESS_POWERSAVE_LAST,
&t))
powersave = (NMSettingWirelessPowersave) t;
else {
ret = nm_utils_enum_from_str (nm_setting_wireless_powersave_get_type (),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value,
wifi: don't touch by default current powersave setting Some drivers (or things outside NM like 'powertop') may turn powersave on, so don't touch it unless explicitly configured by user. To achieve this, add new 'default' and 'ignore' options; the former can be used to fall back to a globally configured setting, while the latter tells NM not to touch the current setting. When 'default' is specified, a missing global default configuration is equivalent to 'ignore'. It is possible to enable Wi-Fi power saving for all connections by dropping a file in /etc/NetworkManager/conf.d with the following content: [connection] wifi.powersave=3 https://bugzilla.gnome.org/show_bug.cgi?id=760125
2016-02-10 16:46:34 +01:00
(int *) &powersave,
NULL);
if (!ret) {
options = nm_utils_enum_get_values (nm_setting_wireless_powersave_get_type (),
NM_SETTING_WIRELESS_POWERSAVE_DEFAULT,
NM_SETTING_WIRELESS_POWERSAVE_LAST);
options_str = g_strjoinv (",", (char **) options);
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_set_error (error, 1, 0, _("invalid option '%s', use one of [%s]"), value, options_str);
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
return FALSE;
}
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) powersave, NULL);
cli: add support for wifi.powersave setting
2014-11-17 09:18:08 -06:00
return TRUE;
}
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_mac_address_randomization (ARGS_SET_FCN)
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
{
NMSettingMacRandomization randomization;
gs_free char *err_token = NULL;
gboolean ret;
long int t;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nmc_string_to_int_base (value, 0, TRUE,
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
NM_SETTING_MAC_RANDOMIZATION_DEFAULT,
NM_SETTING_MAC_RANDOMIZATION_ALWAYS,
&t))
randomization = (NMSettingMacRandomization) t;
else {
ret = nm_utils_enum_from_str (nm_setting_mac_randomization_get_type (),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value,
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
(int *) &randomization,
&err_token);
if (!ret) {
g_set_error (error, 1, 0, _("invalid option '%s', use 'default', 'never' or 'always'"),
err_token);
return FALSE;
}
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, (guint) randomization, NULL);
nmcli: add support for WiFi MAC address randomization property
2015-10-22 09:33:10 -05:00
return TRUE;
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_security_wep_key0 (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 0));
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_security_wep_key1 (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 1));
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_security_wep_key2 (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 2));
}
static char *
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_security_wep_key3 (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
NMSettingWirelessSecurity *s_wireless_sec = NM_SETTING_WIRELESS_SECURITY (setting);
return g_strdup (nm_setting_wireless_security_get_wep_key (s_wireless_sec, 3));
}
static char *
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
_get_fcn_wireless_security_wep_key_type (ARGS_GET_FCN)
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
{
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
return wep_key_type_to_string (nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting)));
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static const char *wifi_sec_valid_protos[] = { "wpa", "rsn", NULL };
cli: (trivial) move DEFINE_SETTER_STR_LIST_MULTI to the right place
2015-05-05 10:06:30 +02:00
DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_proto,
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_proto)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_security_proto (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return check_and_add_wifi_sec_proto (setting, property_info->property_name, value, wifi_sec_valid_protos, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_wifi_sec_proto (NMSettingWirelessSecurity *setting,
const char *proto,
GError **error)
{
gboolean ret;
const char *valid;
valid = nmc_string_is_valid (proto, wifi_sec_valid_protos, error);
if (!valid)
return FALSE;
ret = nm_setting_wireless_security_remove_proto_by_value (setting, proto);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain protocol '%s'"), proto);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_proto,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_protos,
nm_setting_wireless_security_remove_proto,
_validate_and_remove_wifi_sec_proto)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static const char *wifi_sec_valid_pairwises[] = { "tkip", "ccmp", NULL };
cli: (trivial) move DEFINE_SETTER_STR_LIST_MULTI to the right place
2015-05-05 10:06:30 +02:00
DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_pairwise,
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_pairwise)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_security_pairwise (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return check_and_add_wifi_sec_pairwise (setting, property_info->property_name, value, wifi_sec_valid_pairwises, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_wifi_sec_pairwise (NMSettingWirelessSecurity *setting,
const char *pairwise,
GError **error)
{
gboolean ret;
const char *valid;
valid = nmc_string_is_valid (pairwise, wifi_sec_valid_pairwises, error);
if (!valid)
return FALSE;
ret = nm_setting_wireless_security_remove_pairwise_by_value (setting, pairwise);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain protocol '%s'"), pairwise);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_pairwise,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_pairwise,
nm_setting_wireless_security_remove_pairwise,
_validate_and_remove_wifi_sec_pairwise)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static const char *wifi_sec_valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
cli: (trivial) move DEFINE_SETTER_STR_LIST_MULTI to the right place
2015-05-05 10:06:30 +02:00
DEFINE_SETTER_STR_LIST_MULTI (check_and_add_wifi_sec_group,
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_add_group)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_security_group (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
return check_and_add_wifi_sec_group (setting, property_info->property_name, value, wifi_sec_valid_groups, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
static gboolean
_validate_and_remove_wifi_sec_group (NMSettingWirelessSecurity *setting,
const char *group,
GError **error)
{
gboolean ret;
const char *valid;
valid = nmc_string_is_valid (group, wifi_sec_valid_groups, error);
if (!valid)
return FALSE;
ret = nm_setting_wireless_security_remove_group_by_value (setting, group);
if (!ret)
g_set_error (error, 1, 0,
_("the property doesn't contain protocol '%s'"), group);
return ret;
}
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
DEFINE_REMOVER_INDEX_OR_VALUE (_remove_fcn_wireless_security_group,
cli: allow removing properties by-value (in addition to by-index) It works both in 'nmcli con modify' and 'nmcli con edit'. The following properties are supported (all container-type properties except properties with option names): ipv4.dns ipv4.dns-searches ipv4.addresses ipv4.routes ipv6.dns ipv6.dns-searches ipv6.addresses ipv6.routes 802-1x.eap 802-1x.altsubject-matches 802-1x.phase2-altsubject-matches connection.permissions connection.secondary 802-3-ethernet.mac-address-blacklist 802-11-wireless.mac-address-blacklist 802-11-wireless-security.proto 802-11-wireless-security.pairwise 802-11-wireless-security.group vlan.ingress-priority-map vlan.egress-priority-map
2014-02-24 11:50:05 +01:00
NM_SETTING_WIRELESS_SECURITY,
nm_setting_wireless_security_get_num_groups,
nm_setting_wireless_security_remove_group,
_validate_and_remove_wifi_sec_group)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
static gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_wep_key (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
NMWepKeyType guessed_type = NM_WEP_KEY_TYPE_UNKNOWN;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NMWepKeyType type;
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
guint32 prev_idx, idx;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
/* Get currently set type */
type = nm_setting_wireless_security_get_wep_key_type (NM_SETTING_WIRELESS_SECURITY (setting));
/* Guess key type */
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_KEY))
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
guessed_type = NM_WEP_KEY_TYPE_KEY;
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
else if (nm_utils_wep_key_valid (value, NM_WEP_KEY_TYPE_PASSPHRASE))
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
guessed_type = NM_WEP_KEY_TYPE_PASSPHRASE;
if (guessed_type == NM_WEP_KEY_TYPE_UNKNOWN) {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_set_error (error, 1, 0, _("'%s' is not valid"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
if (type != NM_WEP_KEY_TYPE_UNKNOWN && type != guessed_type) {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (nm_utils_wep_key_valid (value, type))
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
guessed_type = type;
else {
g_set_error (error, 1, 0,
_("'%s' not compatible with %s '%s', please change the key or set the right %s first."),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, wep_key_type_to_string (type),
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE);
return FALSE;
}
}
prev_idx = nm_setting_wireless_security_get_wep_tx_keyidx (NM_SETTING_WIRELESS_SECURITY (setting));
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
idx = property_info->property_name[strlen (property_info->property_name) - 1] - '0';
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("WEP key is guessed to be of '%s'\n"), wep_key_type_to_string (guessed_type));
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
if (idx != prev_idx)
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("WEP key index set to '%d'\n"), idx);
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, value, NULL);
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, guessed_type, NULL);
if (idx != prev_idx)
g_object_set (setting, NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, idx, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
static gboolean
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_security_wep_key_type (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: set wep-key-type properly in nmcli con edit (rh #1003945) Accept both [0,1,2] and [unknown,key,passphrase] as wep-key-type values and set the property value correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1003945
2013-09-10 16:14:10 +02:00
unsigned long type_int;
const char *valid_wep_types[] = { "unknown", "key", "passphrase", NULL };
const char *type_str = NULL;
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
const char *key0, *key1,* key2, *key3;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
NMWepKeyType type = NM_WEP_KEY_TYPE_UNKNOWN;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
if (!nmc_string_to_uint (value, TRUE, 0, 2, &type_int)) {
if (!(type_str = nmc_string_is_valid (value, valid_wep_types, NULL))) {
g_set_error (error, 1, 0, _("'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]"), value);
cli: set wep-key-type properly in nmcli con edit (rh #1003945) Accept both [0,1,2] and [unknown,key,passphrase] as wep-key-type values and set the property value correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1003945
2013-09-10 16:14:10 +02:00
return FALSE;
}
if (type_str == valid_wep_types[1])
type = NM_WEP_KEY_TYPE_KEY;
else if (type_str == valid_wep_types[2])
type = NM_WEP_KEY_TYPE_PASSPHRASE;
} else
type = (NMWepKeyType) type_int;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
/* Check type compatibility with set keys */
key0 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 0);
key1 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 1);
key2 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 2);
key3 = nm_setting_wireless_security_get_wep_key (NM_SETTING_WIRELESS_SECURITY (setting), 3);
if (key0 && !nm_utils_wep_key_valid (key0, type))
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, wep_key_type_to_string (type));
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
if (key1 && !nm_utils_wep_key_valid (key1, type))
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, wep_key_type_to_string (type));
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
if (key2 && !nm_utils_wep_key_valid (key2, type))
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, wep_key_type_to_string (type));
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
if (key3 && !nm_utils_wep_key_valid (key3, type))
cli: use g_print/g_printerr rather than printf/fprintf Use g_print() and g_printerr(), which wrap printf() and fprintf(stderr,...), but handle conversion from UTF-8 if the locale is using a different character set.
2014-09-19 16:04:40 -04:00
g_print (_("Warning: '%s' is not compatible with '%s' type, please change or delete the key.\n"),
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, wep_key_type_to_string (type));
cli: better checking of WEP key types in nmcli interactive editor (rh #1040964) https://bugzilla.redhat.com/show_bug.cgi?id=1040964
2014-02-13 11:22:31 +01:00
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, type, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
static gboolean
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
_set_fcn_wireless_security_psk (ARGS_SET_FCN)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
if (!nm_utils_wpa_psk_valid (value)) {
g_set_error (error, 1, 0, _("'%s' is not a valid PSK"), value);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return FALSE;
}
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
g_object_set (setting, property_info->property_name, value, NULL);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
/*****************************************************************************/
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
nmc_value_transform_bool_string (const GValue *src_value,
GValue *dest_value)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
dest_value->data[0].v_pointer = g_strdup (src_value->data[0].v_int ? "yes" : "no");
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
nmc_value_transform_char_string (const GValue *src_value,
GValue *dest_value)
{
dest_value->data[0].v_pointer = g_strdup_printf ("%c", src_value->data[0].v_uint);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void __attribute__((constructor))
register_nmcli_value_transforms (void)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_value_register_transform_func (G_TYPE_BOOLEAN, G_TYPE_STRING, nmc_value_transform_bool_string);
g_value_register_transform_func (G_TYPE_CHAR, G_TYPE_STRING, nmc_value_transform_char_string);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
/*****************************************************************************/
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSetting *
nmc_setting_new_for_name (const char *name)
{
GType stype;
NMSetting *setting = NULL;
if (name) {
stype = nm_setting_lookup_type (name);
if (stype != G_TYPE_INVALID) {
setting = g_object_new (stype, NULL);
g_warn_if_fail (NM_IS_SETTING (setting));
}
}
return setting;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
static gboolean
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
get_answer (const char *prop, const char *value)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
char *tmp_str;
char *question;
gboolean answer = FALSE;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (value)
question = g_strdup_printf (_("Do you also want to set '%s' to '%s'? [yes]: "), prop, value);
else
question = g_strdup_printf (_("Do you also want to clear '%s'? [yes]: "), prop);
tmp_str = nmc_get_user_input (question);
cli: make match() return boolean Coccinelle semantic patch: @@ @@ -int +gboolean matches (...); @@ expression pattern, cmd, len; @@ -int +gboolean matches (...) { ... - return memcmp (pattern, cmd, len); + return memcmp (pattern, cmd, len) == 0; } @@ expression prefix, str; @@ ( -matches (prefix, str) != 0 +!matches (prefix, str) | -matches (prefix, str) == 0 +matches (prefix, str) ) @@ expression prefix, str; @@ -(matches (prefix, str)) +matches (prefix, str) @@ expression prefix, str; @@ -(!matches (prefix, str)) +!matches (prefix, str) spatch --smpl-spacing --sp-file match.cocci --dir clients/cli/ \ --include-headers --macro-file shared/nm-utils/gsystem-local-alloc.h
2017-02-15 12:20:55 +01:00
if (!tmp_str || matches (tmp_str, "yes"))
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
answer = TRUE;
g_free (tmp_str);
g_free (question);
return answer;
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void ipv4_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data);
static void ipv6_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
ipv4_addresses_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
{
static gboolean answered = FALSE;
static gboolean answer = FALSE;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_block_by_func (object, G_CALLBACK (ipv4_method_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* If we have some IP addresses set method to 'manual'.
* Else if the method was 'manual', change it back to 'auto'.
*/
if (nm_setting_ip_config_get_num_addresses (NM_SETTING_IP_CONFIG (object))) {
if (g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
if (!answered) {
answered = TRUE;
answer = get_answer ("ipv4.method", "manual");
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (answer)
g_object_set (object, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_MANUAL, NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
} else {
answered = FALSE;
if (!g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
g_object_set (object, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_unblock_by_func (object, G_CALLBACK (ipv4_method_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
static void
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
ipv4_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static GValue value = G_VALUE_INIT;
static gboolean answered = FALSE;
static gboolean answer = FALSE;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_block_by_func (object, G_CALLBACK (ipv4_addresses_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* If method != manual, remove addresses (save them for restoring them later when method becomes 'manual' */
if (g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
if (nm_setting_ip_config_get_num_addresses (NM_SETTING_IP_CONFIG (object))) {
if (!answered) {
answered = TRUE;
answer = get_answer ("ipv4.addresses", NULL);
}
if (answer) {
if (G_IS_VALUE (&value))
g_value_unset (&value);
nmc_property_get_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value);
g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, NULL, NULL);
}
}
} else {
answered = FALSE;
if (G_IS_VALUE (&value)) {
nmc_property_set_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value);
g_value_unset (&value);
}
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_unblock_by_func (object, G_CALLBACK (ipv4_addresses_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
ipv6_addresses_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static gboolean answered = FALSE;
static gboolean answer = FALSE;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_block_by_func (object, G_CALLBACK (ipv6_method_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* If we have some IP addresses set method to 'manual'.
* Else if the method was 'manual', change it back to 'auto'.
*/
if (nm_setting_ip_config_get_num_addresses (NM_SETTING_IP_CONFIG (object))) {
if (g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
if (!answered) {
answered = TRUE;
answer = get_answer ("ipv6.method", "manual");
}
if (answer)
g_object_set (object, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL, NULL);
}
} else {
answered = FALSE;
if (!g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP6_CONFIG_METHOD_MANUAL))
g_object_set (object, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_unblock_by_func (object, G_CALLBACK (ipv6_method_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
ipv6_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static GValue value = G_VALUE_INIT;
static gboolean answered = FALSE;
static gboolean answer = FALSE;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_block_by_func (object, G_CALLBACK (ipv6_addresses_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/* If method != manual, remove addresses (save them for restoring them later when method becomes 'manual' */
if (g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
if (nm_setting_ip_config_get_num_addresses (NM_SETTING_IP_CONFIG (object))) {
if (!answered) {
answered = TRUE;
answer = get_answer ("ipv6.addresses", NULL);
}
if (answer) {
if (G_IS_VALUE (&value))
g_value_unset (&value);
nmc_property_get_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value);
g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, NULL, NULL);
}
}
} else {
answered = FALSE;
if (G_IS_VALUE (&value)) {
nmc_property_set_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value);
g_value_unset (&value);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_handlers_unblock_by_func (object, G_CALLBACK (ipv6_addresses_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
proxy_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingProxyMethod method;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
method = nm_setting_proxy_get_method (NM_SETTING_PROXY (object));
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (method == NM_SETTING_PROXY_METHOD_NONE) {
g_object_set (object,
NM_SETTING_PROXY_PAC_URL, NULL,
NM_SETTING_PROXY_PAC_SCRIPT, NULL,
NULL);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
wireless_band_channel_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
const char *value = NULL, *mode;
char str[16];
NMSettingWireless *s_wireless = NM_SETTING_WIRELESS (object);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (strcmp (g_param_spec_get_name (pspec), NM_SETTING_WIRELESS_BAND) == 0) {
value = nm_setting_wireless_get_band (s_wireless);
if (!value)
return;
} else {
guint32 channel = nm_setting_wireless_get_channel (s_wireless);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (channel == 0)
return;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_snprintf (str, sizeof (str), "%d", nm_setting_wireless_get_channel (s_wireless));
value = str;
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
mode = nm_setting_wireless_get_mode (NM_SETTING_WIRELESS (object));
if (!mode || !*mode || strcmp (mode, NM_SETTING_WIRELESS_MODE_INFRA) == 0) {
g_print (_("Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n"),
nm_setting_get_name (NM_SETTING (s_wireless)), g_param_spec_get_name (pspec),
value);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
static void
connection_master_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
NMSettingConnection *s_con = NM_SETTING_CONNECTION (object);
NMConnection *connection = NM_CONNECTION (user_data);
NMSetting *s_ipv4, *s_ipv6;
const char *value, *tmp_str;
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
value = nm_setting_connection_get_master (s_con);
if (value) {
s_ipv4 = nm_connection_get_setting_by_name (connection, NM_SETTING_IP4_CONFIG_SETTING_NAME);
s_ipv6 = nm_connection_get_setting_by_name (connection, NM_SETTING_IP6_CONFIG_SETTING_NAME);
if (s_ipv4 || s_ipv6) {
g_print (_("Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n"),
nm_setting_get_name (NM_SETTING (s_con)), g_param_spec_get_name (pspec));
tmp_str = nmc_get_user_input (_("Do you want to remove them? [yes] "));
cli: make match() return boolean Coccinelle semantic patch: @@ @@ -int +gboolean matches (...); @@ expression pattern, cmd, len; @@ -int +gboolean matches (...) { ... - return memcmp (pattern, cmd, len); + return memcmp (pattern, cmd, len) == 0; } @@ expression prefix, str; @@ ( -matches (prefix, str) != 0 +!matches (prefix, str) | -matches (prefix, str) == 0 +matches (prefix, str) ) @@ expression prefix, str; @@ -(matches (prefix, str)) +matches (prefix, str) @@ expression prefix, str; @@ -(!matches (prefix, str)) +!matches (prefix, str) spatch --smpl-spacing --sp-file match.cocci --dir clients/cli/ \ --include-headers --macro-file shared/nm-utils/gsystem-local-alloc.h
2017-02-15 12:20:55 +01:00
if (!tmp_str || matches (tmp_str, "yes")) {
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (s_ipv4)
nm_connection_remove_setting (connection, G_OBJECT_TYPE (s_ipv4));
if (s_ipv6)
nm_connection_remove_setting (connection, G_OBJECT_TYPE (s_ipv6));
}
}
}
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
void
nmc_setting_ip4_connect_handlers (NMSettingIPConfig *setting)
{
g_return_if_fail (NM_IS_SETTING_IP4_CONFIG (setting));
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_connect (setting, "notify::" NM_SETTING_IP_CONFIG_ADDRESSES,
G_CALLBACK (ipv4_addresses_changed_cb), NULL);
g_signal_connect (setting, "notify::" NM_SETTING_IP_CONFIG_METHOD,
G_CALLBACK (ipv4_method_changed_cb), NULL);
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
void
nmc_setting_ip6_connect_handlers (NMSettingIPConfig *setting)
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_if_fail (NM_IS_SETTING_IP6_CONFIG (setting));
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_connect (setting, "notify::" NM_SETTING_IP_CONFIG_ADDRESSES,
G_CALLBACK (ipv6_addresses_changed_cb), NULL);
g_signal_connect (setting, "notify::" NM_SETTING_IP_CONFIG_METHOD,
G_CALLBACK (ipv6_method_changed_cb), NULL);
}
cli: add support for DCB settings
2013-11-06 08:16:40 -06:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
void
nmc_setting_proxy_connect_handlers (NMSettingProxy *setting)
cli: add support for GSM setting device-id, sim-id, and sim-operator-id properties
2015-10-20 18:35:16 -05:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_if_fail (NM_IS_SETTING_PROXY (setting));
cli: add support for GSM setting device-id, sim-id, and sim-operator-id properties
2015-10-20 18:35:16 -05:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_connect (setting, "notify::" NM_SETTING_PROXY_METHOD,
G_CALLBACK (proxy_method_changed_cb), NULL);
}
cli: add support for GSM setting device-id, sim-id, and sim-operator-id properties
2015-10-20 18:35:16 -05:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
void
nmc_setting_wireless_connect_handlers (NMSettingWireless *setting)
{
g_return_if_fail (NM_IS_SETTING_WIRELESS (setting));
cli: add support for GSM setting device-id, sim-id, and sim-operator-id properties
2015-10-20 18:35:16 -05:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_connect (setting, "notify::" NM_SETTING_WIRELESS_BAND,
G_CALLBACK (wireless_band_channel_changed_cb), NULL);
g_signal_connect (setting, "notify::" NM_SETTING_WIRELESS_CHANNEL,
G_CALLBACK (wireless_band_channel_changed_cb), NULL);
cli: add support for GSM setting device-id, sim-id, and sim-operator-id properties
2015-10-20 18:35:16 -05:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
void
nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMConnection *connection)
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_if_fail (NM_IS_SETTING_CONNECTION (setting));
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_signal_connect (setting, "notify::" NM_SETTING_CONNECTION_MASTER,
G_CALLBACK (connection_master_changed_cb), connection);
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
}
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
/*
* Customize some properties of the setting so that the setting has sensible
* values.
*/
void
nmc_setting_custom_init (NMSetting *setting)
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
{
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
g_return_if_fail (NM_IS_SETTING (setting));
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
cli: move code around to group related functions - no functional change * all getter/setter/describe, ... functions grouped according to properties * sort the settings groups alphabetically (cherry picked from commit 418733f2c14e76d5977a185a7c514747320b8f02)
2017-01-21 00:17:03 +01:00
if (NM_IS_SETTING_VLAN (setting)) {
/* Set sensible initial VLAN values */
g_object_set (NM_SETTING_VLAN (setting),
NM_SETTING_VLAN_ID, 1,
NULL);
} else if (NM_IS_SETTING_INFINIBAND (setting)) {
/* Initialize 'transport-mode' so that 'infiniband' is valid */
g_object_set (NM_SETTING_INFINIBAND (setting),
NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram",
NULL);
} else if (NM_IS_SETTING_CDMA (setting)) {
/* Initialize 'number' so that 'cdma' is valid */
g_object_set (NM_SETTING_CDMA (setting),
NM_SETTING_CDMA_NUMBER, "#777",
NULL);
} else if (NM_IS_SETTING_GSM (setting)) {
/* Initialize 'number' so that 'gsm' is valid */
g_object_set (NM_SETTING_GSM (setting),
NM_SETTING_GSM_NUMBER, "*99#",
NULL);
} else if (NM_IS_SETTING_OLPC_MESH (setting)) {
g_object_set (NM_SETTING_OLPC_MESH (setting),
NM_SETTING_OLPC_MESH_CHANNEL, 1,
NULL);
} else if (NM_IS_SETTING_WIRELESS (setting)) {
/* For Wi-Fi set mode to "infrastructure". Even though mode == NULL
* is regarded as "infrastructure", explicit value makes no doubts.
*/
g_object_set (NM_SETTING_WIRELESS (setting),
NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA,
NULL);
} else if (NM_IS_SETTING_ADSL (setting)) {
/* Initialize a protocol */
g_object_set (NM_SETTING_ADSL (setting),
NM_SETTING_ADSL_PROTOCOL, NM_SETTING_ADSL_PROTOCOL_PPPOE,
NULL);
} else if (NM_IS_SETTING_IP4_CONFIG (setting)) {
g_object_set (NM_SETTING_IP_CONFIG (setting),
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NULL);
} else if (NM_IS_SETTING_IP6_CONFIG (setting)) {
g_object_set (NM_SETTING_IP_CONFIG (setting),
NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO,
NULL);
} else if (NM_IS_SETTING_PROXY (setting)) {
g_object_set (NM_SETTING_PROXY (setting),
NM_SETTING_PROXY_METHOD, (int) NM_SETTING_PROXY_METHOD_NONE,
NULL);
} else if (NM_IS_SETTING_TUN (setting)) {
g_object_set (NM_SETTING_TUN (setting),
NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN,
NULL);
} else if (NM_IS_SETTING_BLUETOOTH (setting)) {
g_object_set (NM_SETTING_BLUETOOTH (setting),
NM_SETTING_BLUETOOTH_TYPE, NM_SETTING_BLUETOOTH_TYPE_PANU,
NULL);
cli: add support for tun settings Add nmcli support for adding and modifying TUN/TAP connections.
2015-09-01 15:14:03 +02:00
}
}
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
/*****************************************************************************/
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
static char *
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
get_property_val (NMSetting *setting, const char *prop, NmcPropertyGetType get_type, gboolean show_secrets, GError **error)
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
{
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
* For the moment, skip it from get_property_val(). */
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
} else if (property_info->property_type->get_fcn) {
return property_info->property_type->get_fcn (setting_info,
property_info,
setting,
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
get_type,
show_secrets);
cli: implement property getter for "connection" setting via nmc_setting_info
2017-03-25 12:56:10 +01:00
}
}
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
g_set_error_literal (error, 1, 0, _("don't know how to get the property value"));
return NULL;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
/*
* Generic function for getting property value.
*
* Gets property value as a string by calling specialized functions.
*
* Returns: current property value. The caller must free the returned string.
*/
char *
nmc_setting_get_property (NMSetting *setting, const char *prop, GError **error)
{
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
return get_property_val (setting, prop, NMC_PROPERTY_GET_PRETTY, TRUE, error);
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
/*
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
* Similar to nmc_setting_get_property(), but returns the property in a string
* format that can be parsed via nmc_setting_set_property().
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
*/
char *
cli: refactor property to string conversion Instead of having a get_func() and out2in_func(), have only one get_func() that accepts an argument of the output format. This way, a conversion to parsable input format, doesn't have to go first thourgh get_func() and mangle the pretty string in out2in_func(). This fixes conversions via nmc_property_out2in_cut_paren(). For example, nmc_property_802_1X_get_private_key_password_flags() would return a localized string _("0 (none)"). There is no guarantee that out2in_func() would find the expected output format after localizing. This also fixes nmc_property_out2in_routes() which expected a format "dst =" (would be "ip =") and expects mandatory 'nh' and 'mt' arguments. In fact, the regex didn't match and nmc_property_out2in_routes() always failed. While at it, also combine the implementation of nmc_property_ipv4_get_routes() and nmc_property_ipv6_get_routes().
2015-05-21 13:00:40 +02:00
nmc_setting_get_property_parsable (NMSetting *setting, const char *prop, GError **error)
cli: editor 'change' command: output -> input format conversion (rh #998929) The format of property values that nmcli prints is not the same (for some properties) as the format nmcli editor accepts as input from user. The reasons are that (a) output format is more descriptive and not much suitable to be typed, (b) it comes in most cases from libnm-util. 'change' command displays current property value and allows users to edit it. So we convert the output into input format, before presenting it to the user. https://bugzilla.redhat.com/show_bug.cgi?id=998929
2013-09-11 17:32:00 +02:00
{
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
return get_property_val (setting, prop, NMC_PROPERTY_GET_PARSABLE, TRUE, error);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
/*
* Generic function for setting property value.
*
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
* Sets property=value in setting by calling specialized functions.
* If value is NULL then default property value is set.
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
*
* Returns: TRUE on success; FALSE on failure and sets error
*/
gboolean
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
nmc_setting_set_property (NMSetting *setting, const char *prop, const char *value, GError **error)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
{
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
if (!value) {
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
/* No value argument sets default value */
nmc_property_set_default_value (setting, prop);
return TRUE;
}
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
* For the moment, skip it from get_property_val(). */
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
} else if (property_info->property_type->set_fcn) {
return property_info->property_type->set_fcn (setting_info,
property_info,
setting,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
value,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
error);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
}
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_set_error_literal (error, 1, 0, _("the property can't be changed"));
return FALSE;
}
void
nmc_property_set_default_value (NMSetting *setting, const char *prop)
{
GValue value = G_VALUE_INIT;
GParamSpec *param_spec;
param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
if (param_spec) {
g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (param_spec));
g_param_value_set_default (param_spec, &value);
g_object_set_property (G_OBJECT (setting), prop, &value);
}
}
cli: deny removing values of nmcli-unchangable properties nmc_setting_reset_property() function checks whether we allow changing the property (set_func != NULL) and if so, the property value is reset to default.
2013-09-06 14:56:41 +02:00
/*
* Generic function for reseting (single value) properties.
*
* The function resets the property value to the default one. It respects
* nmcli restrictions for changing properties. So if 'set_func' is NULL,
* reseting the value is denied.
*
* Returns: TRUE on success; FALSE on failure and sets error
*/
gboolean
nmc_setting_reset_property (NMSetting *setting, const char *prop, GError **error)
{
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: deny removing values of nmcli-unchangable properties nmc_setting_reset_property() function checks whether we allow changing the property (set_func != NULL) and if so, the property value is reset to default.
2013-09-06 14:56:41 +02:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
* For the moment, skip it from get_property_val(). */
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
} else if (property_info->property_type->set_fcn) {
cli: add set_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
nmc_property_set_default_value (setting, prop);
return TRUE;
}
}
cli: deny removing values of nmcli-unchangable properties nmc_setting_reset_property() function checks whether we allow changing the property (set_func != NULL) and if so, the property value is reset to default.
2013-09-06 14:56:41 +02:00
g_set_error_literal (error, 1, 0, _("the property can't be changed"));
return FALSE;
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
/*
* Generic function for removing items for collection-type properties.
*
* If 'option' is not NULL, it tries to remove it, otherwise 'idx' is used.
* For single-value properties (not having specialized remove function) this
* function does nothing and just returns TRUE.
*
* Returns: TRUE on success; FALSE on failure and sets error
*/
gboolean
nmc_setting_remove_property_option (NMSetting *setting,
const char *prop,
const char *option,
guint32 idx,
GError **error)
{
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
* For the moment, skip it from get_property_val(). */
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
} else if (property_info->property_type->remove_fcn) {
return property_info->property_type->remove_fcn (setting_info,
property_info,
setting,
option,
idx,
error);
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
}
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return TRUE;
}
/*
* Get valid property names for a setting.
*
* Returns: string array with the properties or NULL on failure.
* The returned value should be freed with g_strfreev()
*/
char **
nmc_setting_get_valid_properties (NMSetting *setting)
{
char **valid_props = NULL;
GParamSpec **props, **iter;
guint num;
int i;
/* Iterate through properties */
i = 0;
props = g_object_class_list_properties (G_OBJECT_GET_CLASS (G_OBJECT (setting)), &num);
valid_props = g_malloc0 (sizeof (char*) * (num + 1));
for (iter = props; iter && *iter; iter++) {
const char *key_name = g_param_spec_get_name (*iter);
/* Add all properties except for "name" that is non-editable */
if (g_strcmp0 (key_name, "name") != 0)
valid_props[i++] = g_strdup (key_name);
}
valid_props[i] = NULL;
cli: fix memleak in nmc_setting_get_valid_properties()
2015-02-08 13:28:18 +01:00
g_free (props);
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return valid_props;
}
/*
* Return allowed values for 'prop' as a string.
*/
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const char *const*
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop)
{
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
* For the moment, skip it from get_property_val(). */
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
} else if (property_info->property_type->values_fcn) {
return property_info->property_type->values_fcn (setting_info,
property_info);
} else if (property_info->property_typ_data && property_info->property_typ_data->values_static)
return property_info->property_typ_data->values_static;
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
}
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
return NULL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
#include "settings-docs.c"
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
/*
* Create a description string for a property.
*
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
* It returns a description got from property documentation, concatenated with
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
* nmcli specific description (if it exists).
*
* Returns: property description or NULL on failure. The caller must free the string.
*/
char *
nmc_setting_get_property_desc (NMSetting *setting, const char *prop)
{
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
const char *setting_desc = NULL;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
const char *setting_desc_title = "";
const char *nmcli_desc = NULL;
const char *nmcli_desc_title = "";
const char *nmcli_nl = "";
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
const NmcSettingInfo *setting_info;
const NmcPropertyInfo *property_info;
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
setting_desc = nmc_setting_get_property_doc (setting, prop);
if (setting_desc)
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
setting_desc_title = _("[NM property description]");
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
if ((property_info = _meta_find_property_info_by_setting (setting, prop, &setting_info))) {
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
if (property_info->is_name) {
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/* Traditionally, the "name" property was not handled here.
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
* For the moment, skip it from get_property_val(). */
} else if (property_info->describe_message) {
nmcli_desc = _(property_info->describe_message);
nmcli_desc_title = _("[nmcli specific description]");
nmcli_nl = "\n";
}
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
}
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
return g_strdup_printf ("%s\n%s\n%s%s%s%s",
cli: generate setting docs from libnm-util/nm-setting-docs.xml nmcli used the GParamSpec doc strings to get property descriptions, but they will be going away. Generate a .c file from the new XML setting docs file, and link that into nmcli.
2014-05-30 16:45:02 -04:00
setting_desc_title,
setting_desc ? setting_desc : "",
cli: 'connection edit' - edit/add connections in an interactive editor nmcli connection edit [type <type>] [con-name <name>] Examples: nmcli c e nmcli c e type ethernet nmcli c e type wifi con-name "My home Wi-Fi" nmcli c e type bond ...
2013-01-18 15:21:00 +01:00
nmcli_nl, nmcli_desc_title, nmcli_nl,
nmcli_desc ? nmcli_desc : "");
}
cli: nmc_property_get_gvalue() nmc_property_set_gvalue() Functions to - get property value and return it in GValue - set property value from GValue
2013-03-20 10:21:19 +01:00
/*
* Gets setting:prop property value and returns it in 'value'.
* Caller is responsible for freeing the GValue resources using g_value_unset()
*/
gboolean
nmc_property_get_gvalue (NMSetting *setting, const char *prop, GValue *value)
{
GParamSpec *param_spec;
param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
if (param_spec) {
memset (value, 0, sizeof (GValue));
g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (param_spec));
g_object_get_property (G_OBJECT (setting), prop, value);
return TRUE;
}
return FALSE;
}
/*
* Sets setting:prop property value from 'value'.
*/
gboolean
nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value)
{
GParamSpec *param_spec;
param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop);
if (param_spec && G_VALUE_TYPE (value) == G_PARAM_SPEC_VALUE_TYPE (param_spec)) {
g_object_set_property (G_OBJECT (setting), prop, value);
return TRUE;
}
return FALSE;
}
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
/*****************************************************************************/
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
cli: generate all-properties list from NmcSettingInfo It's redundant information that requires us to declare it in the static meta data. Generate it instead as needed.
2017-03-25 15:45:28 +01:00
static char *
_all_properties (const NmcSettingInfo *setting_info)
{
GString *str;
guint i;
str = g_string_sized_new (250);
for (i = 0; i < setting_info->properties_num; i++) {
if (str->len)
g_string_append_c (str, ',');
g_string_append (str, setting_info->properties[i].property_name);
}
return g_string_free (str, FALSE);
}
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
gboolean
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean show_secrets)
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
const NMMetaSettingInfo *meta_setting_info;
const NmcSettingInfo *setting_info;
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
gs_free NmcOutputField *tmpl = NULL;
NmcOutputField *arr;
guint i;
cli: adapt the code for the new flags and printing facilities The data are added to output_data at first, and then they are printed all at once using print_data(), that takes care of proper alignment and display. The static 'width' values defined in NmcOutputField columns are not used now, but dynamically computed maximal widths override them.
2013-05-22 08:37:50 +02:00
size_t tmpl_len;
cli: generate all-properties list from NmcSettingInfo It's redundant information that requires us to declare it in the static meta data. Generate it instead as needed.
2017-03-25 15:45:28 +01:00
gs_free char *s_all = NULL;
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
meta_setting_info = nm_meta_setting_infos_by_gtype (G_OBJECT_TYPE (setting));
g_return_val_if_fail (meta_setting_info, FALSE);
setting_info = &nmc_setting_infos[meta_setting_info->meta_type];
g_return_val_if_fail (setting_info, FALSE);
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (setting, setting_info->general->get_setting_gtype ()), FALSE);
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
tmpl_len = sizeof (NmcOutputField) * (setting_info->properties_num + 1);
tmpl = g_memdup (_get_nmc_output_fields (setting_info), tmpl_len);
cli: generate all-properties list from NmcSettingInfo It's redundant information that requires us to declare it in the static meta data. Generate it instead as needed.
2017-03-25 15:45:28 +01:00
nmc->print_fields.indices = parse_output_fields (one_prop ?: (s_all = _all_properties (setting_info)),
cli: allow '--field group.field' for nmcli con show conf <bla> That means you can display single property. Example: $ nmcli -f connection.id,802-3-ethernet.mtu s c my-eth-profile connection.id: my-eth-profile 802-3-ethernet.mtu: auto
2013-12-10 16:23:31 +01:00
tmpl, FALSE, NULL, NULL);
cli: adapt the code for the new flags and printing facilities The data are added to output_data at first, and then they are printed all at once using print_data(), that takes care of proper alignment and display. The static 'width' values defined in NmcOutputField columns are not used now, but dynamically computed maximal widths override them.
2013-05-22 08:37:50 +02:00
arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_FIELD_NAMES);
g_ptr_array_add (nmc->output_data, arr);
arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX);
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
for (i = 0; i < setting_info->properties_num; i++) {
const NmcPropertyInfo *property_info = &setting_info->properties[i];
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
if (!property_info->is_secret || show_secrets) {
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
set_val_str (arr, i, property_info->property_type->get_fcn (setting_info,
property_info,
setting,
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
NMC_PROPERTY_GET_PRETTY,
show_secrets));
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
} else
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
set_val_str (arr, i, g_strdup (_(HIDDEN_TEXT)));
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
}
cli: adapt the code for the new flags and printing facilities The data are added to output_data at first, and then they are printed all at once using print_data(), that takes care of proper alignment and display. The static 'width' values defined in NmcOutputField columns are not used now, but dynamically computed maximal widths override them.
2013-05-22 08:37:50 +02:00
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
return TRUE;
}
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/*****************************************************************************/
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define DEFINE_PROPERTY_TYPE(...) \
(&((NmcPropertyType) { __VA_ARGS__ } ))
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define DEFINE_PROPERTY_TYP_DATA(...) \
(&((NmcPropertyTypData) { __VA_ARGS__ } ))
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define DEFINE_PROPERTY_TYP_DATA_SUBTYPE(type, ...) \
DEFINE_PROPERTY_TYP_DATA ( \
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.subtype = { .type = { __VA_ARGS__ } } , \
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
)
cli: use own code to output connection details (settings) nmcli uses its own code to dump connections' details instead of libnm-util's nm_connection_dump(). It allows to structure output and present values of the settings according to nmcli needs.
2010-03-31 17:14:35 +02:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_name = {
.get_fcn = _get_fcn_name,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_readonly = {
.get_fcn = _get_fcn_gobject,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_string = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_string,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_bool = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_bool,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_int = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_int,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_int64 = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_int64,
};
cli: add 'infiniband' setting support
2011-12-09 13:20:36 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_uint = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_uint,
};
cli: add 'bond' setting
2012-03-05 07:32:21 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_mtu = {
.get_fcn = _get_fcn_gobject_mtu,
.set_fcn = _set_fcn_gobject_mtu,
};
cli: add 'bond' setting
2012-03-05 07:32:21 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_mac = {
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_gobject_mac,
};
cli: add 'bond' setting
2012-03-05 07:32:21 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyType _pt_gobject_secret_flags = {
.get_fcn = _get_fcn_gobject_secret_flags,
.set_fcn = _set_fcn_gobject_secret_flags,
};
cli: add 'bond' setting
2012-03-05 07:32:21 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
/*****************************************************************************/
cli: add 'bond' setting
2012-03-05 07:32:21 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define PROPERTY_INFO_NAME() \
{ \
.property_name = N_ ("name"), \
.is_name = TRUE, \
.property_type = &_pt_name, \
}
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define VALUES_STATIC(...) (((const char *[]) { __VA_ARGS__, NULL }))
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define GET_FCN_WITH_DEFAULT(type, func) \
/* macro that returns @func as const (gboolean(*)(NMSetting*)) type, but checks
* that the actual type is (gboolean(*)(type *)). */ \
((gboolean (*) (NMSetting *)) ((sizeof (func == ((gboolean (*) (type *)) func))) ? func : func) )
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define MTU_GET_FCN(type, func) \
/* macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
* that the actual type is (guint32(*)(type *)). */ \
((guint32 (*) (NMSetting *)) ((sizeof (func == ((guint32 (*) (type *)) func))) ? func : func) )
cli: add 'vlan' setting
2012-03-05 07:50:28 +01:00
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
#define TEAM_DESCRIBE_MESSAGE \
"nmcli can accepts both direct JSON configuration data and a file name containing " \
"the configuration. In the latter case the file is read and the contents is put " \
"into this property.\n\n" \
"Examples: set team.config " \
"{ \"device\": \"team0\", \"runner\": {\"name\": \"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" \
" set team.config /etc/my-team.conf\n"
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
static const NmcPropertyInfo properties_setting_802_1x[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_802_1X_EAP),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_gobject_string,
.remove_fcn = _remove_fcn_802_1x_eap,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("leap", "md5", "tls", "peap", "ttls", "sim", "fast", "pwd"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_IDENTITY),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_ANONYMOUS_IDENTITY),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PAC_FILE),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_CA_CERT),
.describe_message =
N_ ("Enter file path to CA certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
"Note that nmcli does not support specifying certificates as raw blob data.\n"
"Example: /home/cimrman/cacert.crt\n"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_ca_cert,
.set_fcn = _set_fcn_802_1x_ca_cert,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_CA_PATH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_SUBJECT_MATCH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_ALTSUBJECT_MATCHES),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_altsubject_matches,
.remove_fcn = _remove_fcn_802_1x_altsubject_matches,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_CLIENT_CERT),
.describe_message =
N_ ("Enter file path to client certificate (optionally prefixed with file://).\n"
" [file://]<file path>\n"
"Note that nmcli does not support specifying certificates as raw blob data.\n"
"Example: /home/cimrman/jara.crt\n"),
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_client_cert,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_client_cert,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE1_PEAPVER),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("0", "1"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE1_PEAPLABEL),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("0", "1"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("0", "1", "2", "3"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE1_AUTH_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_phase1_auth_flags,
.set_fcn = _set_fcn_802_1x_phase1_auth_flags,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_AUTH),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("pap", "chap", "mschap", "mschapv2", "gtc", "otp", "md5", "tls"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_AUTHEAP),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("md5", "mschapv2", "otp", "gtc", "tls"),
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CA_CERT),
.describe_message =
N_ ("Enter file path to CA certificate for inner authentication (optionally prefixed\n"
"with file://).\n"
" [file://]<file path>\n"
"Note that nmcli does not support specifying certificates as raw blob data.\n"
"Example: /home/cimrman/ca-zweite-phase.crt\n"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_phase2_ca_cert,
.set_fcn = _set_fcn_802_1x_phase2_ca_cert,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CA_PATH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_phase2_altsubject_matches,
.remove_fcn = _remove_fcn_802_1x_phase2_altsubject_matches,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT),
.describe_message =
N_ ("Enter file path to client certificate for inner authentication (optionally prefixed\n"
"with file://).\n"
" [file://]<file path>\n"
"Note that nmcli does not support specifying certificates as raw blob data.\n"
"Example: /home/cimrman/jara-zweite-phase.crt\n"),
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_phase2_client_cert,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_phase2_client_cert,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PASSWORD_RAW),
.is_secret = TRUE,
.describe_message =
N_ ("Enter bytes as a list of hexadecimal values.\n"
"Two formats are accepted:\n"
"(a) a string of hexadecimal digits, where each two digits represent one byte\n"
"(b) space-separated list of bytes written as hexadecimal digits "
"(with optional 0x/0X prefix, and optional leading 0).\n\n"
"Examples: ab0455a6ea3a74C2\n"
" ab 4 55 0xa6 ea 3a 74 C2\n"),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_password_raw,
.set_fcn = _set_fcn_802_1x_password_raw,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PRIVATE_KEY),
.describe_message =
N_ ("Enter path to a private key and the key password (if not set yet):\n"
" [file://]<file path> [<password>]\n"
"Note that nmcli does not support specifying private key as raw blob data.\n"
"Example: /home/cimrman/jara-priv-key Dardanely\n"),
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_private_key,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_private_key,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY),
.describe_message =
N_ ("Enter path to a private key and the key password (if not set yet):\n"
" [file://]<file path> [<password>]\n"
"Note that nmcli does not support specifying private key as raw blob data.\n"
"Example: /home/cimrman/jara-priv-key Dardanely\n"),
cli: fix intermediate regression of hiding blobs data Restore previous behavior of hiding blobs for certain certificate properties.
2017-03-27 18:48:47 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_802_1x_phase2_private_key,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_802_1x_phase2_private_key,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_PIN),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_802_1X_PIN_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_802_1X_SYSTEM_CA_CERTS),
.property_type = &_pt_gobject_bool,
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_802_1X_AUTH_TIMEOUT),
.property_type = &_pt_gobject_int,
},
};
static const NmcPropertyInfo properties_setting_adsl[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_ADSL_USERNAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_ADSL_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_ADSL_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_ADSL_PROTOCOL),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_ADSL_PROTOCOL_PPPOA,
NM_SETTING_ADSL_PROTOCOL_PPPOE,
NM_SETTING_ADSL_PROTOCOL_IPOATM),
),
},
{
.property_name = N_ (NM_SETTING_ADSL_ENCAPSULATION),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_ADSL_ENCAPSULATION_VCMUX,
NM_SETTING_ADSL_ENCAPSULATION_LLC),
),
},
{
.property_name = N_ (NM_SETTING_ADSL_VPI),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_ADSL_VCI),
.property_type = &_pt_gobject_uint,
},
};
static const NmcPropertyInfo properties_setting_bluetooth[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_BLUETOOTH_BDADDR),
.property_type = &_pt_gobject_mac,
},
{
.property_name = N_ (NM_SETTING_BLUETOOTH_TYPE),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_BLUETOOTH_TYPE_DUN,
NM_SETTING_BLUETOOTH_TYPE_PANU),
),
},
};
static const NmcPropertyInfo properties_setting_bond[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_BOND_OPTIONS),
.property_type = DEFINE_PROPERTY_TYPE (
.describe_fcn = _describe_fcn_bond_options,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_bond_options,
.set_fcn = _set_fcn_bond_options,
.remove_fcn = _remove_fcn_bond_options,
.values_fcn = _values_fcn_bond_options,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
static const NmcPropertyInfo properties_setting_bridge[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_BRIDGE_MAC_ADDRESS),
.property_type = &_pt_gobject_mac,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_STP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_PRIORITY),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_FORWARD_DELAY),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_HELLO_TIME),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_MAX_AGE),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_AGEING_TIME),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_MULTICAST_SNOOPING),
.property_type = &_pt_gobject_bool,
},
};
static const NmcPropertyInfo properties_setting_bridge_port[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_BRIDGE_PORT_PRIORITY),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_PORT_PATH_COST),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE),
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
},
};
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_cdma[] = {
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
PROPERTY_INFO_NAME(),
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_CDMA_NUMBER),
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
.property_type = &_pt_gobject_string,
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_CDMA_USERNAME),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_CDMA_PASSWORD),
.is_secret = TRUE,
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_CDMA_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_CDMA_MTU),
.property_type = &_pt_gobject_mtu,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingCdma, nm_setting_cdma_get_mtu),
),
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
},
};
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
static const NmcPropertyInfo properties_setting_connection[] = {
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
PROPERTY_INFO_NAME(),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
{
.property_name = N_ (NM_SETTING_CONNECTION_ID),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_UUID),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE ( .get_fcn = _get_fcn_gobject ),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_STABLE_ID),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_INTERFACE_NAME),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_gobject_ifname,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_TYPE),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_connection_type,
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_AUTOCONNECT),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_connection_autoconnect_retires,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.set_fcn = _set_fcn_gobject_int,
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_TIMESTAMP),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_readonly,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_READ_ONLY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_readonly,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_PERMISSIONS),
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
.describe_message =
N_ ("Enter a list of user permissions. This is a list of user names formatted as:\n"
" [user:]<user name 1>, [user:]<user name 2>,...\n"
"The items can be separated by commas or spaces.\n\n"
"Example: alice bob charlie\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_connection_permissions,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.set_fcn = _set_fcn_connection_permissions,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_connection_permissions,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_ZONE),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_MASTER),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_connection_master,
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_SLAVE_TYPE),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_BOND_SETTING_NAME,
NM_SETTING_BRIDGE_SETTING_NAME,
NM_SETTING_TEAM_SETTING_NAME),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_connection_autoconnect_slaves,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.set_fcn = _set_fcn_gobject_trilean,
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_SECONDARIES),
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
.describe_message =
N_ ("Enter secondary connections that should be activated when this connection is\n"
"activated. Connections can be specified either by UUID or ID (name). nmcli\n"
"transparently translates names to UUIDs. Note that NetworkManager only supports\n"
"VPNs as secondary connections at the moment.\n"
"The items can be separated by commas or spaces.\n\n"
"Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_connection_secondaries,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_connection_secondaries,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_uint,
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_METERED),
cli: add remove_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
.describe_message =
N_ ("Enter a value which indicates whether the connection is subject to a data\n"
"quota, usage costs or other limitations. Accepted options are:\n"
"'true','yes','on' to set the connection as metered\n"
"'false','no','off' to set the connection as not metered\n"
"'unknown' to let NetworkManager choose a value using some heuristics\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_connection_metered,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.set_fcn = _set_fcn_connection_metered,
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.values_static = VALUES_STATIC ("yes", "no", "unknown"),
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
{
.property_name = N_ (NM_SETTING_CONNECTION_LLDP),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_connection_lldp,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.set_fcn = _set_fcn_connection_lldp,
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.values_static = VALUES_STATIC ("default", "disable", "enable-rx"),
),
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
},
};
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_dcb[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_DCB_APP_FCOE_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_fcoe_flags,
.set_fcn = _set_fcn_dcb_flags,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_FCOE_PRIORITY),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_fcoe_priority,
.set_fcn = _set_fcn_dcb_priority,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_FCOE_MODE),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_DCB_FCOE_MODE_FABRIC,
NM_SETTING_DCB_FCOE_MODE_VN2VN),
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_ISCSI_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_iscsi_flags,
.set_fcn = _set_fcn_dcb_flags,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_ISCSI_PRIORITY),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_iscsi_priority,
.set_fcn = _set_fcn_dcb_priority,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_FIP_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_fip_flags,
.set_fcn = _set_fcn_dcb_flags,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_APP_FIP_PRIORITY),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_app_fip_priority,
.set_fcn = _set_fcn_dcb_priority,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_flow_control_flags,
.set_fcn = _set_fcn_dcb_flags,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_flow_control,
.set_fcn = _set_fcn_dcb_priority_flow_control,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_group_flags,
.set_fcn = _set_fcn_dcb_flags,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_GROUP_ID),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_group_id,
.set_fcn = _set_fcn_dcb_priority_group_id,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_group_bandwidth,
.set_fcn = _set_fcn_dcb_priority_group_bandwidth,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_BANDWIDTH),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_bandwidth,
.set_fcn = _set_fcn_dcb_priority_bandwidth,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_strict,
.set_fcn = _set_fcn_dcb_priority_strict,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_dcb_priority_traffic_class,
.set_fcn = _set_fcn_dcb_priority_traffic_class,
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
),
},
};
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_dummy[] = {
PROPERTY_INFO_NAME(),
};
static const NmcPropertyInfo properties_setting_gsm[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_GSM_NUMBER),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_USERNAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_GSM_APN),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_NETWORK_ID),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_PIN),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_PIN_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_GSM_HOME_ONLY),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_GSM_DEVICE_ID),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_SIM_ID),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_GSM_SIM_OPERATOR_ID),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_gsm_sim_operator_id,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_GSM_MTU),
.property_type = &_pt_gobject_mtu,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingGsm, nm_setting_gsm_get_mtu),
),
},
};
static const NmcPropertyInfo properties_setting_infiniband[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_INFINIBAND_MAC_ADDRESS),
.property_type = &_pt_gobject_mac,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
.mode = NMC_PROPERTY_TYPE_MAC_MODE_INFINIBAND,
),
},
{
.property_name = N_ (NM_SETTING_INFINIBAND_MTU),
.property_type = &_pt_gobject_mtu,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingInfiniband, nm_setting_infiniband_get_mtu),
),
},
{
.property_name = N_ (NM_SETTING_INFINIBAND_TRANSPORT_MODE),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("datagram", "connected"),
),
},
{
.property_name = N_ (NM_SETTING_INFINIBAND_P_KEY),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_infiniband_p_key,
.set_fcn = _set_fcn_infiniband_p_key,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_INFINIBAND_PARENT),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_gobject_ifname,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
static const NmcPropertyInfo properties_setting_ip4_config[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_IP_CONFIG_METHOD),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip4_config_method,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = ipv4_valid_methods,
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS),
.describe_message =
N_ ("Enter a list of IPv4 addresses of DNS servers.\n\n"
"Example: 8.8.8.8, 8.8.4.4\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip4_config_dns,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv4_config_dns,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip4_config_dns_search,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv4_config_dns_search,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_nmc_with_default,
.set_fcn = _set_fcn_ip4_config_dns_options,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv4_config_dns_options,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
.fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
.describe_message =
N_ ("Enter a list of IPv4 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
"Missing prefix is regarded as prefix of 32.\n\n"
"Example: 192.168.1.5/24, 10.0.0.11/24\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip_config_addresses,
.set_fcn = _set_fcn_ip4_config_addresses,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv4_config_addresses,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_GATEWAY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip4_config_gateway,
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ROUTES),
.describe_message =
N_ ("Enter a list of IPv4 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n\n"
"Missing prefix is regarded as a prefix of 32.\n"
"Missing next-hop is regarded as 0.0.0.0.\n"
"Missing metric means default (NM/kernel will set a default value).\n\n"
"Examples: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
" 10.1.2.0/24\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip_config_routes,
.set_fcn = _set_fcn_ip4_config_routes,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv4_config_routes,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int64,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DHCP_TIMEOUT),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP4_CONFIG_DHCP_FQDN),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_string,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DAD_TIMEOUT),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip4_config_dad_timeout,
.set_fcn = _set_fcn_gobject_int,
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
};
static const NmcPropertyInfo properties_setting_ip6_config[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_IP_CONFIG_METHOD),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip6_config_method,
),
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = ipv6_valid_methods,
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS),
.describe_message =
N_ ("Enter a list of IPv6 addresses of DNS servers. If the IPv6 "
"configuration method is 'auto' these DNS servers are appended "
"to those (if any) returned by automatic configuration. DNS "
"servers cannot be used with the 'shared' or 'link-local' IPv6 "
"configuration methods, as there is no upstream network. In "
"all other IPv6 configuration methods, these DNS "
"servers are used as the only DNS servers for this connection.\n\n"
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
"Example: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip6_config_dns,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv6_config_dns,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_SEARCH),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip6_config_dns_search,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv6_config_dns_search,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_OPTIONS),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_nmc_with_default,
.set_fcn = _set_fcn_ip6_config_dns_options,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv6_config_dns_options,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (get_with_default,
.fcn = GET_FCN_WITH_DEFAULT (NMSettingIPConfig, nm_setting_ip_config_has_dns_options),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DNS_PRIORITY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ADDRESSES),
.describe_message =
N_ ("Enter a list of IPv6 addresses formatted as:\n"
" ip[/prefix], ip[/prefix],...\n"
"Missing prefix is regarded as prefix of 128.\n\n"
"Example: 2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip_config_addresses,
.set_fcn = _set_fcn_ip6_config_addresses,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv6_config_addresses,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_GATEWAY),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_ip6_config_gateway,
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ROUTES),
.describe_message =
N_ ("Enter a list of IPv6 routes formatted as:\n"
" ip[/prefix] [next-hop] [metric],...\n\n"
"Missing prefix is regarded as a prefix of 128.\n"
"Missing next-hop is regarded as \"::\".\n"
"Missing metric means default (NM/kernel will set a default value).\n\n"
"Examples: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:beef::3 2\n"
" abbe::/64 55\n"),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip_config_routes,
.set_fcn = _set_fcn_ip6_config_routes,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.remove_fcn = _remove_fcn_ipv6_config_routes,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_ROUTE_METRIC),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_int64,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_NEVER_DEFAULT),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_MAY_FAIL),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_IP6_CONFIG_IP6_PRIVACY),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip6_config_ip6_privacy,
.set_fcn = _set_fcn_ip6_config_ip6_privacy,
),
},
{
.property_name = N_ (NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_ip6_config_addr_gen_mode,
.set_fcn = _set_fcn_ip6_config_addr_gen_mode,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_ip6_config_addr_gen_mode_get_type,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP6_CONFIG_TOKEN),
.property_type = &_pt_gobject_string,
},
};
static const NmcPropertyInfo properties_setting_ip_tunnel[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_MODE),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_ip_tunnel_mode,
.set_fcn = _set_fcn_ip_tunnel_mode,
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_ip_tunnel_mode_get_type,
.min = NM_IP_TUNNEL_MODE_UNKNOWN + 1,
.max = G_MAXINT,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_PARENT),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_LOCAL),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_REMOTE),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_TTL),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_TOS),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_INPUT_KEY),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_OUTPUT_KEY),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_FLOW_LABEL),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_IP_TUNNEL_MTU),
.property_type = &_pt_gobject_mtu,
},
};
static const NmcPropertyInfo properties_setting_macsec[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_MACSEC_PARENT),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_MACSEC_MODE),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_macsec_mode,
.set_fcn = _set_fcn_macsec_mode,
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_macsec_mode_get_type,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_MACSEC_ENCRYPT),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_MACSEC_MKA_CAK),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_MACSEC_MKA_CAK_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_MACSEC_MKA_CKN),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_MACSEC_PORT),
.property_type = &_pt_gobject_int,
},
{
.property_name = N_ (NM_SETTING_MACSEC_VALIDATION),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_macsec_validation,
.set_fcn = _set_fcn_macsec_validation,
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_macsec_validation_get_type,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
static const NmcPropertyInfo properties_setting_macvlan[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_MACVLAN_PARENT),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_MACVLAN_MODE),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_macvlan_mode,
.set_fcn = _set_fcn_macvlan_mode,
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_macvlan_mode_get_type,
.min = NM_SETTING_MACVLAN_MODE_UNKNOWN + 1,
.max = G_MAXINT,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_MACVLAN_PROMISCUOUS),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_MACVLAN_TAP),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = &_pt_gobject_bool,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
};
static const NmcPropertyInfo properties_setting_olpc_mesh[] = {
PROPERTY_INFO_NAME(),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_OLPC_MESH_SSID),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_olpc_mesh_ssid,
.set_fcn = _set_fcn_gobject_ssid,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_OLPC_MESH_CHANNEL),
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_olpc_mesh_channel,
cli: add NmcPropertyType structure We shall not only have a PropertyInfo. Most properties share common behavior, that is, they have a type. Move the function pointers to a NmcPropertyType structure, so that it can be reused for multiple properties. This promotes the idea that properties have a (limited) set of types with some type specific behaviors. Contrary, to having each property re-implement fully it's type. E.g. instead of having various property re-define their full behavior as an "bool", have one property type "bool" which can be attached to a property.
2017-03-26 09:57:02 +02:00
),
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
{
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_name = N_ (NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS),
.property_type = &_pt_gobject_mac,
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
},
};
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_pppoe[] = {
PROPERTY_INFO_NAME (),
{
.property_name = N_ (NM_SETTING_PPPOE_SERVICE),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_PPPOE_USERNAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_PPPOE_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_PPPOE_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
};
cli: add property-info for NMSettingPpp
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_ppp[] = {
PROPERTY_INFO_NAME (),
{
.property_name = N_ (NM_SETTING_PPP_NOAUTH),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REFUSE_EAP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REFUSE_PAP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REFUSE_CHAP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REFUSE_MSCHAP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REFUSE_MSCHAPV2),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_NOBSDCOMP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_NODEFLATE),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_NO_VJ_COMP),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REQUIRE_MPPE),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_REQUIRE_MPPE_128),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_MPPE_STATEFUL),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_CRTSCTS),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_PPP_BAUD),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_PPP_MRU),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_PPP_MTU),
.property_type = &_pt_gobject_mtu,
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingPpp, nm_setting_ppp_get_mtu),
),
cli: add property-info for NMSettingPpp
2017-03-26 14:30:17 +02:00
},
{
.property_name = N_ (NM_SETTING_PPP_LCP_ECHO_FAILURE),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_PPP_LCP_ECHO_INTERVAL),
.property_type = &_pt_gobject_uint,
},
};
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
static const NmcPropertyInfo properties_setting_proxy[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_PROXY_METHOD),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_proxy_method,
.set_fcn = _set_fcn_proxy_method,
.values_fcn = _values_fcn_gobject_enum,
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_enum,
.get_gtype = nm_setting_proxy_method_get_type,
.min = NM_SETTING_PROXY_METHOD_NONE,
.max = G_MAXINT,
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
),
},
{
.property_name = N_ (NM_SETTING_PROXY_BROWSER_ONLY),
.property_type = &_pt_gobject_bool
},
{
.property_name = N_ (NM_SETTING_PROXY_PAC_URL),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_PROXY_PAC_SCRIPT),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_proxy_pac_script,
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
),
},
};
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_team[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_TEAM_CONFIG),
.describe_message = N_ (TEAM_DESCRIBE_MESSAGE),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_team_config,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
static const NmcPropertyInfo properties_setting_team_port[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_TEAM_PORT_CONFIG),
.describe_message = N_ (TEAM_DESCRIBE_MESSAGE),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_team_config,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
static const NmcPropertyInfo properties_setting_tun[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_TUN_MODE),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_tun_mode,
.set_fcn = _set_fcn_tun_mode,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("tun", "tap", "unknown"),
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_TUN_OWNER),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_TUN_GROUP),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_TUN_PI),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_TUN_VNET_HDR),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_TUN_MULTI_QUEUE),
.property_type = &_pt_gobject_bool,
},
};
static const NmcPropertyInfo properties_setting_serial[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_SERIAL_BAUD),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_SERIAL_BITS),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_SERIAL_PARITY),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_serial_parity,
.set_fcn = _set_fcn_serial_parity,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_SERIAL_STOPBITS),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_SERIAL_SEND_DELAY),
.property_type = &_pt_gobject_uint,
},
};
static const NmcPropertyInfo properties_setting_vlan[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_VLAN_PARENT),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_VLAN_ID),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VLAN_FLAGS),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_vlan_flags,
.set_fcn = _set_fcn_gobject_flags,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_vlan_ingress_priority_map,
.set_fcn = _set_fcn_vlan_ingress_priority_map,
.remove_fcn = _remove_fcn_vlan_ingress_priority_map,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_vlan_egress_priority_map,
.set_fcn = _set_fcn_vlan_egress_priority_map,
.remove_fcn = _remove_fcn_vlan_egress_priority_map,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
};
static const NmcPropertyInfo properties_setting_vpn[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_VPN_SERVICE_TYPE),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_vpn_service_type,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_VPN_USER_NAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_VPN_DATA),
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_vpn_data,
.set_fcn = _set_fcn_vpn_data,
.remove_fcn = _remove_fcn_vpn_data,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_VPN_SECRETS),
.is_secret = TRUE,
.property_type = DEFINE_PROPERTY_TYPE (
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.get_fcn = _get_fcn_vpn_secrets,
.set_fcn = _set_fcn_vpn_secrets,
.remove_fcn = _remove_fcn_vpn_secrets,
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_VPN_PERSISTENT),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_VPN_TIMEOUT),
.property_type = &_pt_gobject_uint,
},
};
static const NmcPropertyInfo properties_setting_vxlan[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_VXLAN_PARENT),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_VXLAN_ID),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_LOCAL),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_VXLAN_REMOTE),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_VXLAN_SOURCE_PORT_MIN),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_SOURCE_PORT_MAX),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_DESTINATION_PORT),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_TOS),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_TTL),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_AGEING),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_LIMIT),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_VXLAN_LEARNING),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_VXLAN_PROXY),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_VXLAN_RSC),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_VXLAN_L2_MISS),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_VXLAN_L3_MISS),
.property_type = &_pt_gobject_bool,
},
};
cli: add property-info for NMSettingWimax
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_wimax[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_WIMAX_MAC_ADDRESS),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_WIMAX_NETWORK_NAME),
.property_type = &_pt_gobject_mac,
},
};
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_wired[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_WIRED_PORT),
/* Do not allow setting 'port' for now. It is not implemented in
* NM core, nor in ifcfg-rh plugin. Enable this when it gets done.
* wired_valid_ports[] = { "tp", "aui", "bnc", "mii", NULL };
*/
.property_type = &_pt_gobject_readonly,
},
{
.property_name = N_ (NM_SETTING_WIRED_SPEED),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_WIRED_DUPLEX),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("half", "full"),
),
},
{
.property_name = N_ (NM_SETTING_WIRED_AUTO_NEGOTIATE),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_WIRED_MAC_ADDRESS),
.property_type = &_pt_gobject_mac,
},
{
.property_name = N_ (NM_SETTING_WIRED_CLONED_MAC_ADDRESS),
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_type = &_pt_gobject_mac,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
.mode = NMC_PROPERTY_TYPE_MAC_MODE_CLONED,
),
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
},
{
.property_name = N_ (NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wired_mac_address_blacklist,
.remove_fcn = _remove_fcn_wired_mac_address_blacklist,
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRED_MTU),
.property_type = &_pt_gobject_mtu,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingWired, nm_setting_wired_get_mtu),
),
},
{
.property_name = N_ (NM_SETTING_WIRED_S390_SUBCHANNELS),
.describe_message =
N_ ("Enter a list of subchannels (comma or space separated).\n\n"
"Example: 0.0.0e20 0.0.0e21 0.0.0e22\n"),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wired_s390_subchannels,
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRED_S390_NETTYPE),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("qeth", "lcs", "ctc"),
),
},
{
.property_name = N_ (NM_SETTING_WIRED_S390_OPTIONS),
.property_type = DEFINE_PROPERTY_TYPE (
.describe_fcn = _describe_fcn_wired_s390_options,
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wired_s390_options,
.remove_fcn = _remove_fcn_wired_s390_options,
.values_fcn = _values_fcn__wired_s390_options,
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRED_WAKE_ON_LAN),
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wired_wake_on_lan,
.set_fcn = _set_fcn_wired_wake_on_lan,
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD),
.property_type = &_pt_gobject_mac,
},
};
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
static const NmcPropertyInfo properties_setting_wireless[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_WIRELESS_SSID),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_ssid,
.set_fcn = _set_fcn_gobject_ssid,
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_MODE),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC (NM_SETTING_WIRELESS_MODE_INFRA,
NM_SETTING_WIRELESS_MODE_ADHOC,
NM_SETTING_WIRELESS_MODE_AP),
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_BAND),
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("a", "bg"),
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_CHANNEL),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_channel,
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_BSSID),
.property_type = &_pt_gobject_mac,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_RATE),
/* Do not allow setting 'rate'. It is not implemented in NM core. */
.property_type = &_pt_gobject_readonly,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_TX_POWER),
/* Do not allow setting 'tx-power'. It is not implemented in NM core. */
.property_type = &_pt_gobject_readonly,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_MAC_ADDRESS),
.property_type = &_pt_gobject_mac,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS),
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.property_type = &_pt_gobject_mac,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mac,
.mode = NMC_PROPERTY_TYPE_MAC_MODE_CLONED,
),
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
},
{
.property_name = N_ (NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_mac_address_blacklist,
.remove_fcn = _remove_fcn_wireless_mac_address_blacklist,
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_mac_address_randomization,
.set_fcn = _set_fcn_wireless_mac_address_randomization,
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_MTU),
.property_type = &_pt_gobject_mtu,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (mtu,
.get_fcn = MTU_GET_FCN (NMSettingWireless, nm_setting_wireless_get_mtu),
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SEEN_BSSIDS),
.property_type = &_pt_gobject_readonly,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_HIDDEN),
.property_type = &_pt_gobject_bool,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_POWERSAVE),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_powersave,
.set_fcn = _set_fcn_wireless_powersave,
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
),
},
};
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
static const NmcPropertyInfo properties_setting_wireless_security[] = {
PROPERTY_INFO_NAME(),
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("none", "ieee8021x", "wpa-none", "wpa-psk", "wpa-eap"),
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX),
.property_type = &_pt_gobject_uint,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG),
cli: let string property-type handle checking values
2017-03-26 18:51:45 +02:00
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
.values_static = VALUES_STATIC ("open", "shared", "leap"),
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_PROTO),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_security_proto,
.remove_fcn = _remove_fcn_wireless_security_proto,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
.values_static = wifi_sec_valid_protos,
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_PAIRWISE),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_security_pairwise,
.remove_fcn = _remove_fcn_wireless_security_pairwise,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
.values_static = wifi_sec_valid_pairwises,
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_GROUP),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_security_group,
.remove_fcn = _remove_fcn_wireless_security_group,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_typ_data = DEFINE_PROPERTY_TYP_DATA (
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
.values_static = wifi_sec_valid_groups,
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME),
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0),
.is_secret = TRUE,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_security_wep_key0,
.set_fcn = _set_fcn_wireless_wep_key,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1),
.is_secret = TRUE,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_security_wep_key1,
.set_fcn = _set_fcn_wireless_wep_key,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2),
.is_secret = TRUE,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_security_wep_key2,
.set_fcn = _set_fcn_wireless_wep_key,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3),
.is_secret = TRUE,
cli: refactor indirection to legacy signatures (2)
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_security_wep_key3,
.set_fcn = _set_fcn_wireless_wep_key,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE),
.describe_message =
N_ ("Enter the type of WEP keys. The accepted values are: "
"0 or unknown, 1 or key, and 2 or passphrase.\n"),
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_wireless_security_wep_key_type,
.set_fcn = _set_fcn_wireless_security_wep_key_type,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_PSK),
.is_secret = TRUE,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
cli: refactor indirection to legacy signatures
2017-03-27 17:38:27 +02:00
.set_fcn = _set_fcn_wireless_security_psk,
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
),
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD),
.is_secret = TRUE,
.property_type = &_pt_gobject_string,
},
{
.property_name = N_ (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS),
.property_type = &_pt_gobject_secret_flags,
},
};
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
const NmcSettingInfo nmc_setting_infos[_NM_META_SETTING_TYPE_NUM] = {
[NM_META_SETTING_TYPE_802_1X] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_802_1X],
cli: add property-info for NMSetting8021x
2017-03-26 15:14:08 +02:00
.properties = properties_setting_802_1x,
.properties_num = G_N_ELEMENTS (properties_setting_802_1x),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_ADSL] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_ADSL],
cli: add property-info for NMSettingAdsl
2017-03-26 14:30:17 +02:00
.properties = properties_setting_adsl,
.properties_num = G_N_ELEMENTS (properties_setting_adsl),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_BLUETOOTH] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BLUETOOTH],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_bluetooth,
.properties_num = G_N_ELEMENTS (properties_setting_bluetooth),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_BOND] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BOND],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_bond,
.properties_num = G_N_ELEMENTS (properties_setting_bond),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_BRIDGE] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_bridge,
.properties_num = G_N_ELEMENTS (properties_setting_bridge),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_BRIDGE_PORT] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_BRIDGE_PORT],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_bridge_port,
.properties_num = G_N_ELEMENTS (properties_setting_bridge_port),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_CDMA] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CDMA],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_cdma,
.properties_num = G_N_ELEMENTS (properties_setting_cdma),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_CONNECTION] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_CONNECTION],
cli: rework property handling via NmcPropertyInfo for NMSettingConnection Add an improved way of tracking meta data about settings. E.g. it is wrong to generate for each property a nmc_property_*_get_*() function. Instead, there should be a meta data about the property itself, and a mechanism to retrieve the property. For now, only do this for NMSettingConnection and keep all the existing infrastructure in place. Later on all settings shall be moved. Especially to accomodate NmcOutputField mangles the concept of setting-meta data, formatting options, and collecting output results. It's a total hack, that will be need fixing later.
2017-03-24 17:32:04 +01:00
.properties = properties_setting_connection,
.properties_num = G_N_ELEMENTS (properties_setting_connection),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_DCB] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DCB],
cli: add property-info for NMSettingDcb
2017-03-26 14:30:17 +02:00
.properties = properties_setting_dcb,
.properties_num = G_N_ELEMENTS (properties_setting_dcb),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
[NM_META_SETTING_TYPE_DUMMY] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_DUMMY],
.properties = properties_setting_dummy,
.properties_num = G_N_ELEMENTS (properties_setting_dummy),
},
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
[NM_META_SETTING_TYPE_GSM] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_GSM],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_gsm,
.properties_num = G_N_ELEMENTS (properties_setting_gsm),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_INFINIBAND] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_INFINIBAND],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_infiniband,
.properties_num = G_N_ELEMENTS (properties_setting_infiniband),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_IP4_CONFIG] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP4_CONFIG],
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
.properties = properties_setting_ip4_config,
.properties_num = G_N_ELEMENTS (properties_setting_ip4_config),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_IP6_CONFIG] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP6_CONFIG],
cli: add property-info for NMSettingIP4Config and NMSettingIP6Config
2017-03-25 15:52:03 +01:00
.properties = properties_setting_ip6_config,
.properties_num = G_N_ELEMENTS (properties_setting_ip6_config),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_IP_TUNNEL] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_IP_TUNNEL],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_ip_tunnel,
.properties_num = G_N_ELEMENTS (properties_setting_ip_tunnel),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_MACSEC] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACSEC],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_macsec,
.properties_num = G_N_ELEMENTS (properties_setting_macsec),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_MACVLAN] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_MACVLAN],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_macvlan,
.properties_num = G_N_ELEMENTS (properties_setting_macvlan),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_OLPC_MESH] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_OLPC_MESH],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_olpc_mesh,
.properties_num = G_N_ELEMENTS (properties_setting_olpc_mesh),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_PPPOE] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPPOE],
cli: add property-info for NMSettingPppoe
2017-03-26 14:30:17 +02:00
.properties = properties_setting_pppoe,
.properties_num = G_N_ELEMENTS (properties_setting_pppoe),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_PPP] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PPP],
cli: add property-info for NMSettingPpp
2017-03-26 14:30:17 +02:00
.properties = properties_setting_ppp,
.properties_num = G_N_ELEMENTS (properties_setting_ppp),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_PROXY] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_PROXY],
cli: add property-info for NMSettingProxy
2017-03-25 15:52:03 +01:00
.properties = properties_setting_proxy,
.properties_num = G_N_ELEMENTS (properties_setting_proxy),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_SERIAL] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_SERIAL],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_serial,
.properties_num = G_N_ELEMENTS (properties_setting_serial),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_TEAM] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_team,
.properties_num = G_N_ELEMENTS (properties_setting_team),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_TEAM_PORT] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TEAM_PORT],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_team_port,
.properties_num = G_N_ELEMENTS (properties_setting_team_port),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_TUN] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_TUN],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_tun,
.properties_num = G_N_ELEMENTS (properties_setting_tun),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_VLAN] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VLAN],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_vlan,
.properties_num = G_N_ELEMENTS (properties_setting_vlan),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_VPN] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VPN],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_vpn,
.properties_num = G_N_ELEMENTS (properties_setting_vpn),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_VXLAN] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_VXLAN],
cli: add property-info for the rest
2017-03-26 14:30:17 +02:00
.properties = properties_setting_vxlan,
.properties_num = G_N_ELEMENTS (properties_setting_vxlan),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_WIMAX] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIMAX],
cli: add property-info for NMSettingWimax
2017-03-26 14:30:17 +02:00
.properties = properties_setting_wimax,
.properties_num = G_N_ELEMENTS (properties_setting_wimax),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_WIRED] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRED],
cli: add property-info for NMSettingWired
2017-03-26 14:30:17 +02:00
.properties = properties_setting_wired,
.properties_num = G_N_ELEMENTS (properties_setting_wired),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_WIRELESS] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS],
cli: add property-info for NMSettingWireless
2017-03-26 14:30:17 +02:00
.properties = properties_setting_wireless,
.properties_num = G_N_ELEMENTS (properties_setting_wireless),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
[NM_META_SETTING_TYPE_WIRELESS_SECURITY] = {
.general = &nm_meta_setting_infos[NM_META_SETTING_TYPE_WIRELESS_SECURITY],
cli: add property-info for NMSettingWirelessSecurity
2017-03-26 15:14:08 +02:00
.properties = properties_setting_wireless_security,
.properties_num = G_N_ELEMENTS (properties_setting_wireless_security),
cli: add setting-info structure to settings.c Will get more use soon.
2017-03-24 16:27:29 +01:00
},
cli: use a table for setting details functions It's a bit clearer to find the setting and add new ones.
2013-06-05 15:55:17 -05:00
};
Reference in a new issue Copy permalink