diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-02-26 15:56:39 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-03-11 14:16:41 +0900 |
commit | ff51134c93a748524b75b4fd492f9c03cb02f65c (patch) | |
tree | aa4dd86f335acceeecb3de90f3ae9fb2f466892d /src/network/networkd-routing-policy-rule.c | |
parent | 54ff39f7aecbefeb6f480ea61fbacc4ee554dacc (diff) | |
download | systemd-ff51134c93a748524b75b4fd492f9c03cb02f65c.tar.gz |
network: make request_process_address() and friends take Link and corresponding object
This also renames e.g. request_process_address() -> address_process_request().
Also, this drops type checks such as `assert(req->type == REQUEST_TYPE_ADDRESS)`,
as in the later commits, the function of processing request, e.g.
`address_process_request()`, will be assigned to the Request object when
it is created. And the request type will be used to distinguish and to
avoid deduplicating requests which do not have any assigned objects,
like REQUEST_TYPE_DHCP4_CLIENT. Hence, the type checks in process functions
are mostly not necessary and redundant.
This is mostly cleanups and preparation for later commits, and should
not change any behavior.
Diffstat (limited to 'src/network/networkd-routing-policy-rule.c')
-rw-r--r-- | src/network/networkd-routing-policy-rule.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c index 8ff6b0980c..a90c176f76 100644 --- a/src/network/networkd-routing-policy-rule.c +++ b/src/network/networkd-routing-policy-rule.c @@ -724,16 +724,12 @@ void link_foreignize_routing_policy_rules(Link *link) { } } -int request_process_routing_policy_rule(Request *req) { - RoutingPolicyRule *rule; - Link *link; +int routing_policy_rule_process_request(Request *req, Link *link, RoutingPolicyRule *rule) { int r; assert(req); - assert(req->type == REQUEST_TYPE_ROUTING_POLICY_RULE); - - link = ASSERT_PTR(req->link); - rule = ASSERT_PTR(req->rule); + assert(link); + assert(rule); if (!link_is_ready_to_configure(link, false)) return 0; |