networkd: distinguish between static and dynamic addresses/routes

[elogind.git] / src / network / networkd-link.c

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index cc5441bc3f088e8e3d94908331fe8c78c878df4f..ea94966f18fd77f4389ecbceca1da66d63c54407 100644 (file)
--- 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;
 
 
         link->state = LINK_STATE_SETTING_ROUTES;
 

-        if (!link->network->routes)
+        if (!link->network->static_routes)

                 return link_enter_configured(link);
 
                 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);
                 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;
 
 
         link->state = LINK_STATE_SETTING_ADDRESSES;
 

-        if (!link->network->addresses)
+        if (!link->network->static_addresses)

                 return link_enter_set_routes(link);
 
                 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);
                 r = address_configure(address, link, &address_handler);
                 if (r < 0) {
                         log_warning("Could not set addresses for link '%s'", link->ifname);