X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-netdev.c;h=762eff2f6287625f52652e5450a0a7eaf2662661;hb=ba5596ec2ed65943b66d42fbe6e9ef7ebc79216c;hp=356341a8735817c20e7c99427fe0674e9f446834;hpb=d39edfc72f9296078a18014627bf0a2543b60627;p=elogind.git

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 356341a87..762eff2f6 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -67,6 +67,11 @@ void netdev_free(NetDev *netdev) {
         free(netdev->description);
         free(netdev->name);
 
+        condition_free_list(netdev->match_host);
+        condition_free_list(netdev->match_virt);
+        condition_free_list(netdev->match_kernel);
+        condition_free_list(netdev->match_arch);
+
         free(netdev);
 }
 
@@ -141,6 +146,9 @@ static int netdev_enter_ready(NetDev *netdev) {
         assert(netdev);
         assert(netdev->name);
 
+        if (netdev->state != NETDEV_STATE_CREATING)
+                return 0;
+
         netdev->state = NETDEV_STATE_READY;
 
         log_info_netdev(netdev, "netdev ready");
@@ -286,52 +294,42 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
                 return -EINVAL;
         }
 
-        r = sd_rtnl_message_append_string(req, IFLA_INFO_KIND, kind);
+        r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, kind);
         if (r < 0) {
                 log_error_netdev(netdev,
-                                 "Could not append IFLA_INFO_KIND attribute: %s",
-                                 strerror(-r));
+                                 "Could not open IFLA_INFO_DATA container: %s",
+                                  strerror(-r));
                 return r;
         }
 
-        if (netdev->vlanid <= VLANID_MAX || netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
-                r = sd_rtnl_message_open_container(req, IFLA_INFO_DATA);
+        if (netdev->vlanid <= VLANID_MAX) {
+                r = sd_rtnl_message_append_u16(req, IFLA_VLAN_ID, netdev->vlanid);
                 if (r < 0) {
                         log_error_netdev(netdev,
-                                         "Could not open IFLA_INFO_DATA container: %s",
+                                         "Could not append IFLA_VLAN_ID attribute: %s",
                                          strerror(-r));
                         return r;
                 }
+        }
 
-                if (netdev->vlanid <= VLANID_MAX) {
-                        r = sd_rtnl_message_append_u16(req, IFLA_VLAN_ID, netdev->vlanid);
-                        if (r < 0) {
-                                log_error_netdev(netdev,
-                                                 "Could not append IFLA_VLAN_ID attribute: %s",
-                                                 strerror(-r));
-                                return r;
-                        }
-                }
-
-                if (netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
-                        r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, netdev->macvlan_mode);
-                        if (r < 0) {
-                                log_error_netdev(netdev,
-                                                 "Could not append IFLA_MACVLAN_MODE attribute: %s",
-                                                 strerror(-r));
-                                return r;
-                        }
-                }
-
-                r = sd_rtnl_message_close_container(req);
-                if (r < 0) {
-                        log_error_netdev(netdev,
-                                         "Could not close IFLA_INFO_DATA container %s",
-                                         strerror(-r));
+        if (netdev->macvlan_mode != _NETDEV_MACVLAN_MODE_INVALID) {
+        r = sd_rtnl_message_append_u32(req, IFLA_MACVLAN_MODE, netdev->macvlan_mode);
+        if (r < 0) {
+                log_error_netdev(netdev,
+                                 "Could not append IFLA_MACVLAN_MODE attribute: %s",
+                                 strerror(-r));
                         return r;
                 }
         }
 
+        r = sd_rtnl_message_close_container(req);
+        if (r < 0) {
+                log_error_netdev(netdev,
+                                 "Could not close IFLA_INFO_DATA container %s",
+                                 strerror(-r));
+                return r;
+        }
+
         r = sd_rtnl_message_close_container(req);
         if (r < 0) {
                 log_error_netdev(netdev,
@@ -381,16 +379,24 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
 }
 
 int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
+        uint16_t type;
         const char *kind;
         char *received_kind;
         int r, ifindex;
 
         assert(netdev);
-        assert(ifindex > 0);
+        assert(message);
 
-        kind = netdev_kind_to_string(netdev->kind);
-        if (!kind)
-                log_error_netdev(netdev, "Could not get kind");
+        r = sd_rtnl_message_get_type(message, &type);
+        if (r < 0) {
+                log_error_netdev(netdev, "Could not get rtnl message type");
+                return r;
+        }
+
+        if (type != RTM_NEWLINK) {
+                log_error_netdev(netdev, "Can not set ifindex from unexpected rtnl message type");
+                return -EINVAL;
+        }
 
         r = sd_rtnl_message_enter_container(message, IFLA_LINKINFO);
         if (r < 0) {
@@ -404,6 +410,13 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
                 return r;
         }
 
+        kind = netdev_kind_to_string(netdev->kind);
+        if (!kind) {
+                log_error_netdev(netdev, "Could not get kind");
+                netdev_enter_failed(netdev);
+                return -EINVAL;
+        }
+
         if (!streq(kind, received_kind)) {
                 log_error_netdev(netdev, "Received newlink with wrong KIND");
                 netdev_enter_failed(netdev);
@@ -412,19 +425,20 @@ int netdev_set_ifindex(NetDev *netdev, sd_rtnl_message *message) {
 
         r = sd_rtnl_message_link_get_ifindex(message, &ifindex);
         if (r < 0) {
-                log_struct_netdev(LOG_ERR, netdev,
-                                "MESSAGE=%s: could not get ifindex: %s",
-                                netdev->name, strerror(-r),
-                                "ERRNO=%d", -r,
-                                NULL);
+                log_error_netdev(netdev, "Could not get ifindex: %s", strerror(-r));
+                netdev_enter_failed(netdev);
+                return r;
+        } else if (ifindex <= 0) {
+                log_error_netdev(netdev, "Got invalid ifindex: %d", ifindex);
+                netdev_enter_failed(netdev);
                 return r;
         }
 
-        if (netdev->ifindex > 0) {
-                if (netdev->ifindex == ifindex)
-                        return 0;
-                else
-                        return -EEXIST;
+        if (netdev->ifindex > 0 && netdev->ifindex != ifindex) {
+                log_error_netdev(netdev, "Could not set ifindex to %d, already set to %d",
+                                 ifindex, netdev->ifindex);
+                netdev_enter_failed(netdev);
+                return -EEXIST;
         }
 
         netdev->ifindex = ifindex;