sd-dhcp-client/net-util: make netmask_to_prefixlen generic

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

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index f746f2dcc4dc3ddb64a61c80c340fc5c16c7d4b1..f021918311234aa0c3b038181de7305878ff7e13 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -26,6 +26,7 @@
 #include "libudev-private.h"
 #include "util.h"
 #include "bus-util.h"
+#include "net-util.h"
 
 int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
@@ -166,7 +167,11 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST)
-                log_warning_link(link, "could not set route: %s", strerror(-r));
+                log_struct_link(LOG_WARNING, link,
+                                "MESSAGE=%s: could not set route: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
 
         /* we might have received an old reply after moving back to SETTING_ADDRESSES,
          * ignore it */
@@ -237,7 +242,7 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST)
-                log_struct_link(LOG_ERR, link,
+                log_struct_link(LOG_WARNING, link,
                                 "MESSAGE=%s: could not set address: %s",
                                 link->ifname, strerror(-r),
                                 "ERRNO=%d", -r,
@@ -305,8 +310,12 @@ static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdat
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0 && r != -EEXIST)
-                log_warning_link(link, "could not drop address: %s", strerror(-r));
+        if (r < 0 && r != -ENOENT)
+                log_struct_link(LOG_WARNING, link,
+                                "MESSAGE=%s: could not drop address: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
 
         return 1;
 }
@@ -367,8 +376,12 @@ static int set_mtu_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0 && r != -EEXIST)
-                log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+        if (r < 0)
+                log_struct_link(LOG_WARNING, link,
+                                "MESSAGE=%s: could not set MTU: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
 
         return 1;
 }
@@ -410,7 +423,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         struct in_addr address;
         struct in_addr netmask;
         struct in_addr gateway;
-        int prefixlen;
+        unsigned prefixlen;
         int r;
 
         assert(link);
@@ -431,6 +444,12 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
 
         if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
             event == DHCP_EVENT_STOP) {
+                if (link->network->dhcp_critical) {
+                        log_warning_link(link, "DHCPv4 connection considered system critical, "
+                                         "ignoring request to reconfigure it down.");
+                        return;
+                }
+
                 if (link->dhcp_address) {
                         address_drop(link->dhcp_address, link, address_drop_handler);
 
@@ -478,12 +497,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
                 return;
         }
 
-        prefixlen = sd_dhcp_client_prefixlen(&netmask);
-        if (prefixlen < 0) {
-                log_warning_link(link, "DHCP error: no prefixlen");
-                link_enter_failed(link);
-                return;
-        }
+        prefixlen = net_netmask_to_prefixlen(&netmask);
 
         r = sd_dhcp_client_get_router(client, &gateway);
         if (r < 0) {
@@ -522,7 +536,7 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
                 addr->family = AF_INET;
                 addr->in_addr.in = address;
                 addr->prefixlen = prefixlen;
-                addr->netmask = netmask;
+                addr->broadcast.s_addr = address.s_addr | ~netmask.s_addr;
 
                 r = route_new_dynamic(&rt);
                 if (r < 0) {
@@ -687,9 +701,13 @@ static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning_link(link,
-                                 "could not bring up interface: %s", strerror(-r));
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%s: could not bring up interface: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
                 link_enter_failed(link);
+                return 1;
         }
 
         link_update_flags(link, link->flags | IFF_UP);
@@ -763,8 +781,11 @@ static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_error_link(link, "could not enslave: %s",
-                               strerror(-r));
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%s: could not enslave: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
                 link_enter_failed(link);
                 return 1;
         }
@@ -786,13 +807,13 @@ static int link_enter_enslave(Link *link) {
 
         link->state = LINK_STATE_ENSLAVING;
 
-        if (!link->network->bridge && !link->network->bond)
+        if (!link->network->bridge && !link->network->bond && !link->network->vlan)
                 return link_enslaved(link);
 
         if (link->network->bridge) {
                 log_struct_link(LOG_DEBUG, link,
                                 "MESSAGE=%s: enslaving by '%s'",
-                                link->network->bridge->name,
+                                link->ifname, link->network->bridge->name,
                                 NETDEV(link->network->bridge),
                                 NULL);
 
@@ -800,7 +821,7 @@ static int link_enter_enslave(Link *link) {
                 if (r < 0) {
                         log_struct_link(LOG_WARNING, link,
                                         "MESSAGE=%s: could not enslave by '%s': %s",
-                                        link->network->bridge->name, strerror(-r),
+                                        link->ifname, link->network->bridge->name, strerror(-r),
                                         NETDEV(link->network->bridge),
                                         NULL);
                         link_enter_failed(link);
@@ -810,19 +831,19 @@ static int link_enter_enslave(Link *link) {
                 link->enslaving ++;
         }
 
-        if (link->network->bond) {
+        if (link->network->vlan) {
                 log_struct_link(LOG_DEBUG, link,
                                 "MESSAGE=%s: enslaving by '%s'",
-                                link->network->bond->name,
-                                NETDEV(link->network->bond),
+                                link->ifname, link->network->vlan->name,
+                                NETDEV(link->network->vlan),
                                 NULL);
 
-                r = netdev_enslave(link->network->bond, link, &enslave_handler);
+                r = netdev_enslave(link->network->vlan, link, &enslave_handler);
                 if (r < 0) {
                         log_struct_link(LOG_WARNING, link,
                                         "MESSAGE=%s: could not enslave by '%s': %s",
-                                        link->network->bond->name, strerror(-r),
-                                        NETDEV(link->network->bond),
+                                        link->ifname, link->network->vlan->name,
+                                        strerror(-r), NETDEV(link->network->vlan),
                                         NULL);
                         link_enter_failed(link);
                         return r;
@@ -845,8 +866,13 @@ static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning_link(link, "could not get state: %s", strerror(-r));
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%s: could not get state: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
                 link_enter_failed(link);
+                return 1;
         }
 
         log_debug_link(link, "got link state");