chiark / gitweb /
bus: always create --user bus when kdbus is active
[elogind.git] / src / network / networkd-link.c
index 9d942f436b3ad0e0307ad461cdd87c4e98c6e2e2..b004936e53ddf21026b652dbe6bc72dd19344ebd 100644 (file)
@@ -284,185 +284,6 @@ static int link_enter_set_addresses(Link *link) {
         return 0;
 }
 
-static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
-        Link *link = userdata;
-        int r;
-
-        r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_warning("%s: could not bring up interface: %s",
-                            link->ifname, strerror(-r));
-                link_enter_failed(link);
-        }
-
-        return 1;
-}
-
-static int link_up(Link *link) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
-        int r;
-
-        assert(link);
-        assert(link->manager);
-        assert(link->manager->rtnl);
-
-        log_debug("%s: bringing up link", link->ifname);
-
-        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
-        if (r < 0) {
-                log_error("Could not allocate RTM_SETLINK message");
-                return r;
-        }
-
-        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
-        if (r < 0) {
-                log_error("Could not set link flags");
-                return r;
-        }
-
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
-        if (r < 0) {
-                log_error("Could not send rtnetlink message: %s", strerror(-r));
-                return r;
-        }
-
-        return 0;
-}
-
-static int link_bridge_joined(Link *link) {
-        int r;
-
-        assert(link);
-        assert(link->state == LINK_STATE_JOINING_BRIDGE);
-        assert(link->network);
-
-        r = link_up(link);
-        if (r < 0) {
-                link_enter_failed(link);
-                return r;
-        }
-
-        if (!link->network->dhcp) {
-                r = link_enter_set_addresses(link);
-                if (r < 0)
-                        link_enter_failed(link);
-                        return r;
-        }
-
-        return 0;
-}
-
-static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
-        Link *link = userdata;
-        int r;
-
-        assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
-        assert(link->network);
-
-        if (link->state == LINK_STATE_FAILED)
-                return 1;
-
-        r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_warning("%s: could not join bridge '%s': %s",
-                            link->ifname, link->network->bridge->name, strerror(-r));
-                link_enter_failed(link);
-                return 1;
-        } else
-                log_debug("%s: joined bridge '%s'",
-                            link->ifname, link->network->bridge->name);
-
-        link_bridge_joined(link);
-
-        return 1;
-}
-
-static int link_enter_join_bridge(Link *link) {
-        int r;
-
-        assert(link);
-        assert(link->network);
-        assert(link->state == _LINK_STATE_INVALID);
-
-        link->state = LINK_STATE_JOINING_BRIDGE;
-
-        if (!link->network->bridge)
-                return link_bridge_joined(link);
-
-        log_debug("%s: joining bridge", link->ifname);
-
-        r = bridge_join(link->network->bridge, link, &bridge_handler);
-        if (r < 0) {
-                log_warning("%s: could not join bridge '%s'", link->ifname,
-                            link->network->bridge->name);
-                link_enter_failed(link);
-                return r;
-        }
-
-        return 0;
-}
-
-static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
-        Link *link = userdata;
-        int r;
-
-        r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_warning("%s: could not get state: %s",
-                            link->ifname, strerror(-r));
-                link_enter_failed(link);
-        }
-
-        link_update(link, m);
-
-        return 1;
-}
-
-static int link_get(Link *link) {
-        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
-        int r;
-
-        assert(link);
-        assert(link->manager);
-        assert(link->manager->rtnl);
-
-        log_debug("%s: requesting link status", link->ifname);
-
-        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
-        if (r < 0) {
-                log_error("Could not allocate RTM_GETLINK message");
-                return r;
-        }
-
-        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
-        if (r < 0) {
-                log_error("Could not send rtnetlink message: %s", strerror(-r));
-                return r;
-        }
-
-        return 0;
-}
-
-int link_configure(Link *link) {
-        int r;
-
-        assert(link);
-        assert(link->network);
-        assert(link->state == _LINK_STATE_INVALID);
-
-        r = link_get(link);
-        if (r < 0) {
-                link_enter_failed(link);
-                return r;
-        }
-
-        r = link_enter_join_bridge(link);
-        if (r < 0)
-                return r;
-
-        return 0;
-}
-
 static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         Link *link = userdata;
         int r;
@@ -490,6 +311,8 @@ static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
         int prefixlen;
         int r;
 
+        assert(link);
+
         if (link->state == LINK_STATE_FAILED)
                 return;
 
@@ -504,13 +327,17 @@ 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) {
-                address_drop(link->dhcp_address, link, address_drop_handler);
+                if (link->dhcp_address) {
+                        address_drop(link->dhcp_address, link, address_drop_handler);
 
-                address_free(link->dhcp_address);
-                link->dhcp_address = NULL;
+                        address_free(link->dhcp_address);
+                        link->dhcp_address = NULL;
+                }
 
-                route_free(link->dhcp_route);
-                link->dhcp_route = NULL;
+                if (link->dhcp_route) {
+                        route_free(link->dhcp_route);
+                        link->dhcp_route = NULL;
+                }
         }
 
         r = sd_dhcp_client_get_address(client, &address);
