morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

network-generator: relax requirement for peer address, route destination, and gateway

Browse Source 
No functional changes, as the caller already sets them.
This commit is contained in:
Yu Watanabe
2023-11-08 03:49:12 +09:00
parent 38bf0a2361
commit 13a462b9d5
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/generator/network-generator.c
View File

@@ -119,7 +119,7 @@ static int address_new(Network *network, int family, unsigned char prefixlen,
.family = family,
.prefixlen = prefixlen,
.address = *addr,
.peer = *peer,
.peer = peer ? *peer : IN_ADDR_NULL,
};
LIST_PREPEND(addresses, network->addresses, address);
@@ -146,6 +146,8 @@ static int route_new(Network *network, int family, unsigned char prefixlen,
Route *route;
assert(network);
assert(IN_SET(family, AF_INET, AF_INET6));
assert(dest || gateway);
route = new(Route, 1);
if (!route)
@@ -155,7 +157,7 @@ static int route_new(Network *network, int family, unsigned char prefixlen,
.family = family,
.prefixlen = prefixlen,
.dest = dest ? *dest : IN_ADDR_NULL,
.gateway = *gateway,
.gateway = gateway ? *gateway : IN_ADDR_NULL,
};
LIST_PREPEND(routes, network->routes, route);
@@ -426,7 +428,8 @@ static int network_set_route(Context *context, const char *ifname, int family, u
Network *network;
int r;
if (!in_addr_is_set(family, gateway))
if (!(dest && in_addr_is_set(family, dest)) &&
!(gateway && in_addr_is_set(family, gateway)))
return 0;
network = network_get(context, ifname);
@@ -1150,8 +1153,9 @@ static int route_dump(Route *route, FILE *f) {
if (in_addr_is_set(route->family, &route->dest))
fprintf(f, "Destination=%s\n",
IN_ADDR_PREFIX_TO_STRING(route->family, &route->dest, route->prefixlen));
fprintf(f, "Gateway=%s\n",
IN_ADDR_TO_STRING(route->family, &route->gateway));
if (in_addr_is_set(route->family, &route->gateway))
fprintf(f, "Gateway=%s\n",
IN_ADDR_TO_STRING(route->family, &route->gateway));
return 0;
}