From f048a16b464295a4e0a4f4c1210f06343ad31231 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 1 Jan 2014 15:16:10 +0100 Subject: networkd: distinguish between static and dynamic addresses/routes Static addresses/routes are associated with a network. Dynamic addresses/routes are associtade with links (as the corresponding network may be shared by several links). --- src/network/networkd-link.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/networkd-link.c') diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index cc5441bc3f..ea94966f18 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -172,10 +172,10 @@ static int link_enter_set_routes(Link *link) { link->state = LINK_STATE_SETTING_ROUTES; - if (!link->network->routes) + if (!link->network->static_routes) return link_enter_configured(link); - LIST_FOREACH(routes, route, link->network->routes) { + LIST_FOREACH(static_routes, route, link->network->static_routes) { r = route_configure(route, link, &route_handler); if (r < 0) { log_warning("Could not set routes for link '%s'", link->ifname); @@ -225,10 +225,10 @@ static int link_enter_set_addresses(Link *link) { link->state = LINK_STATE_SETTING_ADDRESSES; - if (!link->network->addresses) + if (!link->network->static_addresses) return link_enter_set_routes(link); - LIST_FOREACH(addresses, address, link->network->addresses) { + LIST_FOREACH(static_addresses, address, link->network->static_addresses) { r = address_configure(address, link, &address_handler); if (r < 0) { log_warning("Could not set addresses for link '%s'", link->ifname); -- cgit v1.2.3-54-g00ecf