clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-17 22:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkd: always prefer dhcp routes over ipv4ll routes

Browse Source
This commit is contained in:
Lennart Poettering
2014-07-10 21:32:44 +02:00
parent 496a5a6970
commit 4faefc7ff8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+4 -4
View File
@@ -427,7 +427,7 @@ static int link_set_dhcp_routes(Link *link) {
route->in_addr.in = static_routes[i].gw_addr;
route->dst_addr.in = static_routes[i].dst_addr;
route->dst_prefixlen = static_routes[i].dst_prefixlen;
route->metrics = DHCP_STATIC_ROUTE_METRIC;
route->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
@@ -491,7 +491,7 @@ static int link_enter_set_routes(Link *link) {
route->family = AF_INET;
route->scope = RT_SCOPE_LINK;
route->metrics = 99;
route->metrics = IPV4LL_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
@@ -539,7 +539,7 @@ static int link_enter_set_routes(Link *link) {
route_gw->dst_addr.in = gateway;
route_gw->dst_prefixlen = 32;
route_gw->scope = RT_SCOPE_LINK;
route_gw->metrics = DHCP_STATIC_ROUTE_METRIC;
route_gw->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route_gw, link, &route_handler);
if (r < 0) {
@@ -552,7 +552,7 @@ static int link_enter_set_routes(Link *link) {
route->family = AF_INET;
route->in_addr.in = gateway;
route->metrics = DHCP_STATIC_ROUTE_METRIC;
route->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
src/network/networkd.h
+2 -1
View File
@@ -42,7 +42,8 @@
#define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU
#define VXLAN_VID_MAX (1u << 24) - 1
#define DHCP_STATIC_ROUTE_METRIC 1024
#define DHCP_ROUTE_METRIC 1024
#define IPV4LL_ROUTE_METRIC 2048
typedef struct NetDev NetDev;
typedef struct Network Network;