@@ -614,18 +441,14 @@ static int link_acquire_conf(Link *link) {
         return 0;
 }
 
-int link_update(Link *link, sd_rtnl_message *m) {
-        unsigned flags;
+static int link_update_flags(Link *link, unsigned flags) {
         int r;
 
         assert(link);
-        assert(m);
+        assert(link->network);
 
-        r = sd_rtnl_message_link_get_flags(m, &flags);
-        if (r < 0) {
-                log_warning("%s: could not get link flags", link->ifname);
-                return r;
-        }
+        if (link->state == LINK_STATE_FAILED)
+                return 0;
 
         if (link->flags & IFF_UP && !(flags & IFF_UP))
                 log_info("%s: interface is down", link->ifname);
@@ -645,7 +468,7 @@ int link_update(Link *link, sd_rtnl_message *m) {
         } else if (!(link->flags & IFF_LOWER_UP) && flags & IFF_LOWER_UP) {
                 log_info("%s: connected", link->ifname);
 
-                if (link->network && link->network->dhcp) {
+                if (link->network->dhcp) {
                         r = link_acquire_conf(link);
                         if (r < 0) {
                                 link_enter_failed(link);
@@ -656,7 +479,210 @@ int link_update(Link *link, sd_rtnl_message *m) {
 
         link->flags = flags;
 
-        log_debug("%s: updated state", link->ifname);
+        return 0;
+}
+
+static int link_up_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(link);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("%s: could not bring up interface: %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
+        }
+
+        link_update_flags(link, link->flags | IFF_UP);
+
+        return 1;
+}
+
+static int link_up(Link *link) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        log_debug("%s: bringing up link", link->ifname);
+
+        r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error("Could not allocate RTM_SETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_message_link_set_flags(req, IFF_UP);
+        if (r < 0) {
+                log_error("Could not set link flags");
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_up_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error("Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
+
+        return 0;
+}
+
+static int link_bridge_joined(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->state == LINK_STATE_JOINING_BRIDGE);
+        assert(link->network);
+
+        r = link_up(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        if (!link->network->dhcp)
+                return link_enter_set_addresses(link);
 
         return 0;
 }
+
+static int bridge_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->network);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("%s: could not join bridge '%s': %s",
+                            link->ifname, link->network->bridge->name, strerror(-r));
+                link_enter_failed(link);
+                return 1;
+        } else
+                log_debug("%s: joined bridge '%s'",
+                            link->ifname, link->network->bridge->name);
+
+        link_bridge_joined(link);
+
+        return 1;
+}
+
+static int link_enter_join_bridge(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        link->state = LINK_STATE_JOINING_BRIDGE;
+
+        if (!link->network->bridge)
+                return link_bridge_joined(link);
+
+        log_debug("%s: joining bridge", link->ifname);
+
+        r = bridge_join(link->network->bridge, link, &bridge_handler);
+        if (r < 0) {
+                log_warning("%s: could not join bridge '%s'", link->ifname,
+                            link->network->bridge->name);
+                link_enter_failed(link);
+                return r;
+        }
+
+        return 0;
+}
+
+static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        Link *link = userdata;
+        int r;
+
+        assert(link);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 1;
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0) {
+                log_warning("%s: could not get state: %s",
+                            link->ifname, strerror(-r));
+                link_enter_failed(link);
+        }
+
+        log_debug("%s: got link state", link->ifname);
+
+        link_update(link, m);
+
+        return 1;
+}
+
+static int link_get(Link *link) {
+        _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        log_debug("%s: requesting link status", link->ifname);
+
+        r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+        if (r < 0) {
+                log_error("Could not allocate RTM_GETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error("Could not send rtnetlink message: %s", strerror(-r));
+                return r;
+        }
+
+        return 0;
+}
+
+int link_configure(Link *link) {
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->state == _LINK_STATE_INVALID);
+
+        r = link_get(link);
+        if (r < 0) {
+                link_enter_failed(link);
+                return r;
+        }
+
+        return link_enter_join_bridge(link);
+}
+
+int link_update(Link *link, sd_rtnl_message *m) {
+        unsigned flags;
+        int r;
+
+        assert(link);
+        assert(m);
+
+        if (link->state == LINK_STATE_FAILED)
+                return 0;
+
+        r = sd_rtnl_message_link_get_flags(m, &flags);
+        if (r < 0) {
+                log_warning("%s: could not get link flags", link->ifname);
+                return r;
+        }
+
+        return link_update_flags(link, flags);
+}