2020-12-23 22:21:36 +01:00
|
|
|
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
2019-09-25 13:13:40 +02:00
|
|
|
/*
|
2018-08-09 18:02:51 +02:00
|
|
|
* Copyright (C) 2018 Red Hat, Inc.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "nm-default.h"
|
|
|
|
|
|
2020-12-13 16:08:56 +01:00
|
|
|
#include <linux/if_ether.h>
|
|
|
|
|
#include <linux/if_infiniband.h>
|
|
|
|
|
|
2019-01-31 13:44:13 +01:00
|
|
|
#include "nm-core-internal.h"
|
2018-08-09 18:02:51 +02:00
|
|
|
#include "nm-initrd-generator.h"
|
2020-05-04 10:03:21 +02:00
|
|
|
#include "systemd/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__))
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
typedef struct {
|
|
|
|
|
GHashTable * hash;
|
|
|
|
|
GPtrArray * array;
|
2020-11-18 14:27:19 +01:00
|
|
|
GPtrArray * vlan_parents;
|
|
|
|
|
GHashTable * explicit_ip_connections;
|
2020-03-21 22:28:31 +01:00
|
|
|
NMConnection *bootdev_connection; /* connection for bootdev=$ifname */
|
|
|
|
|
NMConnection *default_connection; /* connection not bound to any ifname */
|
2020-05-04 10:03:21 +02:00
|
|
|
char * hostname;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 09:57:51 +02:00
|
|
|
/* Parameters to be set for all connections */
|
|
|
|
|
gboolean ignore_auto_dns;
|
2020-05-04 10:26:21 +02:00
|
|
|
int dhcp_timeout;
|
2020-08-27 17:43:54 +02:00
|
|
|
char * dhcp4_vci;
|
2021-01-18 03:15:14 +09:00
|
|
|
|
|
|
|
|
gint64 carrier_timeout_sec;
|
2020-03-21 09:57:57 +01:00
|
|
|
} Reader;
|
|
|
|
|
|
|
|
|
|
static Reader *
|
|
|
|
|
reader_new(void)
|
2019-07-02 10:03:00 +02:00
|
|
|
{
|
2020-03-21 09:57:57 +01:00
|
|
|
Reader *reader;
|
2019-07-02 10:03:00 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
reader = g_slice_new(Reader);
|
|
|
|
|
*reader = (Reader){
|
2020-11-18 14:27:19 +01:00
|
|
|
.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(),
|
2020-03-21 09:57:57 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return reader;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static GHashTable *
|
|
|
|
|
reader_destroy(Reader *reader, gboolean free_hash)
|
|
|
|
|
{
|
|
|
|
|
gs_unref_hashtable GHashTable *hash = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
g_ptr_array_unref(reader->array);
|
2020-11-18 14:27:19 +01:00
|
|
|
g_ptr_array_unref(reader->vlan_parents);
|
|
|
|
|
g_hash_table_unref(reader->explicit_ip_connections);
|
2020-03-21 09:57:57 +01:00
|
|
|
hash = g_steal_pointer(&reader->hash);
|
2020-05-04 10:03:21 +02:00
|
|
|
nm_clear_g_free(&reader->hostname);
|
2020-08-27 17:43:54 +02:00
|
|
|
nm_clear_g_free(&reader->dhcp4_vci);
|
2020-03-21 09:57:57 +01:00
|
|
|
nm_g_slice_free(reader);
|
|
|
|
|
if (!free_hash)
|
|
|
|
|
return g_steal_pointer(&hash);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static NMConnection *
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_connection(Reader *reader, const char *name, NMConnection *connection_take)
|
2020-03-21 09:57:57 +01:00
|
|
|
{
|
|
|
|
|
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;
|
2019-07-02 10:03:00 +02:00
|
|
|
}
|
|
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
/* Returns a new connection owned by the reader */
|
2019-11-11 10:56:31 +01:00
|
|
|
static NMConnection *
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_create_connection(Reader * reader,
|
|
|
|
|
const char * basename,
|
|
|
|
|
const char * id,
|
|
|
|
|
const char * ifname,
|
2020-09-22 17:54:18 +02:00
|
|
|
const char * mac,
|
2020-03-25 10:17:03 +01:00
|
|
|
const char * type_name,
|
|
|
|
|
NMConnectionMultiConnect multi_connect)
|
2019-11-11 10:56:31 +01:00
|
|
|
{
|
|
|
|
|
NMConnection *connection;
|
|
|
|
|
NMSetting * setting;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_add_connection(reader, basename, nm_simple_connection_new());
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
/* Start off assuming dynamic IP configurations. */
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
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,
|
2020-05-04 09:57:51 +02:00
|
|
|
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS,
|
|
|
|
|
reader->ignore_auto_dns,
|
2020-05-04 10:26:21 +02:00
|
|
|
NM_SETTING_IP_CONFIG_DHCP_TIMEOUT,
|
|
|
|
|
reader->dhcp_timeout,
|
2020-08-27 17:43:54 +02:00
|
|
|
NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
|
|
|
|
|
reader->dhcp4_vci,
|
2019-11-11 10:56:31 +01:00
|
|
|
NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
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,
|
2019-12-04 18:25:39 +01:00
|
|
|
NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE,
|
|
|
|
|
(int) NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_EUI64,
|
2020-05-04 09:57:51 +02:00
|
|
|
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS,
|
|
|
|
|
reader->ignore_auto_dns,
|
2020-05-04 10:26:21 +02:00
|
|
|
NM_SETTING_IP_CONFIG_DHCP_TIMEOUT,
|
|
|
|
|
reader->dhcp_timeout,
|
2019-11-11 10:56:31 +01:00
|
|
|
NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
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_utils_uuid_generate_a(),
|
|
|
|
|
NM_SETTING_CONNECTION_INTERFACE_NAME,
|
|
|
|
|
ifname,
|
|
|
|
|
NM_SETTING_CONNECTION_TYPE,
|
|
|
|
|
type_name,
|
|
|
|
|
NM_SETTING_CONNECTION_MULTI_CONNECT,
|
|
|
|
|
multi_connect,
|
|
|
|
|
NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-10-15 09:44:52 +02:00
|
|
|
if (nm_streq0(type_name, NM_SETTING_INFINIBAND_SETTING_NAME)) {
|
|
|
|
|
setting = nm_setting_infiniband_new();
|
2020-09-22 17:54:18 +02:00
|
|
|
nm_connection_add_setting(connection, setting);
|
2020-10-15 09:44:52 +02:00
|
|
|
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);
|
|
|
|
|
}
|
2020-09-22 17:54:18 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
return connection;
|
|
|
|
|
}
|
|
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
static NMConnection *
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_get_default_connection(Reader *reader)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
2020-03-21 22:28:31 +01:00
|
|
|
NMConnection *con;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!reader->default_connection) {
|
2020-03-25 10:17:03 +01:00
|
|
|
con = reader_create_connection(reader,
|
|
|
|
|
"default_connection",
|
|
|
|
|
"Wired Connection",
|
|
|
|
|
NULL,
|
2020-09-22 17:54:18 +02:00
|
|
|
NULL,
|
2020-03-25 10:17:03 +01:00
|
|
|
NM_SETTING_WIRED_SETTING_NAME,
|
|
|
|
|
NM_CONNECTION_MULTI_CONNECT_MULTIPLE);
|
2020-07-03 15:26:28 +02:00
|
|
|
nm_connection_add_setting(con, nm_setting_wired_new());
|
2020-03-21 22:28:31 +01:00
|
|
|
reader->default_connection = con;
|
2019-01-14 16:10:44 +01:00
|
|
|
}
|
2020-03-21 22:28:31 +01:00
|
|
|
return reader->default_connection;
|
|
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
static NMConnection *
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_get_connection(Reader * reader,
|
2020-09-22 17:54:18 +02:00
|
|
|
const char *iface_spec,
|
2020-03-25 10:17:03 +01:00
|
|
|
const char *type_name,
|
|
|
|
|
gboolean create_if_missing)
|
2020-03-21 22:28:31 +01:00
|
|
|
{
|
|
|
|
|
NMConnection *connection = NULL;
|
|
|
|
|
NMSetting * setting;
|
2020-09-22 17:54:18 +02:00
|
|
|
const char * ifname = NULL;
|
|
|
|
|
gs_free char *mac = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-09-22 17:54:18 +02:00
|
|
|
if (iface_spec) {
|
|
|
|
|
if (nm_utils_is_valid_iface_name(iface_spec, NULL))
|
|
|
|
|
ifname = iface_spec;
|
|
|
|
|
else {
|
2020-10-15 09:44:52 +02:00
|
|
|
mac = nm_utils_hwaddr_canonical(iface_spec, -1);
|
2020-09-22 17:54:18 +02:00
|
|
|
if (!mac)
|
|
|
|
|
_LOGW(LOGD_CORE, "invalid interface '%s'", iface_spec);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-09-22 17:54:18 +02:00
|
|
|
if (!ifname && !mac) {
|
2020-03-21 09:57:57 +01:00
|
|
|
NMConnection * candidate;
|
|
|
|
|
NMSettingConnection *s_con;
|
|
|
|
|
guint i;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-07-02 10:03:00 +02:00
|
|
|
/*
|
|
|
|
|
* 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).
|
|
|
|
|
*/
|
2020-03-21 09:57:57 +01:00
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
if (type_name == NULL && nm_setting_connection_get_master(s_con) == NULL) {
|
|
|
|
|
connection = candidate;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
if (type_name != NULL
|
|
|
|
|
&& nm_streq(nm_setting_connection_get_connection_type(s_con), type_name)) {
|
|
|
|
|
connection = candidate;
|
|
|
|
|
break;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2020-03-21 09:57:57 +01:00
|
|
|
}
|
2020-03-21 22:28:31 +01:00
|
|
|
} else
|
2020-09-22 17:54:18 +02:00
|
|
|
connection = g_hash_table_lookup(reader->hash, (gpointer) ifname ?: mac);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 10:56:31 +01:00
|
|
|
if (!connection) {
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!create_if_missing)
|
|
|
|
|
return NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-10-15 09:44:52 +02:00
|
|
|
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;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-09-22 17:54:18 +02:00
|
|
|
connection = reader_create_connection(reader,
|
|
|
|
|
ifname ?: mac,
|
|
|
|
|
ifname ?: (mac ?: "Wired Connection"),
|
|
|
|
|
ifname,
|
|
|
|
|
mac,
|
|
|
|
|
type_name,
|
2020-03-25 10:17:03 +01:00
|
|
|
NM_CONNECTION_MULTI_CONNECT_SINGLE);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-03-21 22:28:31 +01:00
|
|
|
setting = (NMSetting *) nm_connection_get_setting_connection(connection);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
return connection;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
get_word(char **argument, const char separator)
|
|
|
|
|
{
|
|
|
|
|
char *word;
|
|
|
|
|
int nest = 0;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (*argument == NULL)
|
|
|
|
|
return NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (**argument == '[') {
|
|
|
|
|
nest++;
|
|
|
|
|
(*argument)++;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
word = *argument;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
while (**argument != '\0') {
|
|
|
|
|
if (nest && **argument == ']') {
|
|
|
|
|
**argument = '\0';
|
|
|
|
|
(*argument)++;
|
|
|
|
|
nest--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (nest == 0 && **argument == separator) {
|
|
|
|
|
**argument = '\0';
|
|
|
|
|
(*argument)++;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
(*argument)++;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
return *word ? word : NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2020-07-02 10:04:08 +02:00
|
|
|
connection_set(NMConnection *connection,
|
|
|
|
|
const char * setting_name,
|
|
|
|
|
const char * property,
|
|
|
|
|
const char * value)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
|
|
|
|
NMSetting * setting;
|
2020-07-02 10:04:08 +02:00
|
|
|
GType setting_type;
|
|
|
|
|
nm_auto_unref_gtypeclass GObjectClass *object_class = NULL;
|
|
|
|
|
GParamSpec * spec;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-07-02 10:04:08 +02:00
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-07-02 10:04:08 +02:00
|
|
|
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
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-10-22 08:26:45 +02:00
|
|
|
if (G_IS_PARAM_SPEC_UINT(spec)) {
|
|
|
|
|
guint v;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-10-22 08:26:45 +02:00
|
|
|
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'",
|
2020-07-02 10:04:08 +02:00
|
|
|
setting_name,
|
|
|
|
|
property,
|
|
|
|
|
value);
|
2018-10-22 08:26:45 +02:00
|
|
|
}
|
|
|
|
|
} else if (G_IS_PARAM_SPEC_STRING(spec))
|
2018-08-09 18:02:51 +02:00
|
|
|
g_object_set(setting, property, value, NULL);
|
|
|
|
|
else
|
2020-07-02 10:04:08 +02:00
|
|
|
_LOGW(LOGD_CORE, "Don't know how to set '%s' of %s", property, setting_name);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
|
|
|
|
|
2020-01-11 14:13:19 +01:00
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_read_all_connections_from_fw(Reader *reader, const char *sysfs_dir)
|
2020-01-11 14:13:19 +01:00
|
|
|
{
|
|
|
|
|
gs_unref_hashtable GHashTable *ibft = NULL;
|
2020-03-25 18:34:01 +01:00
|
|
|
NMConnection * dt_connection;
|
2020-01-11 14:13:19 +01:00
|
|
|
const char * mac;
|
|
|
|
|
GHashTable * nic;
|
|
|
|
|
const char * index;
|
|
|
|
|
GError * error = NULL;
|
2020-03-21 15:33:29 +01:00
|
|
|
guint i, length;
|
|
|
|
|
gs_free const char ** keys = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-01-11 14:13:19 +01:00
|
|
|
ibft = nmi_ibft_read(sysfs_dir);
|
2020-03-21 15:33:29 +01:00
|
|
|
keys = nm_utils_strdict_get_keys(ibft, TRUE, &length);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 15:33:29 +01:00
|
|
|
for (i = 0; i < length; i++) {
|
2020-03-25 18:34:01 +01:00
|
|
|
gs_unref_object NMConnection *connection = NULL;
|
2020-03-21 09:57:57 +01:00
|
|
|
gs_free char * name = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 15:33:29 +01:00
|
|
|
mac = keys[i];
|
|
|
|
|
nic = g_hash_table_lookup(ibft, mac);
|
2020-03-25 18:34:01 +01:00
|
|
|
connection = nm_simple_connection_new();
|
2020-01-11 14:13:19 +01:00
|
|
|
index = g_hash_table_lookup(nic, "index");
|
|
|
|
|
if (!index) {
|
|
|
|
|
_LOGW(LOGD_CORE, "Ignoring an iBFT entry without an index");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-01-11 14:13:19 +01:00
|
|
|
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);
|
2020-03-25 18:34:01 +01:00
|
|
|
continue;
|
2020-01-11 14:13:19 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
name = g_strdup_printf("ibft%s", index);
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_connection(reader, name, g_steal_pointer(&connection));
|
2020-01-11 14:13:19 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 18:34:01 +01:00
|
|
|
dt_connection = nmi_dt_reader_parse(sysfs_dir);
|
2020-03-21 09:57:57 +01:00
|
|
|
if (dt_connection)
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_connection(reader, "ofw", dt_connection);
|
2020-01-11 14:13:19 +01:00
|
|
|
}
|
|
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
|
|
|
|
NMConnection * connection;
|
|
|
|
|
NMSettingIPConfig *s_ip4 = NULL, *s_ip6 = NULL;
|
|
|
|
|
gs_unref_hashtable GHashTable *ibft = NULL;
|
|
|
|
|
const char * tmp;
|
2020-11-25 17:39:48 +01:00
|
|
|
const char * tmp2;
|
2018-08-09 18:02:51 +02:00
|
|
|
const char * kind = NULL;
|
|
|
|
|
const char * client_ip = NULL;
|
|
|
|
|
const char * peer = NULL;
|
|
|
|
|
const char * gateway_ip = NULL;
|
|
|
|
|
const char * netmask = NULL;
|
|
|
|
|
const char * client_hostname = NULL;
|
2020-09-22 17:54:18 +02:00
|
|
|
const char * iface_spec = NULL;
|
2018-08-09 18:02:51 +02:00
|
|
|
const char * mtu = NULL;
|
|
|
|
|
const char * macaddr = NULL;
|
|
|
|
|
int client_ip_family = AF_UNSPEC;
|
|
|
|
|
int client_ip_prefix = -1;
|
|
|
|
|
const char * dns[2] = {
|
|
|
|
|
0,
|
|
|
|
|
};
|
|
|
|
|
int dns_addr_family[2] = {
|
|
|
|
|
0,
|
2020-09-28 16:03:33 +02:00
|
|
|
};
|
2018-08-09 18:02:51 +02:00
|
|
|
int i;
|
|
|
|
|
GError *error = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (!*argument)
|
|
|
|
|
return;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
tmp = get_word(&argument, ':');
|
|
|
|
|
if (!*argument) {
|
2020-07-23 21:42:56 +02:00
|
|
|
/* ip={dhcp|on|any|dhcp6|auto6|link6|ibft} */
|
2018-08-09 18:02:51 +02:00
|
|
|
kind = tmp;
|
|
|
|
|
} else {
|
2020-11-25 17:39:48 +01:00
|
|
|
tmp2 = get_word(&argument, ':');
|
|
|
|
|
if (NM_IN_STRSET(tmp2,
|
|
|
|
|
"none",
|
|
|
|
|
"off",
|
|
|
|
|
"dhcp",
|
|
|
|
|
"on"
|
|
|
|
|
"any",
|
|
|
|
|
"dhcp6",
|
|
|
|
|
"auto",
|
|
|
|
|
"auto6",
|
2020-07-23 21:42:56 +02:00
|
|
|
"link6",
|
2020-11-25 17:39:48 +01:00
|
|
|
"ibft")) {
|
2020-07-23 21:42:56 +02:00
|
|
|
/* <ifname>:{none|off|dhcp|on|any|dhcp6|auto|auto6|link6|ibft} */
|
2020-11-25 17:39:48 +01:00
|
|
|
iface_spec = tmp;
|
|
|
|
|
kind = tmp2;
|
|
|
|
|
} 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, ':');
|
2020-09-22 17:54:18 +02:00
|
|
|
iface_spec = get_word(&argument, ':');
|
2020-11-25 17:39:48 +01:00
|
|
|
kind = get_word(&argument, ':');
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 10:03:21 +02:00
|
|
|
if (client_hostname && !nm_sd_hostname_is_valid(client_hostname, FALSE))
|
|
|
|
|
client_hostname = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 10:03:21 +02:00
|
|
|
if (client_hostname) {
|
|
|
|
|
g_free(reader->hostname);
|
|
|
|
|
reader->hostname = g_strdup(client_hostname);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
tmp = get_word(&argument, ':');
|
2020-11-17 11:10:54 +01:00
|
|
|
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, ':');
|
2020-11-17 11:10:54 +01:00
|
|
|
dns_addr_family[1] = get_ip_address_family(dns[1], FALSE);
|
2019-08-02 09:24:01 +02:00
|
|
|
if (*argument)
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
|
2018-08-09 18:02:51 +02:00
|
|
|
} else {
|
|
|
|
|
mtu = tmp;
|
|
|
|
|
macaddr = argument;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-06-03 17:55:30 +02:00
|
|
|
if (iface_spec == NULL && NM_IN_STRSET(kind, "fw", "ibft")) {
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_read_all_connections_from_fw(reader, sysfs_dir);
|
2018-08-09 18:02:51 +02:00
|
|
|
return;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
/* Parsing done, construct the NMConnection. */
|
2020-09-22 17:54:18 +02:00
|
|
|
if (iface_spec)
|
|
|
|
|
connection = reader_get_connection(reader, iface_spec, NULL, TRUE);
|
2020-03-21 22:28:31 +01:00
|
|
|
else
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_default_connection(reader);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-11-18 14:27:19 +01:00
|
|
|
g_hash_table_add(reader->explicit_ip_connections, g_object_ref(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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (netmask && *netmask) {
|
2020-09-23 10:58:03 +02:00
|
|
|
gboolean is_ipv4 = client_ip_family == AF_INET;
|
2018-08-09 18:02:51 +02:00
|
|
|
NMIPAddr addr;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-09-23 10:58:03 +02:00
|
|
|
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);
|
2019-07-02 09:45:22 +02:00
|
|
|
else
|
2020-09-23 10:58:03 +02:00
|
|
|
client_ip_prefix = _nm_utils_ascii_str_to_int64(netmask, 10, 0, is_ipv4 ? 32 : 128, -1);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-07-02 09:45:22 +02:00
|
|
|
if (client_ip_prefix == -1)
|
2019-07-02 09:31:46 +02:00
|
|
|
_LOGW(LOGD_CORE, "Invalid IP mask: %s", netmask);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +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;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-09-18 18:14:09 +02:00
|
|
|
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;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +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) {
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Invalid address '%s': %s", client_ip, error->message);
|
2018-08-09 18:02:51 +02:00
|
|
|
g_clear_error(&error);
|
|
|
|
|
}
|
2020-11-17 11:10:54 +01:00
|
|
|
} else
|
|
|
|
|
nm_assert_not_reached();
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (address) {
|
|
|
|
|
switch (client_ip_family) {
|
|
|
|
|
case AF_INET:
|
|
|
|
|
g_object_set(s_ip4,
|
2018-09-18 18:44:42 +02:00
|
|
|
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,
|
2018-09-18 18:44:42 +02:00
|
|
|
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:
|
2020-11-17 11:10:54 +01:00
|
|
|
nm_assert_not_reached();
|
2018-08-09 18:02:51 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
nm_ip_address_unref(address);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
|
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
/* Dynamic IP configuration configured explicitly. */
|
2020-06-03 17:55:30 +02:00
|
|
|
if (NM_IN_STRSET(kind, "none", "off")) {
|
2018-08-09 18:02:51 +02:00
|
|
|
if (nm_setting_ip_config_get_num_addresses(s_ip6) == 0) {
|
|
|
|
|
g_object_set(s_ip6,
|
2020-06-22 12:00:22 +02:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD,
|
2020-10-08 22:19:12 +02:00
|
|
|
NM_SETTING_IP6_CONFIG_METHOD_DISABLED,
|
2018-09-18 18:44:42 +02:00
|
|
|
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,
|
2018-09-18 18:44:42 +02:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD,
|
|
|
|
|
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
|
|
|
|
|
NULL);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-06-03 17:55:30 +02:00
|
|
|
} else if (nm_streq0(kind, "dhcp")) {
|
2018-08-09 18:02:51 +02:00
|
|
|
g_object_set(s_ip4,
|
2018-09-18 18:44:42 +02:00
|
|
|
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,
|
2020-06-22 11:56:51 +02:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD,
|
|
|
|
|
NM_SETTING_IP6_CONFIG_METHOD_AUTO,
|
2018-09-18 18:44:42 +02:00
|
|
|
NULL);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-07-08 21:43:55 +02:00
|
|
|
} else if (NM_IN_STRSET(kind, "auto6", "dhcp6")) {
|
2018-09-18 18:44:42 +02:00
|
|
|
g_object_set(s_ip4, 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,
|
2018-09-18 18:44:42 +02:00
|
|
|
NM_SETTING_IP_CONFIG_METHOD,
|
|
|
|
|
NM_SETTING_IP4_CONFIG_METHOD_DISABLED,
|
|
|
|
|
NULL);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-07-23 21:42:56 +02:00
|
|
|
} else if (nm_streq0(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);
|
|
|
|
|
}
|
2020-06-03 17:55:30 +02:00
|
|
|
} else if (nm_streq0(kind, "ibft")) {
|
2020-09-22 17:54:18 +02:00
|
|
|
NMSettingWired *s_wired;
|
|
|
|
|
const char * mac = NULL;
|
|
|
|
|
const char * ifname;
|
|
|
|
|
gs_free char * mac_free = NULL;
|
|
|
|
|
gs_free char * address_path = NULL;
|
2018-08-09 18:02:51 +02:00
|
|
|
GHashTable * nic = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-09-22 17:54:18 +02:00
|
|
|
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
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
|
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (mac) {
|
2020-09-22 17:54:18 +02:00
|
|
|
gs_free char *mac_up = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
mac_up = g_ascii_strup(mac, -1);
|
2020-01-11 14:13:19 +01:00
|
|
|
ibft = nmi_ibft_read(sysfs_dir);
|
2018-08-09 18:02:51 +02:00
|
|
|
nic = g_hash_table_lookup(ibft, mac_up);
|
|
|
|
|
if (!nic)
|
2020-09-22 17:54:18 +02:00
|
|
|
_LOGW(LOGD_CORE, "No iBFT NIC for %s (%s)", iface_spec, mac_up);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (nic) {
|
|
|
|
|
if (!nmi_ibft_update_connection_from_nic(connection, nic, &error)) {
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Unable to merge iBFT configuration: %s", error->message);
|
2018-08-09 18:02:51 +02:00
|
|
|
g_clear_error(&error);
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
|
|
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (gateway_ip && *gateway_ip) {
|
2020-11-17 11:10:54 +01:00
|
|
|
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:
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Invalid gateway: %s", gateway_ip);
|
2020-11-17 11:10:54 +01:00
|
|
|
break;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +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);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
|
if (dns_addr_family[i] == AF_UNSPEC)
|
|
|
|
|
break;
|
2020-01-09 12:17:41 +01:00
|
|
|
if (nm_utils_ipaddr_is_valid(dns_addr_family[i], dns[i])) {
|
2018-08-09 18:02:51 +02:00
|
|
|
switch (dns_addr_family[i]) {
|
|
|
|
|
case AF_INET:
|
|
|
|
|
nm_setting_ip_config_add_dns(s_ip4, dns[i]);
|
|
|
|
|
break;
|
|
|
|
|
case AF_INET6:
|
|
|
|
|
nm_setting_ip_config_add_dns(s_ip6, dns[i]);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Unknown address family: %s", dns[i]);
|
2018-08-09 18:02:51 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Invalid name server: %s", dns[i]);
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (mtu && *mtu)
|
2020-07-02 10:04:08 +02:00
|
|
|
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (macaddr && *macaddr)
|
2020-07-02 10:04:08 +02:00
|
|
|
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
|
2020-03-25 10:17:03 +01:00
|
|
|
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;
|
|
|
|
|
NMSettingConnection *s_con;
|
|
|
|
|
gs_free char * master_to_free = NULL;
|
|
|
|
|
const char * master;
|
|
|
|
|
char * slaves;
|
|
|
|
|
const char * slave;
|
|
|
|
|
char * opts;
|
|
|
|
|
const char * mtu = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
master = get_word(&argument, ':');
|
|
|
|
|
if (!master)
|
2019-11-07 15:29:31 +01:00
|
|
|
master = master_to_free = g_strdup_printf("%s0", default_name ?: type_name);
|
2018-08-09 18:02:51 +02:00
|
|
|
slaves = get_word(&argument, ':');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-08-05 13:26:34 +02:00
|
|
|
if (nm_streq(type_name, NM_SETTING_BRIDGE_SETTING_NAME)) {
|
|
|
|
|
NMSettingBridge *s_bridge = nm_connection_get_setting_bridge(connection);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-08-05 13:26:34 +02:00
|
|
|
/* 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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
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;
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
mtu = get_word(&argument, ':');
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
do {
|
|
|
|
|
slave = get_word(&slaves, ',');
|
|
|
|
|
if (slave == NULL)
|
|
|
|
|
slave = "eth0";
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
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);
|
|
|
|
|
if (mtu)
|
2020-07-02 10:04:08 +02:00
|
|
|
connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
|
2018-08-09 18:02:51 +02:00
|
|
|
} while (slaves && *slaves != '\0');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (argument && *argument)
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_routes(Reader *reader, GPtrArray *array)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
2020-03-21 22:28:31 +01:00
|
|
|
guint i;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
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;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
argument = array->pdata[i];
|
|
|
|
|
net = get_word(&argument, ':');
|
|
|
|
|
gateway = get_word(&argument, ':');
|
|
|
|
|
interface = get_word(&argument, ':');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (interface)
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_connection(reader, interface, NULL, TRUE);
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!connection)
|
|
|
|
|
connection = reader->bootdev_connection;
|
|
|
|
|
if (!connection)
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_connection(reader, interface, NULL, FALSE);
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!connection)
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_default_connection(reader);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
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;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2020-03-21 22:28:31 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (gateway && *gateway) {
|
|
|
|
|
if (!nm_utils_parse_inaddr_bin(family, gateway, &family, &gateway_addr)) {
|
|
|
|
|
_LOGW(LOGD_CORE, "Unrecognized address: %s", gateway);
|
|
|
|
|
continue;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2020-03-21 22:28:31 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
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
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01: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;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
nm_setting_ip_config_add_route(s_ip, route);
|
|
|
|
|
nm_ip_route_unref(route);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_vlan(Reader *reader, char *argument)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
|
|
|
|
NMConnection * connection;
|
|
|
|
|
NMSettingVlan *s_vlan;
|
|
|
|
|
const char * vlan;
|
|
|
|
|
const char * phy;
|
|
|
|
|
const char * vlanid;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
vlan = get_word(&argument, ':');
|
|
|
|
|
phy = get_word(&argument, ':');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
for (vlanid = vlan + strlen(vlan); vlanid > vlan; vlanid--) {
|
|
|
|
|
if (!g_ascii_isdigit(*(vlanid - 1)))
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_connection(reader, vlan, NM_SETTING_VLAN_SETTING_NAME, TRUE);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
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,
|
2020-04-01 12:50:53 +02:00
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
if (argument && *argument)
|
2018-10-06 11:26:42 +02:00
|
|
|
_LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
|
2020-11-18 14:27:19 +01:00
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
2019-09-20 16:25:17 +02:00
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_rd_znet(Reader *reader, char *argument, gboolean net_ifnames)
|
2019-09-20 16:25:17 +02:00
|
|
|
{
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
const char * nettype;
|
2019-09-20 16:25:17 +02:00
|
|
|
const char * subchannels[4] = {0, 0, 0, 0};
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
const char * tmp;
|
2019-10-22 16:56:38 +02:00
|
|
|
gs_free char * ifname = NULL;
|
|
|
|
|
const char * prefix;
|
2019-09-20 16:25:17 +02:00
|
|
|
NMConnection * connection;
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
NMSettingWired *s_wired;
|
2019-10-23 11:56:47 +02:00
|
|
|
static int count_ctc = 0;
|
|
|
|
|
static int count_eth = 0;
|
|
|
|
|
int index;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-09-20 16:25:17 +02:00
|
|
|
nettype = get_word(&argument, ',');
|
|
|
|
|
subchannels[0] = get_word(&argument, ',');
|
|
|
|
|
subchannels[1] = get_word(&argument, ',');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-10-22 11:18:09 +02:00
|
|
|
if (nm_streq0(nettype, "ctc")) {
|
2019-10-23 11:56:47 +02:00
|
|
|
if (net_ifnames == TRUE) {
|
|
|
|
|
prefix = "sl";
|
|
|
|
|
} else {
|
|
|
|
|
prefix = "ctc";
|
|
|
|
|
index = count_ctc++;
|
|
|
|
|
}
|
2019-10-22 11:18:09 +02:00
|
|
|
} else {
|
2019-09-20 16:25:17 +02:00
|
|
|
subchannels[2] = get_word(&argument, ',');
|
2019-10-23 11:56:47 +02:00
|
|
|
if (net_ifnames == TRUE) {
|
|
|
|
|
prefix = "en";
|
|
|
|
|
} else {
|
|
|
|
|
prefix = "eth";
|
|
|
|
|
index = count_eth++;
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
2019-10-23 11:56:47 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-10-22 16:56:38 +02:00
|
|
|
if (net_ifnames == TRUE) {
|
|
|
|
|
const char *bus_id;
|
|
|
|
|
size_t bus_id_len;
|
|
|
|
|
size_t bus_id_start;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-10-22 16:56:38 +02:00
|
|
|
/* 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;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-10-22 16:56:38 +02:00
|
|
|
ifname = g_strdup_printf("%sc%s", prefix, bus_id);
|
2019-10-23 11:56:47 +02:00
|
|
|
} else {
|
|
|
|
|
ifname = g_strdup_printf("%s%d", prefix, index);
|
2019-10-22 16:56:38 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-27 12:01:21 +02:00
|
|
|
connection = reader_get_connection(reader, ifname, NM_SETTING_WIRED_SETTING_NAME, FALSE);
|
|
|
|
|
if (!connection)
|
|
|
|
|
return;
|
2019-09-20 16:25:17 +02:00
|
|
|
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);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-09-20 16:25:17 +02:00
|
|
|
while ((tmp = get_word(&argument, ',')) != NULL) {
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
char *val;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
val = strchr(tmp, '=');
|
|
|
|
|
if (val) {
|
|
|
|
|
gs_free char *key = NULL;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
initrd: avoid assertion inparse_rd_znet() and cleanup
- nm_setting_wired_add_s390_option() asserts that a "value" argument
is given. Check that the string contains a '=' where we can split.
- pass the requested NM_SETTING_WIRED_SETTING_NAME type to get_conn().
Otherwise, @s_wired might be %NULL, resulting in an assertion.
I do wonder whether this always retrieves a connection of the
appropriate type for modification, or whether a profile could
be returned that was created for a different purpose. But that
isn't changed.
- avoid "g_strcmp0 (nettype, "ctc") != 0". I find it unexpected, that we add the
3rd subchannel component, if the nettype is "ctc" (intuitively, I'd expect it
to be the opposite). The reasons for this are not documented, but I
presume it is correct.
Anyway, using streq() makes this slightly more clear to me, as with
strcmp() I would wonder whether this was just a typo while with
streq() I'd be more confident that this is indeed intended.
- don't initialize local variables unnecessarily. The compiler would
warn if we would forget about this. Also, don'\''t use { } for a
one-line block.
2019-09-27 07:58:58 +02:00
|
|
|
key = g_strndup(tmp, val - tmp);
|
|
|
|
|
val[0] = '\0';
|
|
|
|
|
val++;
|
|
|
|
|
nm_setting_wired_add_s390_option(s_wired, key, val);
|
|
|
|
|
}
|
2019-09-20 16:25:17 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
static void
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_nameservers(Reader *reader, GPtrArray *nameservers)
|
2020-03-21 22:28:31 +01:00
|
|
|
{
|
|
|
|
|
NMConnection * connection;
|
|
|
|
|
NMSettingIPConfig *s_ip;
|
|
|
|
|
GHashTableIter iter;
|
|
|
|
|
int addr_family;
|
|
|
|
|
const char * ns;
|
|
|
|
|
guint i;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
for (i = 0; i < nameservers->len; i++) {
|
|
|
|
|
ns = nameservers->pdata[i];
|
2020-11-17 11:10:54 +01:00
|
|
|
addr_family = get_ip_address_family(ns, FALSE);
|
2020-03-21 22:28:31 +01:00
|
|
|
if (addr_family == AF_UNSPEC) {
|
|
|
|
|
_LOGW(LOGD_CORE, "Unknown address family: %s", ns);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
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();
|
2020-03-27 11:47:35 +01:00
|
|
|
continue;
|
2020-03-21 22:28:31 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
nm_setting_ip_config_add_dns(s_ip, ns);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-05 16:57:41 +02:00
|
|
|
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,
|
2020-08-12 17:35:25 +02:00
|
|
|
NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT,
|
|
|
|
|
(int) NMI_WAIT_DEVICE_TIMEOUT_MS,
|
2020-08-05 16:57:41 +02:00
|
|
|
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 *
|
2021-01-18 03:15:14 +09:00
|
|
|
nmi_cmdline_reader_parse(const char * sysfs_dir,
|
|
|
|
|
const char *const *argv,
|
|
|
|
|
char ** hostname,
|
|
|
|
|
gint64 * carrier_timeout_sec)
|
2018-08-09 18:02:51 +02:00
|
|
|
{
|
2020-03-21 09:57:57 +01:00
|
|
|
Reader * reader;
|
2018-08-09 18:02:51 +02:00
|
|
|
const char * tag;
|
|
|
|
|
gboolean ignore_bootif = FALSE;
|
2019-05-27 11:24:45 +02:00
|
|
|
gboolean neednet = FALSE;
|
2019-09-27 08:36:49 +02:00
|
|
|
gs_free char * bootif_val = NULL;
|
2020-03-21 22:28:31 +01:00
|
|
|
gs_free char * bootdev = NULL;
|
2019-10-22 16:56:38 +02:00
|
|
|
gboolean net_ifnames = TRUE;
|
2020-03-21 22:28:31 +01:00
|
|
|
gs_unref_ptrarray GPtrArray *nameservers = NULL;
|
|
|
|
|
gs_unref_ptrarray GPtrArray *routes = NULL;
|
2020-05-27 12:01:21 +02:00
|
|
|
gs_unref_ptrarray GPtrArray *znets = NULL;
|
2018-08-09 18:02:51 +02:00
|
|
|
int i;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
reader = reader_new();
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-10-22 16:56:38 +02:00
|
|
|
for (i = 0; argv[i]; i++) {
|
2020-05-04 09:57:51 +02:00
|
|
|
gs_free char *argument_clone = NULL;
|
|
|
|
|
char * argument;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 09:57:51 +02:00
|
|
|
argument_clone = g_strdup(argv[i]);
|
|
|
|
|
argument = argument_clone;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 09:57:51 +02:00
|
|
|
tag = get_word(&argument, '=');
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-06-03 17:55:30 +02:00
|
|
|
if (nm_streq(tag, "net.ifnames"))
|
|
|
|
|
net_ifnames = !nm_streq(argument, "0");
|
|
|
|
|
else if (nm_streq(tag, "rd.peerdns"))
|
2020-05-04 09:57:51 +02:00
|
|
|
reader->ignore_auto_dns = !_nm_utils_ascii_str_to_bool(argument, TRUE);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "rd.net.timeout.dhcp")) {
|
2020-05-04 10:26:21 +02:00
|
|
|
reader->dhcp_timeout = _nm_utils_ascii_str_to_int64(argument, 10, 0, G_MAXINT32, 0);
|
2020-08-27 17:43:54 +02:00
|
|
|
} else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) {
|
|
|
|
|
if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL))
|
|
|
|
|
nm_utils_strdup_reset(&reader->dhcp4_vci, argument);
|
2021-01-18 03:15:14 +09:00
|
|
|
} 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);
|
2020-05-04 10:26:21 +02:00
|
|
|
}
|
2019-10-22 16:56:38 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
for (i = 0; argv[i]; i++) {
|
2019-09-27 08:36:49 +02:00
|
|
|
gs_free char *argument_clone = NULL;
|
|
|
|
|
char * argument;
|
2020-03-21 22:28:31 +01:00
|
|
|
char * word;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-09-27 08:36:49 +02:00
|
|
|
argument_clone = g_strdup(argv[i]);
|
|
|
|
|
argument = argument_clone;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
tag = get_word(&argument, '=');
|
2020-06-03 17:55:30 +02:00
|
|
|
if (nm_streq(tag, "ip"))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_ip(reader, sysfs_dir, argument);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "rd.route")) {
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!routes)
|
|
|
|
|
routes = g_ptr_array_new_with_free_func(g_free);
|
|
|
|
|
g_ptr_array_add(routes, g_strdup(argument));
|
2020-06-03 17:55:30 +02:00
|
|
|
} else if (nm_streq(tag, "bridge"))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_master(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br");
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "bond"))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_master(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "team"))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_master(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "vlan"))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_parse_vlan(reader, argument);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "bootdev")) {
|
2020-03-21 22:28:31 +01:00
|
|
|
g_free(bootdev);
|
|
|
|
|
bootdev = g_strdup(argument);
|
2020-06-03 17:55:30 +02:00
|
|
|
} else if (nm_streq(tag, "nameserver")) {
|
2020-03-21 22:28:31 +01:00
|
|
|
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);
|
2020-06-03 17:55:30 +02:00
|
|
|
} else if (nm_streq(tag, "rd.iscsi.ibft") && _nm_utils_ascii_str_to_bool(argument, TRUE))
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_read_all_connections_from_fw(reader, sysfs_dir);
|
2020-06-03 17:55:30 +02:00
|
|
|
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);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "rd.neednet"))
|
2019-05-27 11:24:45 +02:00
|
|
|
neednet = _nm_utils_ascii_str_to_bool(argument, TRUE);
|
2020-06-03 17:55:30 +02:00
|
|
|
else if (nm_streq(tag, "rd.znet")) {
|
2020-05-27 12:01:21 +02:00
|
|
|
if (!znets)
|
|
|
|
|
znets = g_ptr_array_new_with_free_func(g_free);
|
|
|
|
|
g_ptr_array_add(znets, g_strdup(argument));
|
|
|
|
|
} else if (g_ascii_strcasecmp(tag, "BOOTIF") == 0) {
|
2019-09-27 08:36:49 +02:00
|
|
|
nm_clear_g_free(&bootif_val);
|
|
|
|
|
bootif_val = g_strdup(argument);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
}
|
|
|
|
|
|
2020-11-18 14:27:19 +01:00
|
|
|
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)
|
2019-09-27 08:36:49 +02:00
|
|
|
nm_clear_g_free(&bootif_val);
|
|
|
|
|
if (bootif_val) {
|
2018-08-09 18:02:51 +02:00
|
|
|
NMConnection * connection;
|
|
|
|
|
NMSettingWired *s_wired;
|
2019-09-27 08:36:49 +02:00
|
|
|
const char * bootif = bootif_val;
|
2020-12-23 14:21:21 +01:00
|
|
|
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;
|
|
|
|
|
}
|
2019-07-02 15:56:38 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_connection(reader, NULL, NM_SETTING_WIRED_SETTING_NAME, FALSE);
|
2020-03-21 22:28:31 +01:00
|
|
|
if (!connection)
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_default_connection(reader);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2018-08-09 18:02:51 +02:00
|
|
|
s_wired = nm_connection_get_setting_wired(connection);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2019-11-11 11:23:53 +01:00
|
|
|
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))) {
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_create_connection(reader,
|
|
|
|
|
"bootif_connection",
|
|
|
|
|
"BOOTIF Connection",
|
|
|
|
|
NULL,
|
2020-09-22 17:54:18 +02:00
|
|
|
bootif,
|
2020-03-25 10:17:03 +01:00
|
|
|
NM_SETTING_WIRED_SETTING_NAME,
|
|
|
|
|
NM_CONNECTION_MULTI_CONNECT_SINGLE);
|
2020-09-22 17:54:18 +02:00
|
|
|
} else {
|
|
|
|
|
g_object_set(s_wired, NM_SETTING_WIRED_MAC_ADDRESS, bootif, NULL);
|
2019-11-11 11:23:53 +01:00
|
|
|
}
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (bootdev) {
|
|
|
|
|
NMConnection *connection;
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-25 10:17:03 +01:00
|
|
|
connection = reader_get_connection(reader, bootdev, NULL, TRUE);
|
2020-03-21 22:28:31 +01:00
|
|
|
reader->bootdev_connection = connection;
|
2020-08-05 16:57:41 +02:00
|
|
|
connection_set_needed(connection);
|
2020-03-21 22:28:31 +01:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-08-05 16:57:41 +02:00
|
|
|
if (neednet) {
|
|
|
|
|
if (g_hash_table_size(reader->hash) == 0) {
|
|
|
|
|
/* Make sure there's some connection. */
|
|
|
|
|
reader_get_default_connection(reader);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-08-05 16:57:41 +02:00
|
|
|
g_hash_table_foreach(reader->hash, connection_set_needed_cb, NULL);
|
2019-05-27 11:24:45 +02:00
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (routes)
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_routes(reader, routes);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 22:28:31 +01:00
|
|
|
if (nameservers)
|
2020-03-25 10:17:03 +01:00
|
|
|
reader_add_nameservers(reader, nameservers);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-27 12:01:21 +02:00
|
|
|
if (znets) {
|
|
|
|
|
for (i = 0; i < znets->len; i++)
|
|
|
|
|
reader_parse_rd_znet(reader, znets->pdata[i], net_ifnames);
|
|
|
|
|
}
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
g_hash_table_foreach(reader->hash, _normalize_conn, NULL);
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2020-05-04 10:03:21 +02:00
|
|
|
NM_SET_OUT(hostname, g_steal_pointer(&reader->hostname));
|
2020-09-28 16:03:33 +02:00
|
|
|
|
2021-01-18 03:15:14 +09:00
|
|
|
NM_SET_OUT(carrier_timeout_sec, reader->carrier_timeout_sec);
|
|
|
|
|
|
2020-03-21 09:57:57 +01:00
|
|
|
return reader_destroy(reader, FALSE);
|
2018-08-09 18:02:51 +02:00
|
|
|
}
|