From: Yu Watanabe Date: Thu, 12 Aug 2021 05:38:34 +0000 (+0900) Subject: network: adjust log messages, function names, etc. X-Git-Tag: v250-rc1~831^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b14686ff3a68d5e14c806a2a600e155ab07c37bf;p=thirdparty%2Fsystemd.git network: adjust log messages, function names, etc. --- diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 2a97dbea6e6..9b4291be0a5 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -595,12 +595,12 @@ static bool netdev_is_ready_to_create(NetDev *netdev, Link *link) { return true; } -int request_process_create_stacked_netdev(Request *req) { +int request_process_stacked_netdev(Request *req) { int r; assert(req); assert(req->link); - assert(req->type == REQUEST_TYPE_CREATE_STACKED_NETDEV); + assert(req->type == REQUEST_TYPE_STACKED_NETDEV); assert(req->netdev); assert(req->netlink_handler); @@ -667,7 +667,7 @@ static int link_create_stacked_netdev_after_configured_handler(sd_netlink *rtnl, return 0; } -int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev) { +int link_request_stacked_netdev(Link *link, NetDev *netdev) { NetDevCreateType create_type; int r; @@ -684,22 +684,22 @@ int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev) { if (create_type == NETDEV_CREATE_STACKED) { link->stacked_netdevs_created = false; - r = link_queue_request(link, REQUEST_TYPE_CREATE_STACKED_NETDEV, netdev, false, + r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false, &link->create_stacked_netdev_messages, link_create_stacked_netdev_handler, NULL); } else { link->stacked_netdevs_after_configured_created = false; - r = link_queue_request(link, REQUEST_TYPE_CREATE_STACKED_NETDEV, netdev, false, + r = link_queue_request(link, REQUEST_TYPE_STACKED_NETDEV, netdev, false, &link->create_stacked_netdev_after_configured_messages, link_create_stacked_netdev_after_configured_handler, NULL); } if (r < 0) - return log_link_error_errno(link, r, "Failed to request to create stacked netdev '%s': %m", + return log_link_error_errno(link, r, "Failed to request stacked netdev '%s': %m", netdev->ifname); - log_link_debug(link, "Requested to create stacked netdev '%s'", netdev->ifname); + log_link_debug(link, "Requested stacked netdev '%s'", netdev->ifname); return 0; } diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 29eec8d5539..4614f6566e9 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -197,8 +197,8 @@ int netdev_set_ifindex(NetDev *netdev, sd_netlink_message *newlink); int netdev_get_mac(const char *ifname, struct ether_addr **ret); int netdev_join(NetDev *netdev, Link *link, link_netlink_message_handler_t cb); -int request_process_create_stacked_netdev(Request *req); -int link_request_to_crate_stacked_netdev(Link *link, NetDev *netdev); +int request_process_stacked_netdev(Request *req); +int link_request_stacked_netdev(Link *link, NetDev *netdev); const char *netdev_kind_to_string(NetDevKind d) _const_; NetDevKind netdev_kind_from_string(const char *d) _pure_; diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 6855189bcc3..59313bcdfd6 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -594,7 +594,7 @@ static int link_request_stacked_netdevs(Link *link) { link->stacked_netdevs_after_configured_created = false; HASHMAP_FOREACH(netdev, link->network->stacked_netdevs) { - r = link_request_to_crate_stacked_netdev(link, netdev); + r = link_request_stacked_netdev(link, netdev); if (r < 0) return r; } diff --git a/src/network/networkd-queue.c b/src/network/networkd-queue.c index 7f2481997da..dcf5f4f0527 100644 --- a/src/network/networkd-queue.c +++ b/src/network/networkd-queue.c @@ -32,8 +32,6 @@ static void request_free_object(RequestType type, void *object) { case REQUEST_TYPE_BRIDGE_MDB: bridge_mdb_free(object); break; - case REQUEST_TYPE_CREATE_STACKED_NETDEV: - break; case REQUEST_TYPE_DHCP_SERVER: case REQUEST_TYPE_DHCP4_CLIENT: case REQUEST_TYPE_DHCP6_CLIENT: @@ -56,6 +54,7 @@ static void request_free_object(RequestType type, void *object) { routing_policy_rule_free(object); break; case REQUEST_TYPE_SET_LINK: + case REQUEST_TYPE_STACKED_NETDEV: case REQUEST_TYPE_UP_DOWN: break; default: @@ -110,7 +109,7 @@ static void request_hash_func(const Request *req, struct siphash *state) { case REQUEST_TYPE_ADDRESS_LABEL: case REQUEST_TYPE_BRIDGE_FDB: case REQUEST_TYPE_BRIDGE_MDB: - case REQUEST_TYPE_CREATE_STACKED_NETDEV: + case REQUEST_TYPE_STACKED_NETDEV: /* TODO: Currently, these types do not have any specific hash and compare functions. * Fortunately, all these objects are 'static', thus we can use the trivial functions. */ trivial_hash_func(req->object, state); @@ -173,7 +172,7 @@ static int request_compare_func(const struct Request *a, const struct Request *b case REQUEST_TYPE_ADDRESS_LABEL: case REQUEST_TYPE_BRIDGE_FDB: case REQUEST_TYPE_BRIDGE_MDB: - case REQUEST_TYPE_CREATE_STACKED_NETDEV: + case REQUEST_TYPE_STACKED_NETDEV: return trivial_compare_func(a->object, b->object); case REQUEST_TYPE_DHCP_SERVER: case REQUEST_TYPE_DHCP4_CLIENT: @@ -306,9 +305,6 @@ int manager_process_requests(sd_event_source *s, void *userdata) { case REQUEST_TYPE_BRIDGE_MDB: r = request_process_bridge_mdb(req); break; - case REQUEST_TYPE_CREATE_STACKED_NETDEV: - r = request_process_create_stacked_netdev(req); - break; case REQUEST_TYPE_DHCP_SERVER: r = request_process_dhcp_server(req); break; @@ -339,6 +335,9 @@ int manager_process_requests(sd_event_source *s, void *userdata) { case REQUEST_TYPE_SET_LINK: r = request_process_set_link(req); break; + case REQUEST_TYPE_STACKED_NETDEV: + r = request_process_stacked_netdev(req); + break; case REQUEST_TYPE_UP_DOWN: r = request_process_link_up_or_down(req); break; diff --git a/src/network/networkd-queue.h b/src/network/networkd-queue.h index 1fdd07d60a3..b1c0a9f0d4e 100644 --- a/src/network/networkd-queue.h +++ b/src/network/networkd-queue.h @@ -26,7 +26,6 @@ typedef enum RequestType { REQUEST_TYPE_ADDRESS_LABEL, REQUEST_TYPE_BRIDGE_FDB, REQUEST_TYPE_BRIDGE_MDB, - REQUEST_TYPE_CREATE_STACKED_NETDEV, REQUEST_TYPE_DHCP_SERVER, REQUEST_TYPE_DHCP4_CLIENT, REQUEST_TYPE_DHCP6_CLIENT, @@ -37,6 +36,7 @@ typedef enum RequestType { REQUEST_TYPE_ROUTE, REQUEST_TYPE_ROUTING_POLICY_RULE, REQUEST_TYPE_SET_LINK, + REQUEST_TYPE_STACKED_NETDEV, REQUEST_TYPE_UP_DOWN, _REQUEST_TYPE_MAX, _REQUEST_TYPE_INVALID = -EINVAL,