2017-11-18 17:09:20 +01:00
|
|
|
/* SPDX-License-Identifier: LGPL-2.1+ */
|
2013-10-28 20:59:56 +01:00
|
|
|
|
2013-11-09 22:19:42 +01:00
|
|
|
#include <arpa/inet.h>
|
2015-10-24 22:58:24 +02:00
|
|
|
#include <linux/if.h>
|
|
|
|
#include <netinet/ether.h>
|
2013-10-28 20:59:56 +01:00
|
|
|
|
2018-01-11 00:39:12 +01:00
|
|
|
#include "sd-id128.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "sd-ndisc.h"
|
|
|
|
|
2015-10-27 03:01:06 +01:00
|
|
|
#include "alloc-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "condition.h"
|
|
|
|
#include "conf-parser.h"
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
#include "device-util.h"
|
2014-06-28 00:00:06 +02:00
|
|
|
#include "dhcp-lease-internal.h"
|
2016-05-31 13:00:54 +02:00
|
|
|
#include "ether-addr-util.h"
|
2015-11-16 22:09:36 +01:00
|
|
|
#include "hexdecoct.h"
|
2013-11-02 02:13:48 +01:00
|
|
|
#include "log.h"
|
2015-10-26 16:18:16 +01:00
|
|
|
#include "network-internal.h"
|
|
|
|
#include "parse-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "siphash24.h"
|
2016-05-06 21:20:59 +02:00
|
|
|
#include "socket-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "string-util.h"
|
|
|
|
#include "strv.h"
|
2013-10-28 20:59:56 +01:00
|
|
|
#include "utf8.h"
|
2013-10-29 15:59:45 +01:00
|
|
|
#include "util.h"
|
2013-10-28 20:59:56 +01:00
|
|
|
|
2018-08-22 07:30:49 +02:00
|
|
|
const char *net_get_name(sd_device *device) {
|
2014-08-11 22:44:51 +02:00
|
|
|
const char *name, *field;
|
2014-06-19 14:39:05 +02:00
|
|
|
|
|
|
|
assert(device);
|
2014-03-21 19:23:35 +01:00
|
|
|
|
|
|
|
/* fetch some persistent data unique (on this machine) to this device */
|
2018-08-22 07:30:49 +02:00
|
|
|
FOREACH_STRING(field, "ID_NET_NAME_ONBOARD", "ID_NET_NAME_SLOT", "ID_NET_NAME_PATH", "ID_NET_NAME_MAC")
|
|
|
|
if (sd_device_get_property_value(device, field, &name) >= 0)
|
2014-08-11 22:44:51 +02:00
|
|
|
return name;
|
2014-03-21 19:23:35 +01:00
|
|
|
|
2014-08-11 22:44:51 +02:00
|
|
|
return NULL;
|
2014-06-19 14:39:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#define HASH_KEY SD_ID128_MAKE(d3,1e,48,fa,90,fe,4b,4c,9d,af,d5,d7,a1,b1,2e,8a)
|
|
|
|
|
2018-08-22 07:30:49 +02:00
|
|
|
int net_get_unique_predictable_data(sd_device *device, uint64_t *result) {
|
2014-06-19 14:39:05 +02:00
|
|
|
size_t l, sz = 0;
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
const char *name;
|
2014-06-19 14:39:05 +02:00
|
|
|
int r;
|
|
|
|
uint8_t *v;
|
|
|
|
|
|
|
|
assert(device);
|
|
|
|
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
/* net_get_name() will return one of the device names based on stable information about the
|
|
|
|
* device. If this is not available, we fall back to using the device name. */
|
2014-06-19 14:39:05 +02:00
|
|
|
name = net_get_name(device);
|
2014-03-21 19:23:35 +01:00
|
|
|
if (!name)
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
(void) sd_device_get_sysname(device, &name);
|
|
|
|
if (!name)
|
|
|
|
return log_device_debug_errno(device, SYNTHETIC_ERRNO(ENODATA),
|
|
|
|
"No stable identifying information found");
|
2014-03-21 19:23:35 +01:00
|
|
|
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
log_device_debug(device, "Using \"%s\" as stable identifying information", name);
|
2014-03-21 19:23:35 +01:00
|
|
|
l = strlen(name);
|
|
|
|
sz = sizeof(sd_id128_t) + l;
|
2019-01-26 15:52:18 +01:00
|
|
|
v = newa(uint8_t, sz);
|
2014-03-21 19:23:35 +01:00
|
|
|
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
/* Fetch some persistent data unique to this machine */
|
2014-03-21 19:23:35 +01:00
|
|
|
r = sd_id128_get_machine((sd_id128_t*) v);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
memcpy(v + sizeof(sd_id128_t), name, l);
|
|
|
|
|
udev,networkd: use the interface name as fallback basis for MAC and IPv4LL seed
Fixes #3374. The problem is that we set MACPolicy=persistent (i.e. we would
like to generate persistent MAC addresses for interfaces which don't have a
fixed MAC address), but various virtual interfaces including bridges, tun/tap,
bonds, etc., do not not have the necessary ID_NET_NAME_* attributes and udev
would not assing the address and warn:
Could not generate persistent MAC address for $name: No such file or directory
Basic requirements which I think a solution for this needs to satisfy:
1. No changes to MAC address generation for those cases which are currently
handled successfully. This means that net_get_unique_predictable_data() must
keep returning the same answer, which in turn means net_get_name() must keep
returning the same answer. We can only add more things we look at with lower
priority so that we start to cover cases which were not covered before.
2. Like 1, but for IPvLL seed and DHCP IAD. This is less important, but "nice
to have".
3. Keep MACPolicy=persistent. If people don't want it, they can always apply
local configuration, but in general stable MACs are a good thing. I have never
seen anyone complain about that.
== Various approaches that have been proposed
=== https://github.com/systemd/systemd/issues/3374#issuecomment-223753264 (tomty89)
if !ID_BUS and INTERFACE, use INTERFACE
I think this almost does the good thing, but I don't see the reason to reject ID_BUS
(i.e. physical hardware). Stable MACs are very useful for physical hardware that has
no physical MAC.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-224733069 (teg)
if (should_rename(device, true))
This means looking at name_assign_type. In particular for
NET_NAME_USER should_rename(..., true) returns true. It only returns false
for NET_NAME_PREDICTABLE. So this would cover stuff like br0, bond0, etc,
but would not cover lo and other devices with predictable names. That doesn't
make much sense.
But did teg mean should_rename() or !should_rename()?
=== https://github.com/systemd/systemd/issues/3374#issuecomment-234628502 (tomty89):
+ if (!should_rename(device, true))
+ return udev_device_get_sysname(device)
This covers only devices with NET_NAME_PREDICTABLE. Since the problem applies as
much to bridges and such, this isn't neough.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-281745967 (grafi-tt)
+ /* if the machine doesn't provide data about the device, use the ifname specified by userspace
+ * (this is the case when the device is virtual, e.g., bridge or bond) */
+ s = udev_device_get_sysattr_value(device, "name_assign_type");
+ if (s && safe_atou(s, &type) >= 0 && type == NET_NAME_USER)
+ return udev_device_get_sysname(device);
This does not cover bond0, vnet0, tun/tap and similar.
grafi-tt also proposes patching the kernel, but *not* setting name_assign_type
seems intentional in those cases, because the device name is a result of
enumeration, not set by the userspace.
=== https://github.com/systemd/systemd/issues/3374#issuecomment-288882355 (tomty89)
(also PR #11372)
- MACAddressPolicy=persistent
This break requirement 3. above. It would solve the immediate problem, but I
think the disruption is too big.
=== This patch
This patch means that we will set a "stable" MAC for pretty much any virtual
device by default, where "stable" means keyed off the machine-id and interface
name.
It seems like a big change, but we already did this for most physical devices.
Doing it also for virtual devices doesn't seem like a big issue. It will make
the setup and monitoring of virtualized networks slightly nicer. I don't think
anyone is depending on having the MAC address changed when those devices are
destoryed and recreated. If they do, they'd have to change MACAddressPolicy=.
== Implementation
net_get_name() is called from dhcp_ident_set_iaid() so I didn't change
net_get_name() like in grafi-tt's patch, but net_get_unique_predictable_data().
net_get_unique_predictable_data() is called from get_mac() in link-config.c
and sd_ipv4ll_set_address_seed(), so both of those code paths are affected
and will now get data in some cases where they errored out previously.
The return code is changed to -ENODATA since that gives a nicer error string.
2019-01-10 16:23:49 +01:00
|
|
|
/* Let's hash the machine ID plus the device name. We use
|
|
|
|
* a fixed, but originally randomly created hash key here. */
|
2015-11-16 23:17:52 +01:00
|
|
|
*result = htole64(siphash24(v, sz, HASH_KEY.bytes));
|
2014-03-21 19:23:35 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-12-07 22:42:17 +01:00
|
|
|
static bool net_condition_test_strv(char * const *raw_patterns,
|
|
|
|
const char *string) {
|
2016-12-07 19:12:10 +01:00
|
|
|
if (strv_isempty(raw_patterns))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* If the patterns begin with "!", edit it out and negate the test. */
|
|
|
|
if (raw_patterns[0][0] == '!') {
|
|
|
|
char **patterns;
|
tree-wide: be more careful with the type of array sizes
Previously we were a bit sloppy with the index and size types of arrays,
we'd regularly use unsigned. While I don't think this ever resulted in
real issues I think we should be more careful there and follow a
stricter regime: unless there's a strong reason not to use size_t for
array sizes and indexes, size_t it should be. Any allocations we do
ultimately will use size_t anyway, and converting forth and back between
unsigned and size_t will always be a source of problems.
Note that on 32bit machines "unsigned" and "size_t" are equivalent, and
on 64bit machines our arrays shouldn't grow that large anyway, and if
they do we have a problem, however that kind of overly large allocation
we have protections for usually, but for overflows we do not have that
so much, hence let's add it.
So yeah, it's a story of the current code being already "good enough",
but I think some extra type hygiene is better.
This patch tries to be comprehensive, but it probably isn't and I missed
a few cases. But I guess we can cover that later as we notice it. Among
smaller fixes, this changes:
1. strv_length()' return type becomes size_t
2. the unit file changes array size becomes size_t
3. DNS answer and query array sizes become size_t
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=76745
2018-04-27 14:09:31 +02:00
|
|
|
size_t i, length;
|
2016-12-07 19:12:10 +01:00
|
|
|
|
|
|
|
length = strv_length(raw_patterns) + 1; /* Include the NULL. */
|
|
|
|
patterns = newa(char*, length);
|
|
|
|
patterns[0] = raw_patterns[0] + 1; /* Skip the "!". */
|
|
|
|
for (i = 1; i < length; i++)
|
|
|
|
patterns[i] = raw_patterns[i];
|
|
|
|
|
|
|
|
return !string || !strv_fnmatch(patterns, string, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return string && strv_fnmatch(raw_patterns, string, 0);
|
|
|
|
}
|
|
|
|
|
2018-05-09 04:59:18 +02:00
|
|
|
bool net_match_config(Set *match_mac,
|
2015-02-10 18:30:16 +01:00
|
|
|
char * const *match_paths,
|
|
|
|
char * const *match_drivers,
|
|
|
|
char * const *match_types,
|
|
|
|
char * const *match_names,
|
2014-02-20 19:39:49 +01:00
|
|
|
Condition *match_host,
|
|
|
|
Condition *match_virt,
|
core,udev,networkd: add ConditionKernelVersion=
This adds a simple condition/assert/match to the service manager, to
udev's .link handling and to networkd, for matching the kernel version
string.
In this version we only do fnmatch() based globbing, but we might want
to extend that to version comparisons later on, if we like, by slightly
extending the syntax with ">=", "<=", ">", "<" and "==" expressions.
2017-12-13 20:34:13 +01:00
|
|
|
Condition *match_kernel_cmdline,
|
|
|
|
Condition *match_kernel_version,
|
2014-02-21 14:51:19 +01:00
|
|
|
Condition *match_arch,
|
2014-04-15 14:21:44 +02:00
|
|
|
const struct ether_addr *dev_mac,
|
2013-11-05 01:35:26 +01:00
|
|
|
const char *dev_path,
|
2014-02-21 22:29:25 +01:00
|
|
|
const char *dev_parent_driver,
|
2013-11-05 01:35:26 +01:00
|
|
|
const char *dev_driver,
|
|
|
|
const char *dev_type,
|
2014-12-05 15:56:10 +01:00
|
|
|
const char *dev_name) {
|
2013-11-02 02:13:48 +01:00
|
|
|
|
2016-07-01 00:56:23 +02:00
|
|
|
if (match_host && condition_test(match_host) <= 0)
|
2014-12-04 18:12:55 +01:00
|
|
|
return false;
|
2014-02-20 19:39:49 +01:00
|
|
|
|
2016-07-01 00:56:23 +02:00
|
|
|
if (match_virt && condition_test(match_virt) <= 0)
|
2014-12-04 18:12:55 +01:00
|
|
|
return false;
|
2014-02-20 19:39:49 +01:00
|
|
|
|
core,udev,networkd: add ConditionKernelVersion=
This adds a simple condition/assert/match to the service manager, to
udev's .link handling and to networkd, for matching the kernel version
string.
In this version we only do fnmatch() based globbing, but we might want
to extend that to version comparisons later on, if we like, by slightly
extending the syntax with ">=", "<=", ">", "<" and "==" expressions.
2017-12-13 20:34:13 +01:00
|
|
|
if (match_kernel_cmdline && condition_test(match_kernel_cmdline) <= 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (match_kernel_version && condition_test(match_kernel_version) <= 0)
|
2014-12-04 18:12:55 +01:00
|
|
|
return false;
|
2014-02-20 19:39:49 +01:00
|
|
|
|
2016-07-01 00:56:23 +02:00
|
|
|
if (match_arch && condition_test(match_arch) <= 0)
|
2014-12-04 18:12:55 +01:00
|
|
|
return false;
|
2014-02-21 14:51:19 +01:00
|
|
|
|
2018-07-07 11:39:01 +02:00
|
|
|
if (match_mac && (!dev_mac || !set_contains(match_mac, dev_mac)))
|
2014-12-04 18:12:55 +01:00
|
|
|
return false;
|
2013-11-02 02:13:48 +01:00
|
|
|
|
2016-12-07 19:12:10 +01:00
|
|
|
if (!net_condition_test_strv(match_paths, dev_path))
|
2015-02-14 00:38:22 +01:00
|
|
|
return false;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2016-12-07 19:12:10 +01:00
|
|
|
if (!net_condition_test_strv(match_drivers, dev_driver))
|
2015-02-14 00:38:22 +01:00
|
|
|
return false;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2016-12-07 19:12:10 +01:00
|
|
|
if (!net_condition_test_strv(match_types, dev_type))
|
2015-02-14 00:38:22 +01:00
|
|
|
return false;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2016-12-07 19:12:10 +01:00
|
|
|
if (!net_condition_test_strv(match_names, dev_name))
|
2015-02-14 00:38:22 +01:00
|
|
|
return false;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2014-12-04 18:12:55 +01:00
|
|
|
return true;
|
2013-11-02 02:13:48 +01:00
|
|
|
}
|
2013-10-28 20:59:56 +01:00
|
|
|
|
2014-02-20 19:39:49 +01:00
|
|
|
int config_parse_net_condition(const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
|
|
|
unsigned section_line,
|
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
|
|
|
|
|
|
|
ConditionType cond = ltype;
|
|
|
|
Condition **ret = data;
|
|
|
|
bool negate;
|
|
|
|
Condition *c;
|
|
|
|
_cleanup_free_ char *s = NULL;
|
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
negate = rvalue[0] == '!';
|
|
|
|
if (negate)
|
|
|
|
rvalue++;
|
|
|
|
|
|
|
|
s = strdup(rvalue);
|
|
|
|
if (!s)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
c = condition_new(cond, s, false, negate);
|
|
|
|
if (!c)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
if (*ret)
|
|
|
|
condition_free(*ret);
|
|
|
|
|
|
|
|
*ret = c;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-06 21:20:59 +02:00
|
|
|
int config_parse_ifnames(
|
|
|
|
const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
|
|
|
unsigned section_line,
|
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
2015-02-10 18:30:16 +01:00
|
|
|
|
|
|
|
char ***sv = data;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
for (;;) {
|
|
|
|
_cleanup_free_ char *word = NULL;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = extract_first_word(&rvalue, &word, NULL, 0);
|
2016-05-09 15:42:23 +02:00
|
|
|
if (r < 0) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, 0, "Failed to parse interface name list: %s", rvalue);
|
|
|
|
return 0;
|
|
|
|
}
|
2016-05-06 06:07:31 +02:00
|
|
|
if (r == 0)
|
|
|
|
break;
|
2015-02-10 18:30:16 +01:00
|
|
|
|
2016-05-06 21:20:59 +02:00
|
|
|
if (!ifname_valid(word)) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, 0, "Interface name is not valid or too long, ignoring assignment: %s", rvalue);
|
2015-02-10 18:30:16 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = strv_push(sv, word);
|
2015-02-10 18:30:16 +01:00
|
|
|
if (r < 0)
|
|
|
|
return log_oom();
|
2016-05-06 06:07:31 +02:00
|
|
|
|
|
|
|
word = NULL;
|
2015-02-10 18:30:16 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-25 01:33:04 +01:00
|
|
|
int config_parse_ifalias(const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
2013-11-19 16:17:55 +01:00
|
|
|
unsigned section_line,
|
2013-11-25 01:33:04 +01:00
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
|
|
|
|
|
|
|
char **s = data;
|
2015-01-10 00:33:46 +01:00
|
|
|
_cleanup_free_ char *n = NULL;
|
2013-11-25 01:33:04 +01:00
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
n = strdup(rvalue);
|
|
|
|
if (!n)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
if (!ascii_is_valid(n) || strlen(n) >= IFALIASZ) {
|
2015-09-30 18:22:42 +02:00
|
|
|
log_syntax(unit, LOG_ERR, filename, line, 0, "Interface alias is not ASCII clean or is too long, ignoring assignment: %s", rvalue);
|
2013-11-25 01:33:04 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-11-01 19:24:57 +01:00
|
|
|
if (isempty(n))
|
|
|
|
*s = mfree(*s);
|
2018-03-22 16:53:26 +01:00
|
|
|
else
|
2018-11-01 19:24:57 +01:00
|
|
|
free_and_replace(*s, n);
|
2013-11-25 01:33:04 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-10-28 20:59:56 +01:00
|
|
|
int config_parse_hwaddr(const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
2013-11-19 16:17:55 +01:00
|
|
|
unsigned section_line,
|
2013-10-28 20:59:56 +01:00
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
2018-05-04 10:36:40 +02:00
|
|
|
|
|
|
|
_cleanup_free_ struct ether_addr *n = NULL;
|
2013-10-28 20:59:56 +01:00
|
|
|
struct ether_addr **hwaddr = data;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
2013-10-29 15:59:45 +01:00
|
|
|
n = new0(struct ether_addr, 1);
|
2013-10-28 20:59:56 +01:00
|
|
|
if (!n)
|
|
|
|
return log_oom();
|
|
|
|
|
2018-05-04 10:36:40 +02:00
|
|
|
r = ether_addr_from_string(rvalue, n);
|
|
|
|
if (r < 0) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, r, "Not a valid MAC address, ignoring assignment: %s", rvalue);
|
2013-10-28 20:59:56 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-11-01 19:25:22 +01:00
|
|
|
free_and_replace(*hwaddr, n);
|
2013-10-28 20:59:56 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2013-11-09 22:19:42 +01:00
|
|
|
|
2018-05-06 06:47:15 +02:00
|
|
|
int config_parse_hwaddrs(const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
|
|
|
unsigned section_line,
|
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
|
|
|
|
|
|
|
_cleanup_set_free_free_ Set *s = NULL;
|
|
|
|
const char *p = rvalue;
|
|
|
|
Set **hwaddrs = data;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
if (isempty(rvalue)) {
|
|
|
|
/* Empty assignment resets the list */
|
2018-05-09 04:59:18 +02:00
|
|
|
*hwaddrs = set_free_free(*hwaddrs);
|
2018-05-06 06:47:15 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
s = set_new(ðer_addr_hash_ops);
|
|
|
|
if (!s)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
_cleanup_free_ char *word = NULL;
|
|
|
|
_cleanup_free_ struct ether_addr *n = NULL;
|
|
|
|
|
|
|
|
r = extract_first_word(&p, &word, NULL, 0);
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
|
|
|
if (r == -ENOMEM)
|
|
|
|
return log_oom();
|
|
|
|
if (r < 0) {
|
|
|
|
log_syntax(unit, LOG_WARNING, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-05-09 04:59:18 +02:00
|
|
|
n = new(struct ether_addr, 1);
|
2018-05-06 06:47:15 +02:00
|
|
|
if (!n)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
r = ether_addr_from_string(word, n);
|
|
|
|
if (r < 0) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, 0, "Not a valid MAC address, ignoring: %s", word);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = set_put(s, n);
|
|
|
|
if (r < 0)
|
|
|
|
return log_oom();
|
|
|
|
if (r > 0)
|
|
|
|
n = NULL; /* avoid cleanup */
|
|
|
|
}
|
|
|
|
|
|
|
|
r = set_ensure_allocated(hwaddrs, ðer_addr_hash_ops);
|
|
|
|
if (r < 0)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
r = set_move(*hwaddrs, s);
|
|
|
|
if (r < 0)
|
|
|
|
return log_oom();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-02 21:32:42 +02:00
|
|
|
int config_parse_bridge_port_priority(
|
|
|
|
const char *unit,
|
|
|
|
const char *filename,
|
|
|
|
unsigned line,
|
|
|
|
const char *section,
|
|
|
|
unsigned section_line,
|
|
|
|
const char *lvalue,
|
|
|
|
int ltype,
|
|
|
|
const char *rvalue,
|
|
|
|
void *data,
|
|
|
|
void *userdata) {
|
|
|
|
|
|
|
|
uint16_t i;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(filename);
|
|
|
|
assert(lvalue);
|
|
|
|
assert(rvalue);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
r = safe_atou16(rvalue, &i);
|
|
|
|
if (r < 0) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, r,
|
|
|
|
"Failed to parse bridge port priority, ignoring: %s", rvalue);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i > LINK_BRIDGE_PORT_PRIORITY_MAX) {
|
|
|
|
log_syntax(unit, LOG_ERR, filename, line, r,
|
|
|
|
"Bridge port priority is larger than maximum %u, ignoring: %s", LINK_BRIDGE_PORT_PRIORITY_MAX, rvalue);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*((uint16_t *)data) = i;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-12-14 16:25:01 +01:00
|
|
|
size_t serialize_in_addrs(FILE *f,
|
|
|
|
const struct in_addr *addresses,
|
|
|
|
size_t size,
|
|
|
|
bool with_leading_space,
|
|
|
|
bool (*predicate)(const struct in_addr *addr)) {
|
|
|
|
size_t count;
|
|
|
|
size_t i;
|
2014-05-18 22:02:42 +02:00
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(addresses);
|
|
|
|
|
2018-12-14 16:25:01 +01:00
|
|
|
count = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
if (predicate && !predicate(&addresses[i]))
|
|
|
|
continue;
|
|
|
|
if (with_leading_space)
|
|
|
|
fputc(' ', f);
|
|
|
|
else
|
|
|
|
with_leading_space = true;
|
|
|
|
fputs(inet_ntoa(addresses[i]), f);
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return count;
|
2014-05-18 22:02:42 +02:00
|
|
|
}
|
|
|
|
|
2014-07-17 01:39:46 +02:00
|
|
|
int deserialize_in_addrs(struct in_addr **ret, const char *string) {
|
2014-05-18 22:02:42 +02:00
|
|
|
_cleanup_free_ struct in_addr *addresses = NULL;
|
2014-07-17 01:39:46 +02:00
|
|
|
int size = 0;
|
2014-05-18 22:02:42 +02:00
|
|
|
|
|
|
|
assert(ret);
|
|
|
|
assert(string);
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
for (;;) {
|
|
|
|
_cleanup_free_ char *word = NULL;
|
2014-05-18 22:02:42 +02:00
|
|
|
struct in_addr *new_addresses;
|
|
|
|
int r;
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = extract_first_word(&string, &word, NULL, 0);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
|
|
|
|
2018-02-27 19:09:22 +01:00
|
|
|
new_addresses = reallocarray(addresses, size + 1, sizeof(struct in_addr));
|
2014-05-18 22:02:42 +02:00
|
|
|
if (!new_addresses)
|
|
|
|
return -ENOMEM;
|
|
|
|
else
|
|
|
|
addresses = new_addresses;
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = inet_pton(AF_INET, word, &(addresses[size]));
|
2014-05-18 22:02:42 +02:00
|
|
|
if (r <= 0)
|
|
|
|
continue;
|
|
|
|
|
2016-02-23 05:32:04 +01:00
|
|
|
size++;
|
2014-05-18 22:02:42 +02:00
|
|
|
}
|
|
|
|
|
2018-12-15 00:45:46 +01:00
|
|
|
*ret = size > 0 ? TAKE_PTR(addresses) : NULL;
|
2014-05-18 22:02:42 +02:00
|
|
|
|
2014-07-17 01:39:46 +02:00
|
|
|
return size;
|
2014-05-18 22:02:42 +02:00
|
|
|
}
|
|
|
|
|
2016-06-02 20:35:13 +02:00
|
|
|
void serialize_in6_addrs(FILE *f, const struct in6_addr *addresses, size_t size) {
|
2015-07-06 11:50:47 +02:00
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(addresses);
|
|
|
|
assert(size);
|
|
|
|
|
2016-06-02 20:35:13 +02:00
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
char buffer[INET6_ADDRSTRLEN];
|
|
|
|
|
|
|
|
fputs(inet_ntop(AF_INET6, addresses+i, buffer, sizeof(buffer)), f);
|
|
|
|
|
|
|
|
if (i < size - 1)
|
|
|
|
fputc(' ', f);
|
|
|
|
}
|
2015-07-06 11:50:47 +02:00
|
|
|
}
|
|
|
|
|
2014-07-17 01:39:46 +02:00
|
|
|
int deserialize_in6_addrs(struct in6_addr **ret, const char *string) {
|
2014-05-18 22:02:42 +02:00
|
|
|
_cleanup_free_ struct in6_addr *addresses = NULL;
|
2014-07-17 01:39:46 +02:00
|
|
|
int size = 0;
|
2014-05-18 22:02:42 +02:00
|
|
|
|
|
|
|
assert(ret);
|
|
|
|
assert(string);
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
for (;;) {
|
|
|
|
_cleanup_free_ char *word = NULL;
|
2014-05-18 22:02:42 +02:00
|
|
|
struct in6_addr *new_addresses;
|
|
|
|
int r;
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = extract_first_word(&string, &word, NULL, 0);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
|
|
|
|
2018-02-27 19:09:22 +01:00
|
|
|
new_addresses = reallocarray(addresses, size + 1, sizeof(struct in6_addr));
|
2014-05-18 22:02:42 +02:00
|
|
|
if (!new_addresses)
|
|
|
|
return -ENOMEM;
|
|
|
|
else
|
|
|
|
addresses = new_addresses;
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = inet_pton(AF_INET6, word, &(addresses[size]));
|
2014-05-18 22:02:42 +02:00
|
|
|
if (r <= 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size++;
|
|
|
|
}
|
|
|
|
|
2018-03-22 16:53:26 +01:00
|
|
|
*ret = TAKE_PTR(addresses);
|
2014-05-18 22:02:42 +02:00
|
|
|
|
2014-07-17 01:39:46 +02:00
|
|
|
return size;
|
2014-05-18 22:02:42 +02:00
|
|
|
}
|
2014-06-28 00:00:06 +02:00
|
|
|
|
2016-01-20 14:44:14 +01:00
|
|
|
void serialize_dhcp_routes(FILE *f, const char *key, sd_dhcp_route **routes, size_t size) {
|
2014-06-28 00:00:06 +02:00
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
assert(routes);
|
|
|
|
assert(size);
|
|
|
|
|
|
|
|
fprintf(f, "%s=", key);
|
|
|
|
|
2014-11-18 14:59:42 +01:00
|
|
|
for (i = 0; i < size; i++) {
|
2016-01-20 14:44:14 +01:00
|
|
|
struct in_addr dest, gw;
|
|
|
|
uint8_t length;
|
|
|
|
|
|
|
|
assert_se(sd_dhcp_route_get_destination(routes[i], &dest) >= 0);
|
|
|
|
assert_se(sd_dhcp_route_get_gateway(routes[i], &gw) >= 0);
|
|
|
|
assert_se(sd_dhcp_route_get_destination_prefix_length(routes[i], &length) >= 0);
|
|
|
|
|
|
|
|
fprintf(f, "%s/%" PRIu8, inet_ntoa(dest), length);
|
|
|
|
fprintf(f, ",%s%s", inet_ntoa(gw), (i < (size - 1)) ? " ": "");
|
2014-11-18 14:59:42 +01:00
|
|
|
}
|
2014-06-28 00:00:06 +02:00
|
|
|
|
|
|
|
fputs("\n", f);
|
|
|
|
}
|
|
|
|
|
|
|
|
int deserialize_dhcp_routes(struct sd_dhcp_route **ret, size_t *ret_size, size_t *ret_allocated, const char *string) {
|
|
|
|
_cleanup_free_ struct sd_dhcp_route *routes = NULL;
|
|
|
|
size_t size = 0, allocated = 0;
|
|
|
|
|
|
|
|
assert(ret);
|
|
|
|
assert(ret_size);
|
|
|
|
assert(ret_allocated);
|
|
|
|
assert(string);
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
/* WORD FORMAT: dst_ip/dst_prefixlen,gw_ip */
|
|
|
|
for (;;) {
|
|
|
|
_cleanup_free_ char *word = NULL;
|
2014-06-28 00:00:06 +02:00
|
|
|
char *tok, *tok_end;
|
|
|
|
unsigned n;
|
|
|
|
int r;
|
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
r = extract_first_word(&string, &word, NULL, 0);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (r == 0)
|
|
|
|
break;
|
2014-06-28 00:00:06 +02:00
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
if (!GREEDY_REALLOC(routes, allocated, size + 1))
|
2014-06-29 21:39:08 +02:00
|
|
|
return -ENOMEM;
|
2014-06-28 00:00:06 +02:00
|
|
|
|
2016-05-06 06:07:31 +02:00
|
|
|
tok = word;
|
2014-06-28 00:00:06 +02:00
|
|
|
|
|
|
|
/* get the subnet */
|
|
|
|
tok_end = strchr(tok, '/');
|
|
|
|
if (!tok_end)
|
|
|
|
continue;
|
|
|
|
*tok_end = '\0';
|
|
|
|
|
|
|
|
r = inet_aton(tok, &routes[size].dst_addr);
|
|
|
|
if (r == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
tok = tok_end + 1;
|
|
|
|
|
|
|
|
/* get the prefixlen */
|
|
|
|
tok_end = strchr(tok, ',');
|
|
|
|
if (!tok_end)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*tok_end = '\0';
|
|
|
|
|
|
|
|
r = safe_atou(tok, &n);
|
|
|
|
if (r < 0 || n > 32)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
routes[size].dst_prefixlen = (uint8_t) n;
|
|
|
|
tok = tok_end + 1;
|
|
|
|
|
|
|
|
/* get the gateway */
|
|
|
|
r = inet_aton(tok, &routes[size].gw_addr);
|
|
|
|
if (r == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
size++;
|
|
|
|
}
|
|
|
|
|
|
|
|
*ret_size = size;
|
|
|
|
*ret_allocated = allocated;
|
2018-03-22 16:53:26 +01:00
|
|
|
*ret = TAKE_PTR(routes);
|
2014-06-28 00:00:06 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-08-01 05:18:51 +02:00
|
|
|
|
2015-08-26 23:05:34 +02:00
|
|
|
int serialize_dhcp_option(FILE *f, const char *key, const void *data, size_t size) {
|
2015-08-01 05:18:51 +02:00
|
|
|
_cleanup_free_ char *hex_buf = NULL;
|
|
|
|
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
hex_buf = hexmem(data, size);
|
|
|
|
if (hex_buf == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
fprintf(f, "%s=%s\n", key, hex_buf);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|