bus: drop bus/message GC logic

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

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 5359eb179bde9a27a7c9df0199f3c3207ea1f2f3..2fff962b58a8ae8fb24ab7c865a8046b5c126772 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -41,7 +41,8 @@ static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_GRE] = "gre",
         [NETDEV_KIND_SIT] = "sit",
         [NETDEV_KIND_VETH] = "veth",
-        [NETDEV_KIND_VTI] = "vti"
+        [NETDEV_KIND_VTI] = "vti",
+        [NETDEV_KIND_DUMMY] = "dummy",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind);
@@ -94,6 +95,7 @@ static void netdev_free(NetDev *netdev) {
 
         free(netdev->description);
         free(netdev->ifname);
+        free(netdev->ifname_peer);
         free(netdev->mac);
         free(netdev->mac_peer);
 
@@ -220,8 +222,10 @@ static int netdev_enter_ready(NetDev *netdev) {
 
         return 0;
 }
+
+/* callback for netdev's created without a backing Link */
 static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
-        NetDev *netdev = userdata;
+        _cleanup_netdev_unref_ NetDev *netdev = userdata;
         int r;
 
         assert(netdev->state != _NETDEV_STATE_INVALID);
@@ -385,9 +389,11 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
 
         if (link)
                 r = sd_rtnl_call_async(netdev->manager->rtnl, req, callback, link, 0, NULL);
-        else
+        else {
                 r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL);
-        if (r < 0) {
+
+                netdev_ref(netdev);
+        } if (r < 0) {
                 log_error_netdev(netdev,
                                  "Could not send rtnetlink message: %s", strerror(-r));
                 return r;
@@ -400,6 +406,7 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
         return 0;
 }
 
+/* the callback must be called, possibly after a timeout, as otherwise the Link will hang */
 int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
         int r;
 
@@ -413,7 +420,7 @@ int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callbac
         case NETDEV_KIND_GRE:
         case NETDEV_KIND_SIT:
         case NETDEV_KIND_VTI:
-                return netdev_create_tunnel(link, netdev_create_handler);
+                return netdev_create_tunnel(netdev, link, callback);
         default:
                 break;
         }
@@ -652,8 +659,8 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                 return 0;
         }
 
-        if (netdev->kind != NETDEV_KIND_VXLAN && netdev->vlanid <= VXLAN_VID_MAX) {
-                log_warning("VLAN Id configured for a %s in %s. Ignoring",
+        if (netdev->kind != NETDEV_KIND_VXLAN && netdev->vxlanid <= VXLAN_VID_MAX) {
+                log_warning("VXLAN Id configured for a %s in %s. Ignoring",
                             netdev_kind_to_string(netdev->kind), filename);
                 return 0;
         }
@@ -690,9 +697,10 @@ static int netdev_load_one(Manager *manager, const char *filename) {
 
         LIST_HEAD_INIT(netdev->callbacks);
 
-        if(netdev->kind == NETDEV_KIND_VETH) {
-                if (netdev->ifname_peer) {
-                        log_warning("Veth NetDev without Peer Name configured "
+        switch (netdev->kind) {
+        case NETDEV_KIND_VETH:
+                if (!netdev->ifname_peer) {
+                        log_warning("Veth NetDev without peer name configured "
                                     "in %s. Ignoring", filename);
                         return 0;
                 }
@@ -706,19 +714,27 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                         }
                 }
 
-                return netdev_create_veth(netdev, netdev_create_handler);
-        }
+                r = netdev_create_veth(netdev, netdev_create_handler);
+                if (r < 0)
+                        return r;
+
+                break;
+        case NETDEV_KIND_DUMMY:
+                r = netdev_create_dummy(netdev, netdev_create_handler);
+                if (r < 0)
+                        return r;
+
+                netdev_ref(netdev);
 
-        if (netdev->kind != NETDEV_KIND_VLAN &&
-            netdev->kind != NETDEV_KIND_MACVLAN &&
-            netdev->kind != NETDEV_KIND_VXLAN &&
-            netdev->kind != NETDEV_KIND_IPIP &&
-            netdev->kind != NETDEV_KIND_GRE &&
-            netdev->kind != NETDEV_KIND_SIT &&
-            netdev->kind != NETDEV_KIND_VTI) {
+                break;
+        case NETDEV_KIND_BRIDGE:
+        case NETDEV_KIND_BOND:
                 r = netdev_create(netdev, NULL, NULL);
                 if (r < 0)
                         return r;
+                break;
+        default:
+                break;
         }
 
         log_debug_netdev(netdev, "loaded %s", netdev_kind_to_string(netdev->kind));