X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=dec33e88eec71832bd0f8c899d43fb2087efc7d3;hp=2fa77f15ffb961665744b56e83fa3d562276482c;hb=eb0ea358b688a6f83ff305c6b825c61f12b6dcb8;hpb=5d4795f3722911ccd7953c0cf112c1f7624ea834

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 2fa77f15f..dec33e88e 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -95,7 +95,7 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
         Network *network;
         int r;
         uint64_t ifindex;
-        const char *devtype;
+        NetdevKind kind;
 
         assert(m);
         assert(device);
@@ -113,9 +113,9 @@ int link_add(Manager *m, struct udev_device *device, Link **ret) {
 
         *ret = link;
 
-        devtype = udev_device_get_devtype(device);
-        if (streq_ptr(devtype, "bridge")) {
-                r = bridge_set_link(m, link);
+        kind = netdev_kind_from_string(udev_device_get_devtype(device));
+        if (kind != _NETDEV_KIND_INVALID) {
+                r = netdev_set_link(m, kind, link);
                 if (r < 0 && r != -ENOENT)
                         return r;
         }
@@ -166,7 +166,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 +241,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 +309,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 +375,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;
 }
@@ -431,6 +443,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);
 
@@ -522,7 +540,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 +705,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);
@@ -729,11 +751,11 @@ static int link_up(Link *link) {
         return 0;
 }
 
-static int link_bridge_joined(Link *link) {
+static int link_enslaved(Link *link) {
         int r;
 
         assert(link);
-        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+        assert(link->state == LINK_STATE_ENSLAVING);
         assert(link->network);
 
         r = link_up(link);
@@ -748,67 +770,90 @@ static int link_bridge_joined(Link *link) {
         return 0;
 }
 
-static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
 
         assert(link);
-        assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
+        assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED);
         assert(link->network);
 
+        link->enslaving --;
+
         if (link->state == LINK_STATE_FAILED)
                 return 1;
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
                 log_struct_link(LOG_ERR, link,
-                                "MESSAGE=%s: could not join bridge '%s': %s",
-                                link->ifname, link->network->bridge->name, strerror(-r),
-                                BRIDGE(link->network->bridge),
+                                "MESSAGE=%s: could not enslave: %s",
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
                                 NULL);
                 link_enter_failed(link);
                 return 1;
         }
 
-        log_struct_link(LOG_DEBUG, link,
-                        "MESSAGE=%s: joined bridge '%s'",
-                        link->network->bridge->name,
-                        BRIDGE(link->network->bridge),
-                        NULL);
+        log_debug_link(link, "enslaved");
 
-        link_bridge_joined(link);
+        if (link->enslaving == 0)
+                link_enslaved(link);
 
         return 1;
 }
 
-static int link_enter_join_bridge(Link *link) {
+static int link_enter_enslave(Link *link) {
         int r;
 
         assert(link);
         assert(link->network);
         assert(link->state == _LINK_STATE_INVALID);
 
-        link->state = LINK_STATE_JOINING_BRIDGE;
+        link->state = LINK_STATE_ENSLAVING;
 
-        if (!link->network->bridge)
-                return link_bridge_joined(link);
+        if (!link->network->bridge && !link->network->bond && !link->network->vlan)
+                return link_enslaved(link);
 
-        log_struct_link(LOG_DEBUG, link,
-                        "MESSAGE=%s: joining bridge '%s'",
-                        link->network->bridge->name,
-                        BRIDGE(link->network->bridge),
-                        NULL);
-        log_debug_link(link, "joining bridge");
+        if (link->network->bridge) {
+                log_struct_link(LOG_DEBUG, link,
+                                "MESSAGE=%s: enslaving by '%s'",
+                                link->ifname, link->network->bridge->name,
+                                NETDEV(link->network->bridge),
+                                NULL);
 
-        r = bridge_join(link->network->bridge, link, &bridge_handler);
-        if (r < 0) {
-                log_struct_link(LOG_WARNING, link,
-                                "MESSAGE=%s: could not join bridge '%s': %s",
-                                link->network->bridge->name, strerror(-r),
-                                BRIDGE(link->network->bridge),
+                r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+                if (r < 0) {
+                        log_struct_link(LOG_WARNING, link,
+                                        "MESSAGE=%s: could not enslave by '%s': %s",
+                                        link->ifname, link->network->bridge->name, strerror(-r),
+                                        NETDEV(link->network->bridge),
+                                        NULL);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->enslaving ++;
+        }
+
+        if (link->network->vlan) {
+                log_struct_link(LOG_DEBUG, link,
+                                "MESSAGE=%s: enslaving by '%s'",
+                                link->ifname, link->network->vlan->name,
+                                NETDEV(link->network->vlan),
                                 NULL);
-                link_enter_failed(link);
-                return r;
+
+                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->ifname, link->network->vlan->name,
+                                        strerror(-r), NETDEV(link->network->vlan),
+                                        NULL);
+                        link_enter_failed(link);
+                        return r;
+                }
+
+                link->enslaving ++;
         }
 
         return 0;
@@ -825,8 +870,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");
@@ -875,7 +925,7 @@ int link_configure(Link *link) {
                 return r;
         }
 
-        return link_enter_join_bridge(link);
+        return link_enter_enslave(link);
 }
 
 int link_update(Link *link, sd_rtnl_message *m) {