diff options
| author | Emil Renner Berthing <systemd@esmil.dk> | 2014-09-05 11:56:02 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-09-08 15:08:27 +0200 |
| commit | 46b0c76e2c355c0d0cc4792abb98cde07b28bc53 (patch) | |
| tree | c5a3a16ed64d3d3470852f415293380361f6bfa8 /src/network/networkd-dhcp4.c | |
| parent | 4bd5ace3e78ec0ca4c174bc875e3d9f6e1ae7405 (diff) | |
networkd: add preferred source to dhcp4 gateway route
This makes DHCPv4 and IPv4LL coexist peacefully.
[tomegun: apply to both the dhcp routes, use in_addr_is_null() rather than a
separate variable to indicate when prefsrc should be applied]
Diffstat (limited to 'src/network/networkd-dhcp4.c')
| -rw-r--r-- | src/network/networkd-dhcp4.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 5e4ff2b80b..b87fa73082 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -67,9 +67,18 @@ static int link_set_dhcp_routes(Link *link) { return r; } if (r >= 0) { + struct in_addr address; _cleanup_route_free_ Route *route = NULL; _cleanup_route_free_ Route *route_gw = NULL; + r = sd_dhcp_lease_get_address(link->dhcp_lease, &address); + if (r < 0) { + log_warning_link(link, + "DHCP error: could not get address: %s", + strerror(-r)); + return r; + } + r = route_new_dynamic(&route, RTPROT_DHCP); if (r < 0) { log_error_link(link, @@ -92,6 +101,7 @@ static int link_set_dhcp_routes(Link *link) { route_gw->family = AF_INET; route_gw->dst_addr.in = gateway; route_gw->dst_prefixlen = 32; + route_gw->prefsrc_addr.in = address; route_gw->scope = RT_SCOPE_LINK; route_gw->metrics = DHCP_ROUTE_METRIC; @@ -107,6 +117,7 @@ static int link_set_dhcp_routes(Link *link) { route->family = AF_INET; route->in_addr.in = gateway; + route->prefsrc_addr.in = address; route->metrics = DHCP_ROUTE_METRIC; r = route_configure(route, link, &dhcp4_route_handler); |