NetworkManager/src/nm-initrd-generator/nmi-cmdline-reader.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

1577 lines
54 KiB
C
Raw Normal View History

/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
2018-08-09 18:02:51 +02:00
* Copyright (C) 2018 Red Hat, Inc.
*/
#include "libnm-core-impl/nm-default-libnm-core.h"
2018-08-09 18:02:51 +02:00
#include <linux/if_ether.h>
#include <linux/if_infiniband.h>
#include "libnm-glib-aux/nm-uuid.h"
#include "libnm-log-core/nm-logging.h"
#include "libnm-core-intern/nm-core-internal.h"
2018-08-09 18:02:51 +02:00
#include "nm-initrd-generator.h"
#include "libnm-systemd-shared/nm-sd-utils-shared.h"
2018-08-09 18:02:51 +02:00
/*****************************************************************************/
#define _NMLOG(level, domain, ...) \
nm_log((level), \
(domain), \
NULL, \
NULL, \
"cmdline-reader: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__) \
_NM_UTILS_MACRO_REST(__VA_ARGS__))
/*****************************************************************************/
typedef struct {
GHashTable *hash;
GPtrArray *array;
GPtrArray *vlan_parents;
GHashTable *explicit_ip_connections;
NMConnection *bootdev_connection; /* connection for bootdev=$ifname */
NMConnection *default_connection; /* connection not bound to any ifname */
char *hostname;
GHashTable *znet_ifnames;
/* Parameters to be set for all connections */
gboolean ignore_auto_dns;
int dhcp_timeout;
char *dhcp4_vci;
gint64 carrier_timeout_sec;
} Reader;
static Reader *
reader_new(void)
{
Reader *reader;
reader = g_slice_new(Reader);
*reader = (Reader){
.hash = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, g_object_unref),
.explicit_ip_connections =
g_hash_table_new_full(nm_direct_hash, NULL, g_object_unref, NULL),
.vlan_parents = g_ptr_array_new_with_free_func(g_free),
.array = g_ptr_array_new(),
.znet_ifnames = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, g_free),
};
return reader;
}
static GHashTable *
reader_destroy(Reader *reader, gboolean free_hash)
{
gs_unref_hashtable GHashTable *hash = NULL;
g_ptr_array_unref(reader->array);
g_ptr_array_unref(reader->vlan_parents);
g_hash_table_unref(reader->explicit_ip_connections);
hash = g_steal_pointer(&reader->hash);
nm_clear_g_free(&reader->hostname);
g_hash_table_unref(reader->znet_ifnames);
nm_clear_g_free(&reader->dhcp4_vci);
nm_g_slice_free(reader);
if (!free_hash)
return g_steal_pointer(&hash);
return NULL;
}
static NMConnection *
reader_add_connection(Reader *reader, const char *name, NMConnection *connection_take)
{
char *name_dup;
name_dup = g_strdup(name);
if (g_hash_table_insert(reader->hash, name_dup, connection_take))
g_ptr_array_add(reader->array, name_dup);
return connection_take;
}
/* Returns a new connection owned by the reader */
static NMConnection *
reader_create_connection(Reader *reader,
const char *basename,
const char *id,
const char *ifname,
const char *mac,
const char *type_name,
NMConnectionMultiConnect multi_connect)
{
NMConnection *connection;
NMSetting *setting;
connection = reader_add_connection(reader, basename, nm_simple_connection_new());
/* Start off assuming dynamic IP configurations. */
setting = nm_setting_ip4_config_new();
nm_connection_add_setting(connection, setting);
g_object_set(setting,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NM_SETTING_IP_CONFIG_MAY_FAIL,
TRUE,
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS,
reader->ignore_auto_dns,
NM_SETTING_IP_CONFIG_DHCP_TIMEOUT,
reader->dhcp_timeout,
NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
reader->dhcp4_vci,
NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT,
NMI_IP_REQUIRED_TIMEOUT_MSEC,
NULL);
setting = nm_setting_ip6_config_new();
nm_connection_add_setting(connection, setting);
g_object_set(setting,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NM_SETTING_IP_CONFIG_MAY_FAIL,
TRUE,
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE,
(int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS,
reader->ignore_auto_dns,
NM_SETTING_IP_CONFIG_DHCP_TIMEOUT,
reader->dhcp_timeout,
NULL);
setting = nm_setting_connection_new();
nm_connection_add_setting(connection, setting);
g_object_set(setting,
NM_SETTING_CONNECTION_ID,
id,
NM_SETTING_CONNECTION_UUID,
nm_uuid_generate_random_str_a(),
NM_SETTING_CONNECTION_INTERFACE_NAME,
ifname,
NM_SETTING_CONNECTION_TYPE,
type_name,
NM_SETTING_CONNECTION_MULTI_CONNECT,
multi_connect,
NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES,
1,
NULL);
if (nm_streq0(type_name, NM_SETTING_INFINIBAND_SETTING_NAME)) {
setting = nm_setting_infiniband_new();
nm_connection_add_setting(connection, setting);
g_object_set(setting, NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram", NULL);
}
if (mac) {
if (nm_streq0(type_name, NM_SETTING_INFINIBAND_SETTING_NAME)) {
setting = (NMSetting *) nm_connection_get_setting_infiniband(connection);
g_object_set(setting, NM_SETTING_INFINIBAND_MAC_ADDRESS, mac, NULL);
} else {
setting = nm_setting_wired_new();
nm_connection_add_setting(connection, setting);
g_object_set(setting, NM_SETTING_WIRED_MAC_ADDRESS, mac, NULL);
}
}
return connection;
}
2018-08-09 18:02:51 +02:00
static NMConnection *
reader_get_default_connection(Reader *reader)
2018-08-09 18:02:51 +02:00
{
NMConnection *con;
if (!reader->default_connection) {
con = reader_create_connection(reader,
"default_connection",
"Wired Connection",
NULL,
NULL,
NM_SETTING_WIRED_SETTING_NAME,
NM_CONNECTION_MULTI_CONNECT_MULTIPLE);
nm_connection_add_setting(con, nm_setting_wired_new());
reader->default_connection = con;
}
return reader->default_connection;
}
2018-08-09 18:02:51 +02:00
static NMConnection *
reader_get_connection(Reader *reader,
const char *iface_spec,
const char *type_name,
gboolean create_if_missing)
{
NMConnection *connection = NULL;
NMSetting *setting;
const char *ifname = NULL;
gs_free char *mac = NULL;
if (iface_spec) {
if (nm_utils_is_valid_iface_name(iface_spec, NULL))
ifname = iface_spec;
else {
mac = nm_utils_hwaddr_canonical(iface_spec, -1);
if (!mac)
_LOGW(LOGD_CORE, "invalid interface '%s'", iface_spec);
}
}
if (!ifname && !mac) {
NMConnection *candidate;
NMSettingConnection *s_con;
guint i;
/*
* If ifname was not given, we'll match the connection by type.
* If the type was not given either, then we're happy with any connection but slaves.
* This is so that things like "bond=bond0:eth1,eth2 nameserver=1.3.3.7 end up
* slapping the nameserver to the most reasonable connection (bond0).
*/
for (i = 0; i < reader->array->len; i++) {
candidate = g_hash_table_lookup(reader->hash, reader->array->pdata[i]);
s_con = nm_connection_get_setting_connection(candidate);
if (type_name == NULL && nm_setting_connection_get_master(s_con) == NULL) {
connection = candidate;
break;
}
if (type_name != NULL
&& nm_streq(nm_setting_connection_get_connection_type(s_con), type_name)) {
connection = candidate;
break;
}
}
} else
connection = g_hash_table_lookup(reader->hash, (gpointer) ifname ?: mac);
if (!connection) {
if (!create_if_missing)
return NULL;
if (!type_name) {
if (NM_STR_HAS_PREFIX(ifname, "ib")
|| (mac && nm_utils_hwaddr_valid(mac, INFINIBAND_ALEN)))
type_name = NM_SETTING_INFINIBAND_SETTING_NAME;
else
type_name = NM_SETTING_WIRED_SETTING_NAME;
}
connection = reader_create_connection(reader,
ifname ?: mac,
ifname ?: (mac ?: "Wired Connection"),
ifname,
mac,
type_name,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
2018-08-09 18:02:51 +02:00
}
setting = (NMSetting *) nm_connection_get_setting_connection(connection);
2018-08-09 18:02:51 +02:00
if (type_name) {
g_object_set(setting, NM_SETTING_CONNECTION_TYPE, type_name, NULL);
if (!nm_connection_get_setting_by_name(connection, type_name)) {
setting = g_object_new(nm_setting_lookup_type(type_name), NULL);
nm_connection_add_setting(connection, setting);
}
}
2018-08-09 18:02:51 +02:00
return connection;
}
static char *
get_word(char **argument, const char separator)
{
char *word;
int nest = 0;
2018-08-09 18:02:51 +02:00
if (*argument == NULL)
return NULL;
2018-08-09 18:02:51 +02:00
if (**argument == '[') {
nest++;
(*argument)++;
}
2018-08-09 18:02:51 +02:00
word = *argument;
2018-08-09 18:02:51 +02:00
while (**argument != '\0') {
if (nest && **argument == ']') {
**argument = '\0';
(*argument)++;
nest--;
continue;
}
2018-08-09 18:02:51 +02:00
if (nest == 0 && **argument == separator) {
**argument = '\0';
(*argument)++;
break;
}
(*argument)++;
}
2018-08-09 18:02:51 +02:00
return *word ? word : NULL;
}
static void
connection_set(NMConnection *connection,
const char *setting_name,
const char *property,
const char *value)
2018-08-09 18:02:51 +02:00
{
NMSetting *setting;
GType setting_type;
nm_auto_unref_gtypeclass GObjectClass *object_class = NULL;
GParamSpec *spec;
setting_type = nm_setting_lookup_type(setting_name);
object_class = g_type_class_ref(setting_type);
spec = g_object_class_find_property(object_class, property);
nm_assert(spec);
setting = nm_connection_get_setting_by_name(connection, setting_name);
if (!setting) {
setting = g_object_new(setting_type, NULL);
nm_connection_add_setting(connection, setting);
2018-08-09 18:02:51 +02:00
}
if (G_IS_PARAM_SPEC_UINT(spec)) {
guint v;
v = _nm_utils_ascii_str_to_int64(value, 10, 0, G_MAXUINT, 0);
if (errno || !nm_g_object_set_property_uint(G_OBJECT(setting), property, v, NULL)) {
_LOGW(LOGD_CORE,
"Could not set property '%s.%s' to '%s'",
setting_name,
property,
value);
}
} else if (G_IS_PARAM_SPEC_STRING(spec))
2018-08-09 18:02:51 +02:00
g_object_set(setting, property, value, NULL);
else
_LOGW(LOGD_CORE, "Don't know how to set '%s' of %s", property, setting_name);
2018-08-09 18:02:51 +02:00
}
static void
reader_read_all_connections_from_fw(Reader *reader, const char *sysfs_dir)
{
gs_unref_hashtable GHashTable *ibft = NULL;
NMConnection *dt_connection;
const char *mac;
GHashTable *nic;
const char *index;
GError *error = NULL;
guint i, length;
gs_free const char **keys = NULL;
ibft = nmi_ibft_read(sysfs_dir);
keys = nm_strdict_get_keys(ibft, TRUE, &length);
for (i = 0; i < length; i++) {
gs_unref_object NMConnection *connection = NULL;
gs_free char *name = NULL;
mac = keys[i];
nic = g_hash_table_lookup(ibft, mac);
connection = nm_simple_connection_new();
index = g_hash_table_lookup(nic, "index");
if (!index) {
_LOGW(LOGD_CORE, "Ignoring an iBFT entry without an index");
continue;
}
if (!nmi_ibft_update_connection_from_nic(connection, nic, &error)) {
_LOGW(LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
g_error_free(error);
continue;
}
name = g_strdup_printf("ibft%s", index);
reader_add_connection(reader, name, g_steal_pointer(&connection));
}
dt_connection = nmi_dt_reader_parse(sysfs_dir);
if (dt_connection)
reader_add_connection(reader, "ofw", dt_connection);
}
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
#define _strv_is_same_unordered(strv, ...) \
nm_strv_is_same_unordered(NM_CAST_STRV_CC(strv), -1, NM_MAKE_STRV(__VA_ARGS__), -1)
static void
_strv_remove(const char **strv, const char *needle)
{
gssize idx;
gsize len;
gsize i;
all: unify and rename strv helper API Naming is important, because the name of a thing should give you a good idea what it does. Also, to find a thing, it needs a good name in the first place. But naming is also hard. Historically, some strv helper API was named as nm_utils_strv_*(), and some API had a leading underscore (as it is internal API). This was all inconsistent. Do some renaming and try to unify things. We get rid of the leading underscore if this is just a regular (internal) helper. But not for example from _nm_strv_find_first(), because that is the implementation of nm_strv_find_first(). - _nm_utils_strv_cleanup() -> nm_strv_cleanup() - _nm_utils_strv_cleanup_const() -> nm_strv_cleanup_const() - _nm_utils_strv_cmp_n() -> _nm_strv_cmp_n() - _nm_utils_strv_dup() -> _nm_strv_dup() - _nm_utils_strv_dup_packed() -> _nm_strv_dup_packed() - _nm_utils_strv_find_first() -> _nm_strv_find_first() - _nm_utils_strv_sort() -> _nm_strv_sort() - _nm_utils_strv_to_ptrarray() -> nm_strv_to_ptrarray() - _nm_utils_strv_to_slist() -> nm_strv_to_gslist() - nm_utils_strv_cmp_n() -> nm_strv_cmp_n() - nm_utils_strv_dup() -> nm_strv_dup() - nm_utils_strv_dup_packed() -> nm_strv_dup_packed() - nm_utils_strv_dup_shallow_maybe_a() -> nm_strv_dup_shallow_maybe_a() - nm_utils_strv_equal() -> nm_strv_equal() - nm_utils_strv_find_binary_search() -> nm_strv_find_binary_search() - nm_utils_strv_find_first() -> nm_strv_find_first() - nm_utils_strv_make_deep_copied() -> nm_strv_make_deep_copied() - nm_utils_strv_make_deep_copied_n() -> nm_strv_make_deep_copied_n() - nm_utils_strv_make_deep_copied_nonnull() -> nm_strv_make_deep_copied_nonnull() - nm_utils_strv_sort() -> nm_strv_sort() Note that no names are swapped and none of the new names existed previously. That means, all the new names are really new, which simplifies to find errors due to this larger refactoring. E.g. if you backport a patch from after this change to an old branch, you'll get a compiler error and notice that something is missing.
2021-07-29 10:02:11 +02:00
idx = nm_strv_find_first(strv, -1, needle);
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (idx < 0)
return;
/* Remove element at idx, by shifting the remaining ones
* (including the terminating NULL). */
len = NM_PTRARRAY_LEN(strv);
for (i = idx; i < len; i++)
strv[i] = strv[i + 1];
}
static const char *
_parse_ip_method(const char *kind)
{
const char *const KINDS[] = {
"none",
"dhcp",
"dhcp6",
"link6",
"auto",
"ibft",
};
gs_free char *kind_to_free = NULL;
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
gs_free const char **strv = NULL;
gsize i;
kind = nm_strstrip_avoid_copy_a(300, kind, &kind_to_free);
if (nm_str_is_empty(kind)) {
/* Dracut defaults empty/missing to "dhcp". We treat them differently, as it
* depends on whether we have IP addresses too.
* https://github.com/dracutdevs/dracut/blob/3cc9f1c10c67dcdb5254e0eb69f19e9ab22abf20/modules.d/35network-legacy/parse-ip-opts.sh#L62 */
return "auto";
}
for (i = 0; i < G_N_ELEMENTS(KINDS); i++) {
if (nm_streq(kind, KINDS[i]))
return KINDS[i];
}
/* the following are (currently) treated as aliases. */
if (nm_streq(kind, "fw"))
return "ibft";
if (nm_streq(kind, "single-dhcp"))
return "dhcp";
if (nm_streq(kind, "off"))
return "none";
if (nm_streq(kind, "auto6"))
return "dhcp6";
if (NM_IN_STRSET(kind, "on", "any"))
return "auto";
if (!strchr(kind, ','))
return NULL;
/* dracut also supports combinations, separated by comma. We don't
* support arbitrary combinations, but accept specific subsets. */
strv = nm_strsplit_set_full(kind, ",", NM_STRSPLIT_SET_FLAGS_STRSTRIP);
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (!strv)
return NULL;
/* first normalize the strv array by replacing all entries by their
* normalized kind. */
for (i = 0; strv[i]; i++) {
strv[i] = _parse_ip_method(strv[i]);
if (!strv[i]) {
/* Unknown key. Not recognized. */
return NULL;
}
}
/* sort list and remove duplicates. */
all: unify and rename strv helper API Naming is important, because the name of a thing should give you a good idea what it does. Also, to find a thing, it needs a good name in the first place. But naming is also hard. Historically, some strv helper API was named as nm_utils_strv_*(), and some API had a leading underscore (as it is internal API). This was all inconsistent. Do some renaming and try to unify things. We get rid of the leading underscore if this is just a regular (internal) helper. But not for example from _nm_strv_find_first(), because that is the implementation of nm_strv_find_first(). - _nm_utils_strv_cleanup() -> nm_strv_cleanup() - _nm_utils_strv_cleanup_const() -> nm_strv_cleanup_const() - _nm_utils_strv_cmp_n() -> _nm_strv_cmp_n() - _nm_utils_strv_dup() -> _nm_strv_dup() - _nm_utils_strv_dup_packed() -> _nm_strv_dup_packed() - _nm_utils_strv_find_first() -> _nm_strv_find_first() - _nm_utils_strv_sort() -> _nm_strv_sort() - _nm_utils_strv_to_ptrarray() -> nm_strv_to_ptrarray() - _nm_utils_strv_to_slist() -> nm_strv_to_gslist() - nm_utils_strv_cmp_n() -> nm_strv_cmp_n() - nm_utils_strv_dup() -> nm_strv_dup() - nm_utils_strv_dup_packed() -> nm_strv_dup_packed() - nm_utils_strv_dup_shallow_maybe_a() -> nm_strv_dup_shallow_maybe_a() - nm_utils_strv_equal() -> nm_strv_equal() - nm_utils_strv_find_binary_search() -> nm_strv_find_binary_search() - nm_utils_strv_find_first() -> nm_strv_find_first() - nm_utils_strv_make_deep_copied() -> nm_strv_make_deep_copied() - nm_utils_strv_make_deep_copied_n() -> nm_strv_make_deep_copied_n() - nm_utils_strv_make_deep_copied_nonnull() -> nm_strv_make_deep_copied_nonnull() - nm_utils_strv_sort() -> nm_strv_sort() Note that no names are swapped and none of the new names existed previously. That means, all the new names are really new, which simplifies to find errors due to this larger refactoring. E.g. if you backport a patch from after this change to an old branch, you'll get a compiler error and notice that something is missing.
2021-07-29 10:02:11 +02:00
nm_strv_sort(strv, -1);
nm_strv_cleanup_const(strv, TRUE, TRUE);
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
all: unify and rename strv helper API Naming is important, because the name of a thing should give you a good idea what it does. Also, to find a thing, it needs a good name in the first place. But naming is also hard. Historically, some strv helper API was named as nm_utils_strv_*(), and some API had a leading underscore (as it is internal API). This was all inconsistent. Do some renaming and try to unify things. We get rid of the leading underscore if this is just a regular (internal) helper. But not for example from _nm_strv_find_first(), because that is the implementation of nm_strv_find_first(). - _nm_utils_strv_cleanup() -> nm_strv_cleanup() - _nm_utils_strv_cleanup_const() -> nm_strv_cleanup_const() - _nm_utils_strv_cmp_n() -> _nm_strv_cmp_n() - _nm_utils_strv_dup() -> _nm_strv_dup() - _nm_utils_strv_dup_packed() -> _nm_strv_dup_packed() - _nm_utils_strv_find_first() -> _nm_strv_find_first() - _nm_utils_strv_sort() -> _nm_strv_sort() - _nm_utils_strv_to_ptrarray() -> nm_strv_to_ptrarray() - _nm_utils_strv_to_slist() -> nm_strv_to_gslist() - nm_utils_strv_cmp_n() -> nm_strv_cmp_n() - nm_utils_strv_dup() -> nm_strv_dup() - nm_utils_strv_dup_packed() -> nm_strv_dup_packed() - nm_utils_strv_dup_shallow_maybe_a() -> nm_strv_dup_shallow_maybe_a() - nm_utils_strv_equal() -> nm_strv_equal() - nm_utils_strv_find_binary_search() -> nm_strv_find_binary_search() - nm_utils_strv_find_first() -> nm_strv_find_first() - nm_utils_strv_make_deep_copied() -> nm_strv_make_deep_copied() - nm_utils_strv_make_deep_copied_n() -> nm_strv_make_deep_copied_n() - nm_utils_strv_make_deep_copied_nonnull() -> nm_strv_make_deep_copied_nonnull() - nm_utils_strv_sort() -> nm_strv_sort() Note that no names are swapped and none of the new names existed previously. That means, all the new names are really new, which simplifies to find errors due to this larger refactoring. E.g. if you backport a patch from after this change to an old branch, you'll get a compiler error and notice that something is missing.
2021-07-29 10:02:11 +02:00
if (nm_strv_find_first(strv, -1, "auto") >= 0) {
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
/* if "auto" is present, then "dhcp4", "dhcp6", and "local6" is implied. */
_strv_remove(strv, "dhcp4");
_strv_remove(strv, "dhcp6");
_strv_remove(strv, "local6");
all: unify and rename strv helper API Naming is important, because the name of a thing should give you a good idea what it does. Also, to find a thing, it needs a good name in the first place. But naming is also hard. Historically, some strv helper API was named as nm_utils_strv_*(), and some API had a leading underscore (as it is internal API). This was all inconsistent. Do some renaming and try to unify things. We get rid of the leading underscore if this is just a regular (internal) helper. But not for example from _nm_strv_find_first(), because that is the implementation of nm_strv_find_first(). - _nm_utils_strv_cleanup() -> nm_strv_cleanup() - _nm_utils_strv_cleanup_const() -> nm_strv_cleanup_const() - _nm_utils_strv_cmp_n() -> _nm_strv_cmp_n() - _nm_utils_strv_dup() -> _nm_strv_dup() - _nm_utils_strv_dup_packed() -> _nm_strv_dup_packed() - _nm_utils_strv_find_first() -> _nm_strv_find_first() - _nm_utils_strv_sort() -> _nm_strv_sort() - _nm_utils_strv_to_ptrarray() -> nm_strv_to_ptrarray() - _nm_utils_strv_to_slist() -> nm_strv_to_gslist() - nm_utils_strv_cmp_n() -> nm_strv_cmp_n() - nm_utils_strv_dup() -> nm_strv_dup() - nm_utils_strv_dup_packed() -> nm_strv_dup_packed() - nm_utils_strv_dup_shallow_maybe_a() -> nm_strv_dup_shallow_maybe_a() - nm_utils_strv_equal() -> nm_strv_equal() - nm_utils_strv_find_binary_search() -> nm_strv_find_binary_search() - nm_utils_strv_find_first() -> nm_strv_find_first() - nm_utils_strv_make_deep_copied() -> nm_strv_make_deep_copied() - nm_utils_strv_make_deep_copied_n() -> nm_strv_make_deep_copied_n() - nm_utils_strv_make_deep_copied_nonnull() -> nm_strv_make_deep_copied_nonnull() - nm_utils_strv_sort() -> nm_strv_sort() Note that no names are swapped and none of the new names existed previously. That means, all the new names are really new, which simplifies to find errors due to this larger refactoring. E.g. if you backport a patch from after this change to an old branch, you'll get a compiler error and notice that something is missing.
2021-07-29 10:02:11 +02:00
} else if (nm_strv_find_first(strv, -1, "dhcp6") >= 0) {
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
/* if "dhcp6" is present, then "local6" is implied. */
_strv_remove(strv, "local6");
}
if (strv[0] && !strv[1]) {
/* there is only one value left. It's good. */
return strv[0];
}
/* only certain combinations are allowed... those are listed
* and mapped to a canonical value.
*/
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (_strv_is_same_unordered(strv, "dhcp", "dhcp6"))
return "dhcp4+auto6";
/* For the moment, this maps to "auto". This might be revisited
* in the future to add new kinds like "dhcp+local6"
*/
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (_strv_is_same_unordered(strv, "dhcp", "local6"))
return "auto";
/* undetected. */
return NULL;
}
2018-08-09 18:02:51 +02:00
static void
reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
2018-08-09 18:02:51 +02:00
{
NMConnection *connection;
NMSettingConnection *s_con;
NMSettingIPConfig *s_ip4 = NULL, *s_ip6 = NULL;
2018-08-09 18:02:51 +02:00
gs_unref_hashtable GHashTable *ibft = NULL;
const char *tmp;
const char *tmp2;
const char *tmp3;
const char *kind;
const char *client_ip = NULL;
const char *peer = NULL;
const char *gateway_ip = NULL;
const char *netmask = NULL;
const char *client_hostname = NULL;
const char *iface_spec = NULL;
const char *mtu = NULL;
const char *macaddr = NULL;
int client_ip_family = AF_UNSPEC;
int client_ip_prefix = -1;
gboolean clear_ip4_required_timeout = TRUE;
const char *dns[2] = {
NULL,
NULL,
2018-08-09 18:02:51 +02:00
};
int dns_addr_family[2] = {
AF_UNSPEC,
AF_UNSPEC,
};
2018-08-09 18:02:51 +02:00
int i;
GError *error = NULL;
2018-08-09 18:02:51 +02:00
if (!*argument)
return;
2018-08-09 18:02:51 +02:00
tmp = get_word(&argument, ':');
if (!*argument) {
/* ip={dhcp|on|any|dhcp6|auto6|link6|ibft} */
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
kind = _parse_ip_method(tmp);
if (!kind) {
/* invalid method. We treat it as "auto". */
kind = "auto";
}
2018-08-09 18:02:51 +02:00
} else {
tmp2 = get_word(&argument, ':');
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (!nm_str_is_empty(tmp2) && (tmp3 = _parse_ip_method(tmp2))) {
/* <ifname>:{none|off|dhcp|on|any|dhcp6|auto|auto6|link6|ibft} */
iface_spec = tmp;
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
kind = tmp3;
} else {
/* <client-IP>:[<peer>]:<gateway-IP>:<netmask>:<client_hostname>:<kind> */
client_ip = tmp;
if (client_ip) {
client_ip_family = get_ip_address_family(client_ip, TRUE);
if (client_ip_family == AF_UNSPEC) {
_LOGW(LOGD_CORE, "Invalid IP address '%s'.", client_ip);
return;
}
}
peer = tmp2;
2018-08-09 18:02:51 +02:00
gateway_ip = get_word(&argument, ':');
netmask = get_word(&argument, ':');
client_hostname = get_word(&argument, ':');
iface_spec = get_word(&argument, ':');
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
tmp2 = get_word(&argument, ':');
kind = _parse_ip_method(tmp2);
if (!kind) {
/* invalid method. We treat that as "auto". */
kind = "auto";
}
2018-08-09 18:02:51 +02:00
}
if (client_hostname && !nm_sd_hostname_is_valid(client_hostname, FALSE))
client_hostname = NULL;
if (client_hostname) {
g_free(reader->hostname);
reader->hostname = g_strdup(client_hostname);
}
2018-08-09 18:02:51 +02:00
tmp = get_word(&argument, ':');
dns_addr_family[0] = get_ip_address_family(tmp, FALSE);
2018-08-09 18:02:51 +02:00
if (dns_addr_family[0] != AF_UNSPEC) {
dns[0] = tmp;
dns[1] = get_word(&argument, ':');
if (dns[1]) {
dns_addr_family[1] = get_ip_address_family(dns[1], FALSE);
if (dns_addr_family[1] == AF_UNSPEC)
_LOGW(LOGD_CORE, "Ignoring invalid DNS server: '%s'.", dns[1]);
if (*argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
}
2018-08-09 18:02:51 +02:00
} else {
mtu = tmp;
macaddr = argument;
}
2018-08-09 18:02:51 +02:00
}
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (iface_spec == NULL && nm_streq(kind, "ibft")) {
reader_read_all_connections_from_fw(reader, sysfs_dir);
2018-08-09 18:02:51 +02:00
return;
}
2018-08-09 18:02:51 +02:00
/* Parsing done, construct the NMConnection. */
if (iface_spec)
connection = reader_get_connection(reader, iface_spec, NULL, TRUE);
else
connection = reader_get_default_connection(reader);
g_hash_table_add(reader->explicit_ip_connections, g_object_ref(connection));
s_con = nm_connection_get_setting_connection(connection);
2018-08-09 18:02:51 +02:00
s_ip4 = nm_connection_get_setting_ip4_config(connection);
s_ip6 = nm_connection_get_setting_ip6_config(connection);
2018-08-09 18:02:51 +02:00
if (netmask && *netmask) {
gboolean is_ipv4 = client_ip_family == AF_INET;
2018-08-09 18:02:51 +02:00
NMIPAddr addr;
if (is_ipv4 && nm_utils_parse_inaddr_bin(AF_INET, netmask, NULL, &addr))
2018-08-09 18:02:51 +02:00
client_ip_prefix = nm_utils_ip4_netmask_to_prefix(addr.addr4);
else
client_ip_prefix = _nm_utils_ascii_str_to_int64(netmask, 10, 0, is_ipv4 ? 32 : 128, -1);
if (client_ip_prefix == -1)
_LOGW(LOGD_CORE, "Invalid IP mask: %s", netmask);
2018-08-09 18:02:51 +02:00
}
2018-08-09 18:02:51 +02:00
/* Static IP configuration might be present. */
if (client_ip && *client_ip) {
NMIPAddress *address = NULL;
NMIPAddr addr;
if (nm_utils_parse_inaddr_prefix_bin(client_ip_family,
client_ip,
NULL,
&addr,
2018-08-09 18:02:51 +02:00
client_ip_prefix == -1 ? &client_ip_prefix : NULL)) {
if (client_ip_prefix == -1) {
switch (client_ip_family) {
case AF_INET:
client_ip_prefix = _nm_utils_ip4_get_default_prefix(addr.addr4);
break;
case AF_INET6:
client_ip_prefix = 64;
break;
}
2018-08-09 18:02:51 +02:00
}
2018-08-09 18:02:51 +02:00
address = nm_ip_address_new_binary(client_ip_family,
&addr.addr_ptr,
client_ip_prefix,
&error);
if (!address) {
_LOGW(LOGD_CORE, "Invalid address '%s': %s", client_ip, error->message);
2018-08-09 18:02:51 +02:00
g_clear_error(&error);
}
} else
nm_assert_not_reached();
2018-08-09 18:02:51 +02:00
if (address) {
/* We don't want to have multiple devices up with the
* same static address. */
g_object_set(s_con,
NM_SETTING_CONNECTION_MULTI_CONNECT,
NM_CONNECTION_MULTI_CONNECT_SINGLE,
NULL);
2018-08-09 18:02:51 +02:00
switch (client_ip_family) {
case AF_INET:
g_object_set(s_ip4,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
NM_SETTING_IP_CONFIG_MAY_FAIL,
FALSE,
NULL);
2018-08-09 18:02:51 +02:00
nm_setting_ip_config_add_address(s_ip4, address);
break;
case AF_INET6:
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_MANUAL,
NM_SETTING_IP_CONFIG_MAY_FAIL,
FALSE,
NULL);
2018-08-09 18:02:51 +02:00
nm_setting_ip_config_add_address(s_ip6, address);
break;
default:
nm_assert_not_reached();
2018-08-09 18:02:51 +02:00
break;
}
nm_ip_address_unref(address);
}
}
2018-08-09 18:02:51 +02:00
/* Dynamic IP configuration configured explicitly. */
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
if (nm_streq(kind, "none")) {
2018-08-09 18:02:51 +02:00
if (nm_setting_ip_config_get_num_addresses(s_ip6) == 0) {
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
NULL);
2018-08-09 18:02:51 +02:00
}
if (nm_setting_ip_config_get_num_addresses(s_ip4) == 0) {
g_object_set(s_ip4,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
NULL);
2018-08-09 18:02:51 +02:00
}
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
} else if (nm_streq(kind, "dhcp")) {
2018-08-09 18:02:51 +02:00
g_object_set(s_ip4,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NM_SETTING_IP_CONFIG_MAY_FAIL,
FALSE,
NULL);
2018-08-09 18:02:51 +02:00
if (nm_setting_ip_config_get_num_addresses(s_ip6) == 0) {
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP6_CONFIG_METHOD_AUTO,
NULL);
2018-08-09 18:02:51 +02:00
}
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
} else if (nm_streq(kind, "dhcp6")) {
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP6_CONFIG_METHOD_AUTO,
NM_SETTING_IP_CONFIG_MAY_FAIL,
FALSE,
NULL);
2018-08-09 18:02:51 +02:00
if (nm_setting_ip_config_get_num_addresses(s_ip4) == 0) {
g_object_set(s_ip4,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
NULL);
2018-08-09 18:02:51 +02:00
}
} else if (nm_streq(kind, "dhcp4+auto6")) {
/* Both DHCPv4 and IPv6 autoconf are enabled, and
* each of them is tried for at least IP_REQUIRED_TIMEOUT_MSEC,
* even if the other one completes before.
*/
clear_ip4_required_timeout = FALSE;
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT,
NMI_IP_REQUIRED_TIMEOUT_MSEC,
NULL);
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
} else if (nm_streq(kind, "link6")) {
g_object_set(s_ip6,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL,
NM_SETTING_IP_CONFIG_MAY_FAIL,
FALSE,
NULL);
if (nm_setting_ip_config_get_num_addresses(s_ip4) == 0) {
g_object_set(s_ip4,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
NULL);
}
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
} else if (nm_streq(kind, "ibft")) {
NMSettingWired *s_wired;
const char *mac = NULL;
const char *ifname;
gs_free char *mac_free = NULL;
gs_free char *address_path = NULL;
GHashTable *nic = NULL;
if ((s_wired = nm_connection_get_setting_wired(connection))
&& (mac = nm_setting_wired_get_mac_address(s_wired))) {
/* got mac from the connection */
} else if ((ifname = nm_connection_get_interface_name(connection))) {
/* read it from sysfs */
address_path = g_build_filename(sysfs_dir, "class", "net", ifname, "address", NULL);
if (g_file_get_contents(address_path, &mac_free, NULL, &error)) {
g_strchomp(mac_free);
mac = mac_free;
} else {
_LOGW(LOGD_CORE, "Can't get a MAC address for %s: %s", ifname, error->message);
g_clear_error(&error);
2018-08-09 18:02:51 +02:00
}
}
2018-08-09 18:02:51 +02:00
if (mac) {
gs_free char *mac_up = NULL;
2018-08-09 18:02:51 +02:00
mac_up = g_ascii_strup(mac, -1);
ibft = nmi_ibft_read(sysfs_dir);
2018-08-09 18:02:51 +02:00
nic = g_hash_table_lookup(ibft, mac_up);
if (!nic)
_LOGW(LOGD_CORE, "No iBFT NIC for %s (%s)", iface_spec, mac_up);
2018-08-09 18:02:51 +02:00
}
2018-08-09 18:02:51 +02:00
if (nic) {
if (!nmi_ibft_update_connection_from_nic(connection, nic, &error)) {
_LOGW(LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
2018-08-09 18:02:51 +02:00
g_clear_error(&error);
}
}
} else {
initrd: rework parsing of ip method from "ip=" Dracut supports several options for the "ip=" method. NetworkManager interprets and handles them in a certain way that aims to give a similar behavior. But as such it maps different settings ("auth6" and "dhcp6") to exactly the same behavior. Add _parse_ip_method() function to normalize these keys, and map their aliases to the keyword that nm-initrd-generator handles. The advantage is that you see now in _parse_ip_method() which methods are mapped to the same behavior, and the later (more complex) code only deals with the normalized kinds. Also, use the same validation code at all 3 places where IP methods can appear, that is ip=<method> ip=<ifname>:<method>[:...] ip=<client-ip>:...:<method>[:...] Also, dracut supports specifying multiple methods and concatenate them with comma. nm-initrd-generator only did partly, for example, `ip=dhcp,dhcp6" would have worked, but only because the code failed to recognize the string and fell back to the default behavior. It would not have worked as `ip=<ifname>:dhcp,dhcp6[:...]`. Not all combinations make sense, but some do. So let _parse_ip_method() detect and handle them. Currently, they mostly map to "auto", but in the future it might make sense that `ip=dhcp,local6` is a distinct kind. Try to tighten up the parsing. It's fine to be forgiving and flexible about what we parse, but bogus values should not silently be accepted. However, in order to keep previous behavior, `ip=bogus` and `ip=<client-ip>:...:<bogus-method>[:...]` explicitly map invalid method to "auto".
2021-07-23 12:30:20 +02:00
nm_assert(nm_streq(kind, "auto"));
clear_ip4_required_timeout = FALSE;
}
if (clear_ip4_required_timeout)
g_object_set(s_ip4, NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT, -1, NULL);
2018-08-09 18:02:51 +02:00
if (peer && *peer)
2019-07-02 09:33:20 +02:00
_LOGW(LOGD_CORE, "Ignoring peer: %s (not implemented)\n", peer);
2018-08-09 18:02:51 +02:00
if (gateway_ip && *gateway_ip) {
switch (get_ip_address_family(gateway_ip, FALSE)) {
case AF_INET:
g_object_set(s_ip4, NM_SETTING_IP_CONFIG_GATEWAY, gateway_ip, NULL);
break;
case AF_INET6:
g_object_set(s_ip6, NM_SETTING_IP_CONFIG_GATEWAY, gateway_ip, NULL);
break;
default:
_LOGW(LOGD_CORE, "Invalid gateway: %s", gateway_ip);
break;
}
2018-08-09 18:02:51 +02:00
}
2018-08-09 18:02:51 +02:00
if (client_hostname && *client_hostname) {
g_object_set(s_ip4, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, client_hostname, NULL);
g_object_set(s_ip6, NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, client_hostname, NULL);
}
2018-08-09 18:02:51 +02:00
for (i = 0; i < 2; i++) {
if (dns_addr_family[i] == AF_UNSPEC)
break;
nm_assert(nm_utils_ipaddr_is_valid(dns_addr_family[i], dns[i]));
nm_setting_ip_config_add_dns(NM_IS_IPv4(dns_addr_family[i]) ? s_ip4 : s_ip6, dns[i]);
2018-08-09 18:02:51 +02:00
}
2018-08-09 18:02:51 +02:00
if (mtu && *mtu)
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
2018-08-09 18:02:51 +02:00
if (macaddr && *macaddr)
connection_set(connection,
NM_SETTING_WIRED_SETTING_NAME,
NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
macaddr);
2018-08-09 18:02:51 +02:00
}
static void
reader_parse_master(Reader *reader, char *argument, const char *type_name, const char *default_name)
2018-08-09 18:02:51 +02:00
{
NMConnection *connection;
2018-08-09 18:02:51 +02:00
NMSettingConnection *s_con;
gs_free char *master_to_free = NULL;
const char *master;
char *slaves;
const char *slave;
char *opts;
const char *mtu = NULL;
2018-08-09 18:02:51 +02:00
master = get_word(&argument, ':');
if (!master)
master = master_to_free = g_strdup_printf("%s0", default_name ?: type_name);
2018-08-09 18:02:51 +02:00
slaves = get_word(&argument, ':');
connection = reader_get_connection(reader, master, type_name, TRUE);
2018-08-09 18:02:51 +02:00
s_con = nm_connection_get_setting_connection(connection);
master = nm_setting_connection_get_uuid(s_con);
if (nm_streq(type_name, NM_SETTING_BRIDGE_SETTING_NAME)) {
NMSettingBridge *s_bridge = nm_connection_get_setting_bridge(connection);
/* Avoid the forwarding delay */
g_object_set(s_bridge, NM_SETTING_BRIDGE_STP, FALSE, NULL);
} else if (nm_streq(type_name, NM_SETTING_BOND_SETTING_NAME)) {
NMSettingBond *s_bond = nm_connection_get_setting_bond(connection);
2018-08-09 18:02:51 +02:00
opts = get_word(&argument, ':');
while (opts && *opts) {
libnm/bond: remove validation from nm_setting_bond_add_option() and explicitly validate For historic reasons is NMSettingBond implemented differently from other settings. It uses a strdict, and adds some validation on top of that. The idea was probably to be able to treat bond options more generically. But in practice we cannot treat them as opaque values, but need to know, validate and understand all the options. Thus, this implementation with a strdict is not nice. The user can set the GObject property NM_SETTING_BOND_OPTIONS to any strdict, and the setter performs no validation or normalization. That is probably good, because g_object_set() cannot return an error to signalize invalid settings. As often, we have corresponding C API like nm_setting_bond_add_option() and nm_setting_bond_remove_option(). It should be possible to get the same result both with the C API and with the GObject property setting. Since there is already a way to set certain invalid values, it does not help if the C API tries to prevent that. That implies, that also add-option does not perform additional validation and sets whatever the user asks. Remove all validation from nm_setting_bond_add_option() and nm_setting_bond_remove_option(). This validation was anyway only very basic. It was calling nm_setting_bond_validate_option(), which can check whether the string is (for example) and integer, but it cannot do validation beyond one option. In most cases, the validation needs to take into account the bond mode or other options, so validating one option in isolation is not very useful. Proper validation should instead be done via nm_connection_verify(). However, due to another historic oddity, that verification is very forgiving too and doesn't reject many invalid settings when it should. That is hard to fix, because making validation more strict can break existing (and working) configurations. However, verify() already contains basic validation via nm_setting_bond_validate_option(). So in the previous behavior nm_setting_bond_add_option() would silently do nothing (only returning %FALSE) for invalid options, while now it would add the invalid options to the dictionary -- only to have it later fail validation during nm_connection_verify(). That is a slight change in behavior, however it seems preferable. It seems preferable and acceptable because most users that call nm_setting_bond_add_option() already understand the meaning and valid values. Keyfile and ifcfg-rh readers are the few exceptions, which really just parse a string dictionary, without need to understand them. But nmtui or nmstate already know the option they want to set. They don't expect a failure there, nor do they need the validation. Note that this change in behavior could be dangerous for example for the keyfile/ifcfg-rh readers, which silently ignored errors before. We don't want them to start failing if they read invalid options from a file, so instead let those callers explicitly pre-validate the value and log an warning. https://bugzilla.redhat.com/show_bug.cgi?id=1887523
2020-10-15 10:57:51 +02:00
gs_free_error GError *error = NULL;
char *opt;
const char *opt_name;
libnm/bond: remove validation from nm_setting_bond_add_option() and explicitly validate For historic reasons is NMSettingBond implemented differently from other settings. It uses a strdict, and adds some validation on top of that. The idea was probably to be able to treat bond options more generically. But in practice we cannot treat them as opaque values, but need to know, validate and understand all the options. Thus, this implementation with a strdict is not nice. The user can set the GObject property NM_SETTING_BOND_OPTIONS to any strdict, and the setter performs no validation or normalization. That is probably good, because g_object_set() cannot return an error to signalize invalid settings. As often, we have corresponding C API like nm_setting_bond_add_option() and nm_setting_bond_remove_option(). It should be possible to get the same result both with the C API and with the GObject property setting. Since there is already a way to set certain invalid values, it does not help if the C API tries to prevent that. That implies, that also add-option does not perform additional validation and sets whatever the user asks. Remove all validation from nm_setting_bond_add_option() and nm_setting_bond_remove_option(). This validation was anyway only very basic. It was calling nm_setting_bond_validate_option(), which can check whether the string is (for example) and integer, but it cannot do validation beyond one option. In most cases, the validation needs to take into account the bond mode or other options, so validating one option in isolation is not very useful. Proper validation should instead be done via nm_connection_verify(). However, due to another historic oddity, that verification is very forgiving too and doesn't reject many invalid settings when it should. That is hard to fix, because making validation more strict can break existing (and working) configurations. However, verify() already contains basic validation via nm_setting_bond_validate_option(). So in the previous behavior nm_setting_bond_add_option() would silently do nothing (only returning %FALSE) for invalid options, while now it would add the invalid options to the dictionary -- only to have it later fail validation during nm_connection_verify(). That is a slight change in behavior, however it seems preferable. It seems preferable and acceptable because most users that call nm_setting_bond_add_option() already understand the meaning and valid values. Keyfile and ifcfg-rh readers are the few exceptions, which really just parse a string dictionary, without need to understand them. But nmtui or nmstate already know the option they want to set. They don't expect a failure there, nor do they need the validation. Note that this change in behavior could be dangerous for example for the keyfile/ifcfg-rh readers, which silently ignored errors before. We don't want them to start failing if they read invalid options from a file, so instead let those callers explicitly pre-validate the value and log an warning. https://bugzilla.redhat.com/show_bug.cgi?id=1887523
2020-10-15 10:57:51 +02:00
2018-08-09 18:02:51 +02:00
opt = get_word(&opts, ',');
opt_name = get_word(&opt, '=');
libnm/bond: remove validation from nm_setting_bond_add_option() and explicitly validate For historic reasons is NMSettingBond implemented differently from other settings. It uses a strdict, and adds some validation on top of that. The idea was probably to be able to treat bond options more generically. But in practice we cannot treat them as opaque values, but need to know, validate and understand all the options. Thus, this implementation with a strdict is not nice. The user can set the GObject property NM_SETTING_BOND_OPTIONS to any strdict, and the setter performs no validation or normalization. That is probably good, because g_object_set() cannot return an error to signalize invalid settings. As often, we have corresponding C API like nm_setting_bond_add_option() and nm_setting_bond_remove_option(). It should be possible to get the same result both with the C API and with the GObject property setting. Since there is already a way to set certain invalid values, it does not help if the C API tries to prevent that. That implies, that also add-option does not perform additional validation and sets whatever the user asks. Remove all validation from nm_setting_bond_add_option() and nm_setting_bond_remove_option(). This validation was anyway only very basic. It was calling nm_setting_bond_validate_option(), which can check whether the string is (for example) and integer, but it cannot do validation beyond one option. In most cases, the validation needs to take into account the bond mode or other options, so validating one option in isolation is not very useful. Proper validation should instead be done via nm_connection_verify(). However, due to another historic oddity, that verification is very forgiving too and doesn't reject many invalid settings when it should. That is hard to fix, because making validation more strict can break existing (and working) configurations. However, verify() already contains basic validation via nm_setting_bond_validate_option(). So in the previous behavior nm_setting_bond_add_option() would silently do nothing (only returning %FALSE) for invalid options, while now it would add the invalid options to the dictionary -- only to have it later fail validation during nm_connection_verify(). That is a slight change in behavior, however it seems preferable. It seems preferable and acceptable because most users that call nm_setting_bond_add_option() already understand the meaning and valid values. Keyfile and ifcfg-rh readers are the few exceptions, which really just parse a string dictionary, without need to understand them. But nmtui or nmstate already know the option they want to set. They don't expect a failure there, nor do they need the validation. Note that this change in behavior could be dangerous for example for the keyfile/ifcfg-rh readers, which silently ignored errors before. We don't want them to start failing if they read invalid options from a file, so instead let those callers explicitly pre-validate the value and log an warning. https://bugzilla.redhat.com/show_bug.cgi?id=1887523
2020-10-15 10:57:51 +02:00
if (!_nm_setting_bond_validate_option(opt_name, opt, &error)) {
_LOGW(LOGD_CORE,
"Ignoring invalid bond option: %s%s%s = %s%s%s: %s",
NM_PRINT_FMT_QUOTE_STRING(opt_name),
NM_PRINT_FMT_QUOTE_STRING(opt),
error->message);
continue;
}
2018-08-09 18:02:51 +02:00
nm_setting_bond_add_option(s_bond, opt_name, opt);
}
2018-08-09 18:02:51 +02:00
mtu = get_word(&argument, ':');
}
if (mtu)
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
2018-08-09 18:02:51 +02:00
do {
slave = get_word(&slaves, ',');
if (slave == NULL)
slave = "eth0";
connection = reader_get_connection(reader, slave, NULL, TRUE);
2018-08-09 18:02:51 +02:00
s_con = nm_connection_get_setting_connection(connection);
g_object_set(s_con,
NM_SETTING_CONNECTION_SLAVE_TYPE,
type_name,
NM_SETTING_CONNECTION_MASTER,
master,
NULL);
} while (slaves && *slaves != '\0');
2018-08-09 18:02:51 +02:00
if (argument && *argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
2018-08-09 18:02:51 +02:00
}
static void
reader_add_routes(Reader *reader, GPtrArray *array)
2018-08-09 18:02:51 +02:00
{
guint i;
for (i = 0; i < array->len; i++) {
NMConnection *connection = NULL;
const char *net;
const char *gateway;
const char *interface;
int family = AF_UNSPEC;
NMIPAddr net_addr = {};
NMIPAddr gateway_addr = {};
int net_prefix = -1;
NMIPRoute *route;
NMSettingIPConfig *s_ip;
char *argument;
gs_free_error GError *error = NULL;
argument = array->pdata[i];
net = get_word(&argument, ':');
gateway = get_word(&argument, ':');
interface = get_word(&argument, ':');
if (interface)
connection = reader_get_connection(reader, interface, NULL, TRUE);
if (!connection)
connection = reader->bootdev_connection;
if (!connection)
connection = reader_get_connection(reader, interface, NULL, FALSE);
if (!connection)
connection = reader_get_default_connection(reader);
if (net && *net) {
if (!nm_utils_parse_inaddr_prefix_bin(family, net, &family, &net_addr, &net_prefix)) {
_LOGW(LOGD_CORE, "Unrecognized address: %s", net);
continue;
}
}
if (gateway && *gateway) {
if (!nm_utils_parse_inaddr_bin(family, gateway, &family, &gateway_addr)) {
_LOGW(LOGD_CORE, "Unrecognized address: %s", gateway);
continue;
}
}
switch (family) {
case AF_INET:
s_ip = nm_connection_get_setting_ip4_config(connection);
if (net_prefix == -1)
net_prefix = 32;
break;
case AF_INET6:
s_ip = nm_connection_get_setting_ip6_config(connection);
if (net_prefix == -1)
net_prefix = 128;
break;
default:
_LOGW(LOGD_CORE, "Unknown address family: %s", net);
continue;
2018-08-09 18:02:51 +02:00
}
route = nm_ip_route_new_binary(family,
&net_addr.addr_ptr,
net_prefix,
&gateway_addr.addr_ptr,
-1,
&error);
if (!route) {
g_warning("Invalid route '%s via %s': %s\n", net, gateway, error->message);
continue;
}
nm_setting_ip_config_add_route(s_ip, route);
nm_ip_route_unref(route);
2018-08-09 18:02:51 +02:00
}
}
static void
reader_parse_vlan(Reader *reader, char *argument)
2018-08-09 18:02:51 +02:00
{
NMConnection *connection;
2018-08-09 18:02:51 +02:00
NMSettingVlan *s_vlan;
const char *vlan;
const char *phy;
const char *vlanid;
2018-08-09 18:02:51 +02:00
vlan = get_word(&argument, ':');
phy = get_word(&argument, ':');
2018-08-09 18:02:51 +02:00
for (vlanid = vlan + strlen(vlan); vlanid > vlan; vlanid--) {
if (!g_ascii_isdigit(*(vlanid - 1)))
break;
}
connection = reader_get_connection(reader, vlan, NM_SETTING_VLAN_SETTING_NAME, TRUE);
2018-08-09 18:02:51 +02:00
s_vlan = nm_connection_get_setting_vlan(connection);
g_object_set(s_vlan,
NM_SETTING_VLAN_PARENT,
phy,
NM_SETTING_VLAN_ID,
(guint) _nm_utils_ascii_str_to_int64(vlanid, 10, 0, G_MAXUINT, G_MAXUINT),
2018-08-09 18:02:51 +02:00
NULL);
2018-08-09 18:02:51 +02:00
if (argument && *argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
if (!nm_strv_ptrarray_contains(reader->vlan_parents, phy))
g_ptr_array_add(reader->vlan_parents, g_strdup(phy));
2018-08-09 18:02:51 +02:00
}
static void
reader_parse_ib_pkey(Reader *reader, char *argument)
{
NMConnection *connection;
NMSettingInfiniband *s_ib;
char *ifname;
gs_free char *parent = NULL;
char *pkey;
gint64 pkey_int;
/* At the moment we only support ib.pkey=<parent>.<pkey>;
* in the future we want to possibly support other options:
* ib.pkey=<parent>.<pkey>:<option>:...
*/
ifname = get_word(&argument, ':');
if (!ifname) {
_LOGW(LOGD_CORE, "ib.pkey= without argument");
return;
}
parent = g_strdup(ifname);
pkey = strchr(parent, '.');
if (!pkey) {
_LOGW(LOGD_CORE, "No pkey found for '%s'", ifname);
return;
}
*pkey = '\0';
pkey++;
pkey_int = _nm_utils_ascii_str_to_int64(pkey, 16, 0, 0xFFFF, -1);
if (pkey_int == -1) {
_LOGW(LOGD_CORE, "Invalid pkey '%s'", pkey);
return;
}
connection = reader_get_connection(reader, ifname, NM_SETTING_INFINIBAND_SETTING_NAME, TRUE);
s_ib = nm_connection_get_setting_infiniband(connection);
g_object_set(s_ib,
NM_SETTING_INFINIBAND_PARENT,
parent,
NM_SETTING_INFINIBAND_P_KEY,
(int) pkey_int,
NULL);
if (argument && *argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s' for ib.pkey=", argument);
}
static void
reader_parse_znet_ifname(Reader *reader, char *argument)
{
char *ifname;
ifname = get_word(&argument, ':');
if (!ifname) {
_LOGW(LOGD_CORE, "rd.znet_ifname= without argument");
return;
}
if (!g_hash_table_replace(reader->znet_ifnames, g_strdup(argument), g_strdup(ifname))) {
_LOGW(LOGD_CORE, "duplicate rd.znet_ifname for ifname=%s", ifname);
}
}
static void
reader_parse_rd_znet(Reader *reader, char *argument, gboolean net_ifnames)
{
const char *nettype;
const char *subchannels[4] = {0, 0, 0, 0};
const char *tmp;
gs_free char *ifname = NULL;
gs_free char *str_subchannels = NULL;
const char *prefix;
NMConnection *connection;
NMSettingWired *s_wired;
static int count_ctc = 0;
static int count_eth = 0;
int index = -1;
nettype = get_word(&argument, ',');
subchannels[0] = get_word(&argument, ',');
subchannels[1] = get_word(&argument, ',');
/* Without subchannels we can't univocally match
* a device. */
if (!subchannels[0] || !subchannels[1])
return;
if (nm_streq0(nettype, "ctc")) {
if (net_ifnames == TRUE) {
prefix = "sl";
} else {
prefix = "ctc";
index = count_ctc++;
}
} else {
subchannels[2] = get_word(&argument, ',');
if (net_ifnames == TRUE) {
prefix = "en";
} else {
prefix = "eth";
index = count_eth++;
}
}
str_subchannels = g_strjoinv(",", (char **) subchannels);
ifname = g_hash_table_lookup(reader->znet_ifnames, str_subchannels);
if (ifname) {
ifname = g_strdup(ifname);
g_hash_table_remove(reader->znet_ifnames, str_subchannels);
} else if (net_ifnames == TRUE) {
const char *bus_id;
size_t bus_id_len;
size_t bus_id_start;
/* The following logic is taken from names_ccw() in systemd/src/udev/udev-builtin-net_id.c */
bus_id = subchannels[0];
bus_id_len = strlen(bus_id);
bus_id_start = strspn(bus_id, ".0");
bus_id += bus_id_start < bus_id_len ? bus_id_start : bus_id_len - 1;
ifname = g_strdup_printf("%sc%s", prefix, bus_id);
} else {
nm_assert(index > -1);
ifname = g_strdup_printf("%s%d", prefix, index);
}
connection = reader_get_connection(reader, ifname, NM_SETTING_WIRED_SETTING_NAME, FALSE);
if (!connection)
return;
s_wired = nm_connection_get_setting_wired(connection);
g_object_set(s_wired,
NM_SETTING_WIRED_S390_NETTYPE,
nettype,
NM_SETTING_WIRED_S390_SUBCHANNELS,
&subchannels,
NULL);
while ((tmp = get_word(&argument, ',')) != NULL) {
const char *key;
char *val;
val = strchr(tmp, '=');
if (!val) {
/* an invalid (or empty) entry. Ignore. */
continue;
}
key = tmp;
val[0] = '\0';
val++;
if (!_nm_setting_wired_is_valid_s390_option(key)
|| !_nm_setting_wired_is_valid_s390_option_value(key, val)) {
/* Invalid setting. Silently ignore, but also ensure we
* didn't already set it. */
nm_setting_wired_remove_s390_option(s_wired, key);
} else
nm_setting_wired_add_s390_option(s_wired, key, val);
}
}
static void
reader_parse_ethtool(Reader *reader, char *argument)
{
NMConnection *connection;
NMSettingWired *s_wired;
const char *autoneg_str;
const char *speed_str;
const char *interface;
int autoneg;
guint speed;
interface = get_word(&argument, ':');
if (!interface) {
_LOGW(LOGD_CORE, "rd.ethtool: interface unspecified. Ignore");
return;
}
autoneg_str = get_word(&argument, ':');
speed_str = get_word(&argument, ':');
autoneg = -1;
if (autoneg_str) {
autoneg = _nm_utils_ascii_str_to_bool(autoneg_str, -1);
if (autoneg == -1)
_LOGW(LOGD_CORE, "rd.ethtool: autoneg invalid. Must be boolean or empty");
}
speed = 0;
if (speed_str) {
speed = _nm_utils_ascii_str_to_int64(speed_str, 10, 0, G_MAXUINT32, 0);
if (errno)
_LOGW(LOGD_CORE, "rd.ethtool: speed invalid. Must be an integer or empty");
}
if (speed == 0 && autoneg == FALSE) {
_LOGW(LOGD_CORE,
"rd.ethtool: autoneg ignored. Cannot disable autoneg without setting speed");
}
connection = reader_get_connection(reader, interface, NM_SETTING_WIRED_SETTING_NAME, TRUE);
if (autoneg != -1 || speed != 0) {
if (autoneg == -1)
autoneg = FALSE;
s_wired = nm_connection_get_setting_wired(connection);
g_object_set(s_wired,
NM_SETTING_WIRED_AUTO_NEGOTIATE,
(gboolean) autoneg,
NM_SETTING_WIRED_SPEED,
speed,
NM_SETTING_WIRED_DUPLEX,
speed == 0 ? NULL : "full",
NULL);
}
if (*argument)
_LOGW(LOGD_CORE, "rd.ethtool: extra argument ignored");
}
2018-08-09 18:02:51 +02:00
static void
_normalize_conn(gpointer key, gpointer value, gpointer user_data)
{
NMConnection *connection = value;
nm_connection_normalize(connection, NULL, NULL, NULL);
}
static void
reader_add_nameservers(Reader *reader, GPtrArray *nameservers)
{
NMConnection *connection;
NMSettingIPConfig *s_ip;
GHashTableIter iter;
int addr_family;
const char *ns;
guint i;
for (i = 0; i < nameservers->len; i++) {
ns = nameservers->pdata[i];
addr_family = get_ip_address_family(ns, FALSE);
if (addr_family == AF_UNSPEC) {
_LOGW(LOGD_CORE, "Unknown address family: %s", ns);
continue;
}
g_hash_table_iter_init(&iter, reader->hash);
while (g_hash_table_iter_next(&iter, NULL, (gpointer *) &connection)) {
switch (addr_family) {
case AF_INET:
s_ip = nm_connection_get_setting_ip4_config(connection);
if (!NM_IN_STRSET(nm_setting_ip_config_get_method(s_ip),
NM_SETTING_IP4_CONFIG_METHOD_AUTO,
NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
continue;
break;
case AF_INET6:
s_ip = nm_connection_get_setting_ip6_config(connection);
if (!NM_IN_STRSET(nm_setting_ip_config_get_method(s_ip),
NM_SETTING_IP6_CONFIG_METHOD_AUTO,
NM_SETTING_IP6_CONFIG_METHOD_DHCP,
NM_SETTING_IP6_CONFIG_METHOD_MANUAL))
continue;
break;
default:
nm_assert_not_reached();
continue;
}
nm_setting_ip_config_add_dns(s_ip, ns);
}
}
}
static void
connection_set_needed(NMConnection *connection)
{
NMSettingConnection *s_con;
s_con = nm_connection_get_setting_connection(connection);
if (!nm_streq0(nm_setting_connection_get_connection_type(s_con), NM_SETTING_WIRED_SETTING_NAME))
return;
g_object_set(s_con,
NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
(int) NMI_WAIT_DEVICE_TIMEOUT_MSEC,
NULL);
}
static void
connection_set_needed_cb(gpointer key, gpointer value, gpointer user_data)
{
connection_set_needed(value);
}
2018-08-09 18:02:51 +02:00
GHashTable *
nmi_cmdline_reader_parse(const char *etc_connections_dir,
const char *sysfs_dir,
const char *const *argv,
char **hostname,
gint64 *carrier_timeout_sec)
2018-08-09 18:02:51 +02:00
{
Reader *reader;
const char *tag;
gboolean ignore_bootif = FALSE;
gboolean neednet = FALSE;
gs_free char *bootif_val = NULL;
gs_free char *bootdev = NULL;
gboolean net_ifnames = TRUE;
gs_unref_ptrarray GPtrArray *nameservers = NULL;
gs_unref_ptrarray GPtrArray *routes = NULL;
gs_unref_ptrarray GPtrArray *znets = NULL;
2018-08-09 18:02:51 +02:00
int i;
guint64 dhcp_timeout = 90;
guint64 dhcp_num_tries = 1;
reader = reader_new();
for (i = 0; argv[i]; i++) {
gs_free char *argument_clone = NULL;
char *argument;
argument_clone = g_strdup(argv[i]);
argument = argument_clone;
tag = get_word(&argument, '=');
if (!tag) {
/* pass */
} else if (nm_streq(tag, "net.ifnames"))
net_ifnames = !nm_streq(argument, "0");
else if (nm_streq(tag, "rd.peerdns"))
reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool(argument, TRUE);
else if (nm_streq(tag, "rd.net.timeout.dhcp")) {
if (nm_streq0(argument, "infinity")) {
dhcp_timeout = G_MAXINT32;
} else {
dhcp_timeout =
_nm_utils_ascii_str_to_int64(argument, 10, 1, G_MAXINT32, dhcp_timeout);
}
} else if (nm_streq(tag, "rd.net.dhcp.retry")) {
dhcp_num_tries =
_nm_utils_ascii_str_to_int64(argument, 10, 1, G_MAXINT32, dhcp_num_tries);
} else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) {
if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL))
nm_strdup_reset(&reader->dhcp4_vci, argument);
} else if (nm_streq(tag, "rd.net.timeout.carrier")) {
reader->carrier_timeout_sec =
_nm_utils_ascii_str_to_int64(argument, 10, 0, G_MAXINT32, 0);
}
}
reader->dhcp_timeout = NM_CLAMP(dhcp_timeout * dhcp_num_tries, 1, G_MAXINT32);
2018-08-09 18:02:51 +02:00
for (i = 0; argv[i]; i++) {
gs_free char *argument_clone = NULL;
char *argument;
char *word;
argument_clone = g_strdup(argv[i]);
argument = argument_clone;
2018-08-09 18:02:51 +02:00
tag = get_word(&argument, '=');
if (!tag) {
/* pass */
} else if (nm_streq(tag, "ip"))
reader_parse_ip(reader, sysfs_dir, argument);
else if (nm_streq(tag, "rd.route")) {
if (!routes)
routes = g_ptr_array_new_with_free_func(g_free);
g_ptr_array_add(routes, g_strdup(argument));
} else if (nm_streq(tag, "bridge"))
reader_parse_master(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br");
else if (nm_streq(tag, "bond"))
reader_parse_master(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL);
else if (nm_streq(tag, "team"))
reader_parse_master(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL);
else if (nm_streq(tag, "vlan"))
reader_parse_vlan(reader, argument);
else if (nm_streq(tag, "ib.pkey"))
reader_parse_ib_pkey(reader, argument);
else if (nm_streq(tag, "bootdev")) {
g_free(bootdev);
bootdev = g_strdup(argument);
} else if (nm_streq(tag, "nameserver")) {
word = get_word(&argument, '\0');
if (word) {
if (!nameservers)
nameservers = g_ptr_array_new_with_free_func(g_free);
g_ptr_array_add(nameservers, g_strdup(word));
}
if (argument && *argument)
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
} else if (nm_streq(tag, "rd.iscsi.ibft") && _nm_utils_ascii_str_to_bool(argument, TRUE))
reader_read_all_connections_from_fw(reader, sysfs_dir);
else if (nm_streq(tag, "rd.bootif"))
2018-08-09 18:02:51 +02:00
ignore_bootif = !_nm_utils_ascii_str_to_bool(argument, TRUE);
else if (nm_streq(tag, "rd.neednet"))
neednet = _nm_utils_ascii_str_to_bool(argument, TRUE);
else if (nm_streq(tag, "rd.znet")) {
if (!znets)
znets = g_ptr_array_new_with_free_func(g_free);
g_ptr_array_add(znets, g_strdup(argument));
} else if (nm_streq(tag, "rd.znet_ifname")) {
reader_parse_znet_ifname(reader, argument);
} else if (g_ascii_strcasecmp(tag, "BOOTIF") == 0) {
nm_clear_g_free(&bootif_val);
bootif_val = g_strdup(argument);
} else if (nm_streq(tag, "rd.ethtool"))
reader_parse_ethtool(reader, argument);
}
for (i = 0; i < reader->vlan_parents->len; i++) {
NMConnection *connection;
NMSettingIPConfig *s_ip;
/* Disable IP configuration for parent connections of VLANs,
* unless those interfaces were explicitly configured otherwise. */
connection = reader_get_connection(reader, reader->vlan_parents->pdata[i], NULL, TRUE);
if (!g_hash_table_contains(reader->explicit_ip_connections, connection)) {
s_ip = nm_connection_get_setting_ip4_config(connection);
if (s_ip) {
g_object_set(s_ip,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
NULL);
}
s_ip = nm_connection_get_setting_ip6_config(connection);
if (s_ip) {
g_object_set(s_ip,
NM_SETTING_IP_CONFIG_METHOD,
NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
NULL);
}
}
}
2018-08-09 18:02:51 +02:00
if (ignore_bootif)
nm_clear_g_free(&bootif_val);
if (bootif_val) {
NMConnection *connection;
2018-08-09 18:02:51 +02:00
NMSettingWired *s_wired;
const char *bootif = bootif_val;
char prefix[4];
if (!nm_utils_hwaddr_valid(bootif, ETH_ALEN)) {
strncpy(prefix, bootif, 3);
prefix[3] = '\0';
if (NM_IN_STRSET(prefix, "01-", "01:", "00-", "00:")
&& nm_utils_hwaddr_valid(&bootif[3], ETH_ALEN)) {
/*
* BOOTIF MAC address can be prefixed with a hardware type identifier.
* "01" stays for "wired", "00" is also accepted as it means "undefined".
* No others are known.
*/
bootif += 3;
}
}
connection = reader_get_connection(reader, NULL, NM_SETTING_WIRED_SETTING_NAME, FALSE);
if (!connection)
connection = reader_get_default_connection(reader);
2018-08-09 18:02:51 +02:00
s_wired = nm_connection_get_setting_wired(connection);
if (nm_connection_get_interface_name(connection)
|| (nm_setting_wired_get_mac_address(s_wired)
&& !nm_utils_hwaddr_matches(nm_setting_wired_get_mac_address(s_wired),
-1,
bootif,
-1))) {
connection = reader_create_connection(reader,
"bootif_connection",
"BOOTIF Connection",
NULL,
bootif,
NM_SETTING_WIRED_SETTING_NAME,
NM_CONNECTION_MULTI_CONNECT_SINGLE);
} else {
g_object_set(s_wired, NM_SETTING_WIRED_MAC_ADDRESS, bootif, NULL);
}
2018-08-09 18:02:51 +02:00
}
if (bootdev) {
NMConnection *connection;
connection = reader_get_connection(reader, bootdev, NULL, TRUE);
reader->bootdev_connection = connection;
connection_set_needed(connection);
}
if (neednet) {
if (!(etc_connections_dir && g_file_test(etc_connections_dir, G_FILE_TEST_IS_DIR))
&& g_hash_table_size(reader->hash) == 0) {
/* Make sure there's some connection. */
reader_get_default_connection(reader);
}
g_hash_table_foreach(reader->hash, connection_set_needed_cb, NULL);
}
if (routes)
reader_add_routes(reader, routes);
if (nameservers)
reader_add_nameservers(reader, nameservers);
if (znets) {
for (i = 0; i < znets->len; i++)
reader_parse_rd_znet(reader, znets->pdata[i], net_ifnames);
}
if (g_hash_table_size(reader->znet_ifnames)) {
_LOGW(LOGD_CORE, "Mismatch between rd.znet_ifname and rd.znet");
}
g_hash_table_foreach(reader->hash, _normalize_conn, NULL);
NM_SET_OUT(hostname, g_steal_pointer(&reader->hostname));
NM_SET_OUT(carrier_timeout_sec, reader->carrier_timeout_sec);
return reader_destroy(reader, FALSE);
2018-08-09 18:02:51 +02:00
}