diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-24 11:38:28 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-25 11:01:50 +0900 |
commit | e1e4cd1eed02ff89848c8260c7d3d9ef6f17397d (patch) | |
tree | 4dfe5c3f87e92dee0cdfde653a27d87dbafc71d8 /src | |
parent | 8bed7c55bf94115ce471a0331d3436bfcb72c057 (diff) | |
download | systemd-e1e4cd1eed02ff89848c8260c7d3d9ef6f17397d.tar.gz |
network: move more functions
No functional change. Preparation for later commits.
Diffstat (limited to 'src')
-rw-r--r-- | src/network/networkd-address.c | 80 | ||||
-rw-r--r-- | src/network/networkd-route.c | 86 |
2 files changed, 83 insertions, 83 deletions
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index cfaaa3bb5a..f9d8e9bb6c 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1083,46 +1083,6 @@ static int address_configure( return 0; } -void address_cancel_request(Address *address) { - Request req; - - assert(address); - assert(address->link); - - if (!address_is_requesting(address)) - return; - - req = (Request) { - .link = address->link, - .type = REQUEST_TYPE_ADDRESS, - .address = address, - }; - - request_drop(ordered_set_get(address->link->manager->request_queue, &req)); - address_cancel_requesting(address); -} - -static int static_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { - int r; - - assert(link); - assert(link->static_address_messages > 0); - - link->static_address_messages--; - - r = address_configure_handler_internal(rtnl, m, link, "Failed to set static address"); - if (r <= 0) - return r; - - if (link->static_address_messages == 0) { - log_link_debug(link, "Addresses set"); - link->static_addresses_configured = true; - link_check_ready(link); - } - - return 1; -} - static bool address_is_ready_to_configure(Link *link, const Address *address) { assert(link); assert(address); @@ -1248,6 +1208,27 @@ int link_request_address( return 1; } +static int static_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { + int r; + + assert(link); + assert(link->static_address_messages > 0); + + link->static_address_messages--; + + r = address_configure_handler_internal(rtnl, m, link, "Failed to set static address"); + if (r <= 0) + return r; + + if (link->static_address_messages == 0) { + log_link_debug(link, "Addresses set"); + link->static_addresses_configured = true; + link_check_ready(link); + } + + return 1; +} + int link_request_static_address(Link *link, Address *address, bool consume) { assert(link); assert(address); @@ -1291,6 +1272,25 @@ int link_request_static_addresses(Link *link) { return 0; } +void address_cancel_request(Address *address) { + Request req; + + assert(address); + assert(address->link); + + if (!address_is_requesting(address)) + return; + + req = (Request) { + .link = address->link, + .type = REQUEST_TYPE_ADDRESS, + .address = address, + }; + + request_drop(ordered_set_get(address->link->manager->request_queue, &req)); + address_cancel_requesting(address); +} + int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message, Manager *m) { _cleanup_(address_freep) Address *tmp = NULL; struct ifa_cacheinfo cinfo; diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index e1aed642a6..cb40e3f1ae 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -1266,49 +1266,6 @@ static int route_configure( return 0; } -void route_cancel_request(Route *route, Link *link) { - Request req; - - assert(route); - - link = route->link ?: link; - - assert(link); - - if (!route_is_requesting(route)) - return; - - req = (Request) { - .link = link, - .type = REQUEST_TYPE_ROUTE, - .route = route, - }; - - request_drop(ordered_set_get(link->manager->request_queue, &req)); - route_cancel_requesting(route); -} - -static int static_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { - int r; - - assert(link); - assert(link->static_route_messages > 0); - - link->static_route_messages--; - - r = route_configure_handler_internal(rtnl, m, link, "Could not set route"); - if (r <= 0) - return r; - - if (link->static_route_messages == 0) { - log_link_debug(link, "Routes set"); - link->static_routes_configured = true; - link_check_ready(link); - } - - return 1; -} - static int route_is_ready_to_configure(const Route *route, Link *link) { int r; @@ -1501,6 +1458,27 @@ int link_request_route( return 1; } +static int static_route_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) { + int r; + + assert(link); + assert(link->static_route_messages > 0); + + link->static_route_messages--; + + r = route_configure_handler_internal(rtnl, m, link, "Could not set route"); + if (r <= 0) + return r; + + if (link->static_route_messages == 0) { + log_link_debug(link, "Routes set"); + link->static_routes_configured = true; + link_check_ready(link); + } + + return 1; +} + static int link_request_static_route(Link *link, Route *route) { assert(link); assert(link->manager); @@ -1581,6 +1559,28 @@ int link_request_static_routes(Link *link, bool only_ipv4) { return 0; } +void route_cancel_request(Route *route, Link *link) { + Request req; + + assert(route); + + link = route->link ?: link; + + assert(link); + + if (!route_is_requesting(route)) + return; + + req = (Request) { + .link = link, + .type = REQUEST_TYPE_ROUTE, + .route = route, + }; + + request_drop(ordered_set_get(link->manager->request_queue, &req)); + route_cancel_requesting(route); +} + static int process_route_one( Manager *manager, Link *link, |