These keys are mandatory in [Address]/[Route] sections. Otherwise, we
hit an assert:
ens3: setting addresses
Assertion 'address->family == 2 || address->family == 10' failed at /build/amd64-generic/tmp/portage/sys-apps/systemd-9999-r1/work/systemd-9999/src/network/networkd-address.c:137, function address_configure(). Aborting.
Reported-by: Alex Polvi <alex.polvi@coreos.com>
At the same time make sure Route's Destination and Gateway uses the same address family.
<varlistentry>
<term><varname>Address</varname></term>
<listitem>
<varlistentry>
<term><varname>Address</varname></term>
<listitem>
- <para>As in the <literal>[Network]</literal> section.</para>
+ <para>As in the <literal>[Network]</literal> section. This key is mandatory.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
<varlistentry>
<term><varname>Gateway</varname></term>
<listitem>
<varlistentry>
<term><varname>Gateway</varname></term>
<listitem>
- <para>As in the <literal>[Network]</literal> section.</para>
+ <para>As in the <literal>[Network]</literal> section. This key is mandatory.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
<varlistentry>
static int network_load_one(Manager *manager, const char *filename) {
_cleanup_network_free_ Network *network = NULL;
_cleanup_fclose_ FILE *file = NULL;
static int network_load_one(Manager *manager, const char *filename) {
_cleanup_network_free_ Network *network = NULL;
_cleanup_fclose_ FILE *file = NULL;
+ Route *route;
+ Address *address;
}
LIST_PREPEND(networks, manager->networks, network);
}
LIST_PREPEND(networks, manager->networks, network);
+
+ LIST_FOREACH(static_routes, route, network->static_routes) {
+ if (!route->family) {
+ log_warning("Route section without Gateway field configured in %s. "
+ "Ignoring", filename);
+ return 0;
+ }
+
+ if (route->dst_family && route->family != route->dst_family) {
+ log_warning("Route section with conflicting Gateway and Destination address "
+ "family configured in %s. Ignoring", filename);
+ return 0;
+ }
+ }
+
+ LIST_FOREACH(static_addresses, address, network->static_addresses) {
+ if (!address->family) {
+ log_warning("Address section without Address field configured in %s. "
+ "Ignoring", filename);
+ return 0;
+ }
+ }
+
network = NULL;
return 0;
network = NULL;
return 0;
- assert(network->manager);
-
free(network->filename);
free(network->match_mac);
free(network->filename);
free(network->match_mac);
hashmap_free(network->addresses_by_section);
hashmap_free(network->routes_by_section);
hashmap_free(network->addresses_by_section);
hashmap_free(network->routes_by_section);
- if (network->manager->networks)
+ if (network->manager && network->manager->networks)
LIST_REMOVE(networks, network->manager->networks, network);
free(network);
LIST_REMOVE(networks, network->manager->networks, network);
free(network);
- r = net_parse_inaddr(address, &n->family, &n->dst_addr);
+ r = net_parse_inaddr(address, &n->dst_family, &n->dst_addr);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Destination is invalid, ignoring assignment: %s", address);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Destination is invalid, ignoring assignment: %s", address);
n->dst_prefixlen = (unsigned char) i;
} else {
n->dst_prefixlen = (unsigned char) i;
} else {
+ switch (n->dst_family) {
case AF_INET:
n->dst_prefixlen = 32;
break;
case AF_INET:
n->dst_prefixlen = 32;
break;
uint64_t section;
unsigned char family;
uint64_t section;
unsigned char family;
+ unsigned char dst_family;
unsigned char dst_prefixlen;
union {
unsigned char dst_prefixlen;
union {