X Tutup
Skip to content

Commit 54ff39f

Browse files
yuwatayuwata
committed
network: make address_configure() and friends take Request object
This should not change any behavior. Just a preparation for a later commit which introduces request_call_netlink_async().
1 parent f1eef36 commit 54ff39f

11 files changed

+48
-74
lines changed

‎src/network/netdev/netdev.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,14 +578,14 @@ static int independent_netdev_create(NetDev *netdev) {
578578
return 0;
579579
}
580580

581-
static int stacked_netdev_create(NetDev *netdev, Link *link, link_netlink_message_handler_t callback) {
581+
static int stacked_netdev_create(NetDev *netdev, Link *link, Request *req) {
582582
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
583583
int r;
584584

585585
assert(netdev);
586586
assert(netdev->manager);
587587
assert(link);
588-
assert(callback);
588+
assert(req);
589589

590590
r = sd_rtnl_message_new_link(netdev->manager->rtnl, &m, RTM_NEWLINK, 0);
591591
if (r < 0)
@@ -595,7 +595,7 @@ static int stacked_netdev_create(NetDev *netdev, Link *link, link_netlink_messag
595595
if (r < 0)
596596
return r;
597597

598-
r = netlink_call_async(netdev->manager->rtnl, NULL, m, callback,
598+
r = netlink_call_async(netdev->manager->rtnl, NULL, m, req->netlink_handler,
599599
link_netlink_destroy_callback, link);
600600
if (r < 0)
601601
return r;
@@ -639,7 +639,6 @@ int request_process_stacked_netdev(Request *req) {
639639

640640
assert(req);
641641
assert(req->type == REQUEST_TYPE_NETDEV_STACKED);
642-
assert(req->netlink_handler);
643642

644643
netdev = ASSERT_PTR(req->netdev);
645644
link = ASSERT_PTR(req->link);
@@ -648,7 +647,7 @@ int request_process_stacked_netdev(Request *req) {
648647
if (r <= 0)
649648
return r;
650649

651-
r = stacked_netdev_create(netdev, link, req->netlink_handler);
650+
r = stacked_netdev_create(netdev, link, req);
652651
if (r < 0)
653652
return log_netdev_warning_errno(netdev, r, "Failed to create netdev: %m");
654653

‎src/network/networkd-address-label.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static int address_label_configure_handler(sd_netlink *rtnl, sd_netlink_message
9595
return 1;
9696
}
9797

98-
static int address_label_configure(AddressLabel *label, Link *link, link_netlink_message_handler_t callback) {
98+
static int address_label_configure(AddressLabel *label, Link *link, Request *req) {
9999
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
100100
int r;
101101

@@ -104,7 +104,7 @@ static int address_label_configure(AddressLabel *label, Link *link, link_netlink
104104
assert(link->ifindex > 0);
105105
assert(link->manager);
106106
assert(link->manager->rtnl);
107-
assert(callback);
107+
assert(req);
108108

109109
r = sd_rtnl_message_new_addrlabel(link->manager->rtnl, &m, RTM_NEWADDRLABEL,
110110
link->ifindex, AF_INET6);
@@ -123,7 +123,7 @@ static int address_label_configure(AddressLabel *label, Link *link, link_netlink
123123
if (r < 0)
124124
return r;
125125

126-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
126+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
127127
link_netlink_destroy_callback, link);
128128
if (r < 0)
129129
return r;
@@ -145,7 +145,7 @@ int request_process_address_label(Request *req) {
145145
if (!link_is_ready_to_configure(link, false))
146146
return 0;
147147

148-
r = address_label_configure(req->label, link, req->netlink_handler);
148+
r = address_label_configure(req->label, link, req);
149149
if (r < 0)
150150
return log_link_warning_errno(link, r, "Failed to configure address label: %m");
151151

‎src/network/networkd-address.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,11 +1036,7 @@ int address_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m,
10361036
return 1;
10371037
}
10381038

1039-
static int address_configure(
1040-
const Address *address,
1041-
Link *link,
1042-
link_netlink_message_handler_t callback) {
1043-
1039+
static int address_configure(const Address *address, Link *link, Request *req) {
10441040
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
10451041
int r;
10461042

@@ -1050,7 +1046,7 @@ static int address_configure(
10501046
assert(link->ifindex > 0);
10511047
assert(link->manager);
10521048
assert(link->manager->rtnl);
1053-
assert(callback);
1049+
assert(req);
10541050

10551051
log_address_debug(address, "Configuring", link);
10561052

@@ -1091,7 +1087,7 @@ static int address_configure(
10911087
if (r < 0)
10921088
return r;
10931089

1094-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback, link_netlink_destroy_callback, link);
1090+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler, link_netlink_destroy_callback, link);
10951091
if (r < 0)
10961092
return r;
10971093

@@ -1130,7 +1126,7 @@ int request_process_address(Request *req) {
11301126
if (!address_is_ready_to_configure(link, address))
11311127
return 0;
11321128

1133-
r = address_configure(address, link, req->netlink_handler);
1129+
r = address_configure(address, link, req);
11341130
if (r < 0)
11351131
return log_link_warning_errno(link, r, "Failed to configure address: %m");
11361132

‎src/network/networkd-bridge-fdb.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,14 @@ static int bridge_fdb_configure_message(const BridgeFDB *fdb, Link *link, sd_net
168168
return 0;
169169
}
170170

171-
static int bridge_fdb_configure(BridgeFDB *fdb, Link *link, link_netlink_message_handler_t callback) {
171+
static int bridge_fdb_configure(BridgeFDB *fdb, Link *link, Request *req) {
172172
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
173173
int r;
174174

175175
assert(fdb);
176176
assert(link);
177177
assert(link->manager);
178-
assert(callback);
178+
assert(req);
179179

180180
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &m, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
181181
if (r < 0)
@@ -185,7 +185,7 @@ static int bridge_fdb_configure(BridgeFDB *fdb, Link *link, link_netlink_message
185185
if (r < 0)
186186
return r;
187187

188-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
188+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
189189
link_netlink_destroy_callback, link);
190190
if (r < 0)
191191
return r;
@@ -232,7 +232,7 @@ int request_process_bridge_fdb(Request *req) {
232232
if (!bridge_fdb_is_ready_to_configure(fdb, link))
233233
return 0;
234234

235-
r = bridge_fdb_configure(fdb, link, req->netlink_handler);
235+
r = bridge_fdb_configure(fdb, link, req);
236236
if (r < 0)
237237
return log_link_warning_errno(link, r, "Failed to configure bridge FDB: %m");
238238

‎src/network/networkd-bridge-mdb.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,15 @@ static int bridge_mdb_configure_handler(sd_netlink *rtnl, sd_netlink_message *m,
114114
}
115115

116116
/* send a request to the kernel to add an MDB entry */
117-
static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, link_netlink_message_handler_t callback) {
117+
static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, Request *req) {
118118
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
119119
struct br_mdb_entry entry;
120120
int r;
121121

122122
assert(mdb);
123123
assert(link);
124124
assert(link->manager);
125-
assert(callback);
125+
assert(req);
126126

127127
if (DEBUG_LOGGING) {
128128
_cleanup_free_ char *a = NULL;
@@ -164,7 +164,7 @@ static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, link_netlink_message
164164
if (r < 0)
165165
return r;
166166

167-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
167+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
168168
link_netlink_destroy_callback, link);
169169
if (r < 0)
170170
return r;
@@ -217,7 +217,7 @@ int request_process_bridge_mdb(Request *req) {
217217
if (!bridge_mdb_is_ready_to_configure(link))
218218
return 0;
219219

220-
r = bridge_mdb_configure(req->mdb, link, req->netlink_handler);
220+
r = bridge_mdb_configure(req->mdb, link, req);
221221
if (r < 0)
222222
return log_link_warning_errno(link, r, "Failed to configure bridge MDB: %m");
223223

‎src/network/networkd-ipv6-proxy-ndp.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,15 @@ static int ipv6_proxy_ndp_address_configure_handler(sd_netlink *rtnl, sd_netlink
4848
}
4949

5050
/* send a request to the kernel to add an IPv6 Proxy entry to the neighbour table */
51-
static int ipv6_proxy_ndp_address_configure(
52-
const struct in6_addr *address,
53-
Link *link,
54-
link_netlink_message_handler_t callback) {
55-
51+
static int ipv6_proxy_ndp_address_configure(const struct in6_addr *address, Link *link, Request *req) {
5652
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
5753
int r;
5854

5955
assert(address);
6056
assert(link);
6157
assert(link->manager);
6258
assert(link->manager->rtnl);
63-
assert(callback);
59+
assert(req);
6460

6561
/* create new netlink message */
6662
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &m, RTM_NEWNEIGH, link->ifindex, AF_INET6);
@@ -75,7 +71,7 @@ static int ipv6_proxy_ndp_address_configure(
7571
if (r < 0)
7672
return r;
7773

78-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
74+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
7975
link_netlink_destroy_callback, link);
8076
if (r < 0)
8177
return r;
@@ -96,7 +92,7 @@ int request_process_ipv6_proxy_ndp_address(Request *req) {
9692
if (!link_is_ready_to_configure(link, false))
9793
return 0;
9894

99-
r = ipv6_proxy_ndp_address_configure(req->ipv6_proxy_ndp, link, req->netlink_handler);
95+
r = ipv6_proxy_ndp_address_configure(req->ipv6_proxy_ndp, link, req);
10096
if (r < 0)
10197
return log_link_warning_errno(link, r, "Failed to configure IPv6 proxy NDP address: %m");
10298

‎src/network/networkd-neighbor.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,7 @@ static int neighbor_configure_message(Neighbor *neighbor, Link *link, sd_netlink
193193
return 0;
194194
}
195195

196-
static int neighbor_configure(
197-
Neighbor *neighbor,
198-
Link *link,
199-
link_netlink_message_handler_t callback) {
200-
196+
static int neighbor_configure(Neighbor *neighbor, Link *link, Request *req) {
201197
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
202198
int r;
203199

@@ -206,7 +202,7 @@ static int neighbor_configure(
206202
assert(link->ifindex > 0);
207203
assert(link->manager);
208204
assert(link->manager->rtnl);
209-
assert(callback);
205+
assert(req);
210206

211207
log_neighbor_debug(neighbor, "Configuring", link);
212208

@@ -219,7 +215,7 @@ static int neighbor_configure(
219215
if (r < 0)
220216
return r;
221217

222-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
218+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
223219
link_netlink_destroy_callback, link);
224220
if (r < 0)
225221
return r;
@@ -243,7 +239,7 @@ int request_process_neighbor(Request *req) {
243239
if (!link_is_ready_to_configure(link, false))
244240
return 0;
245241

246-
r = neighbor_configure(neighbor, link, req->netlink_handler);
242+
r = neighbor_configure(neighbor, link, req);
247243
if (r < 0)
248244
return log_link_warning_errno(link, r, "Failed to configure neighbor: %m");
249245

‎src/network/networkd-nexthop.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -425,11 +425,7 @@ static int nexthop_remove(NextHop *nexthop) {
425425
return 0;
426426
}
427427

428-
static int nexthop_configure(
429-
NextHop *nexthop,
430-
Link *link,
431-
link_netlink_message_handler_t callback) {
432-
428+
static int nexthop_configure(NextHop *nexthop, Link *link, Request *req) {
433429
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
434430
int r;
435431

@@ -439,7 +435,7 @@ static int nexthop_configure(
439435
assert(link->manager);
440436
assert(link->manager->rtnl);
441437
assert(link->ifindex > 0);
442-
assert(callback);
438+
assert(req);
443439

444440
log_nexthop_debug(nexthop, "Configuring", link);
445441

@@ -489,7 +485,7 @@ static int nexthop_configure(
489485
}
490486
}
491487

492-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
488+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
493489
link_netlink_destroy_callback, link);
494490
if (r < 0)
495491
return r;
@@ -583,7 +579,7 @@ int request_process_nexthop(Request *req) {
583579
if (!nexthop_is_ready_to_configure(link, nexthop))
584580
return 0;
585581

586-
r = nexthop_configure(nexthop, link, req->netlink_handler);
582+
r = nexthop_configure(nexthop, link, req);
587583
if (r < 0)
588584
return log_link_warning_errno(link, r, "Failed to configure nexthop");
589585

‎src/network/networkd-route.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,11 +1154,7 @@ int route_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Li
11541154
return 1;
11551155
}
11561156

1157-
static int route_configure(
1158-
const Route *route,
1159-
Link *link,
1160-
link_netlink_message_handler_t callback) {
1161-
1157+
static int route_configure(const Route *route, Link *link, Request *req) {
11621158
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
11631159
int r;
11641160

@@ -1168,7 +1164,7 @@ static int route_configure(
11681164
assert(link->manager);
11691165
assert(link->manager->rtnl);
11701166
assert(link->ifindex > 0);
1171-
assert(callback);
1167+
assert(req);
11721168

11731169
log_route_debug(route, "Configuring", link, link->manager);
11741170

@@ -1250,7 +1246,7 @@ static int route_configure(
12501246
return r;
12511247
}
12521248

1253-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
1249+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
12541250
link_netlink_destroy_callback, link);
12551251
if (r < 0)
12561252
return r;
@@ -1373,7 +1369,7 @@ int request_process_route(Request *req) {
13731369
}
13741370
}
13751371

1376-
r = route_configure(route, link, req->netlink_handler);
1372+
r = route_configure(route, link, req);
13771373
if (r < 0)
13781374
return log_link_warning_errno(link, r, "Failed to configure route: %m");
13791375

‎src/network/networkd-routing-policy-rule.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -604,11 +604,7 @@ static int routing_policy_rule_remove(RoutingPolicyRule *rule) {
604604
return 0;
605605
}
606606

607-
static int routing_policy_rule_configure(
608-
RoutingPolicyRule *rule,
609-
Link *link,
610-
link_netlink_message_handler_t callback) {
611-
607+
static int routing_policy_rule_configure(RoutingPolicyRule *rule, Link *link, Request *req) {
612608
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
613609
int r;
614610

@@ -618,7 +614,7 @@ static int routing_policy_rule_configure(
618614
assert(link->ifindex > 0);
619615
assert(link->manager);
620616
assert(link->manager->rtnl);
621-
assert(callback);
617+
assert(req);
622618

623619
log_routing_policy_rule_debug(rule, "Configuring", link, link->manager);
624620

@@ -630,7 +626,7 @@ static int routing_policy_rule_configure(
630626
if (r < 0)
631627
return r;
632628

633-
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
629+
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
634630
link_netlink_destroy_callback, link);
635631
if (r < 0)
636632
return r;
@@ -742,7 +738,7 @@ int request_process_routing_policy_rule(Request *req) {
742738
if (!link_is_ready_to_configure(link, false))
743739
return 0;
744740

745-
r = routing_policy_rule_configure(rule, link, req->netlink_handler);
741+
r = routing_policy_rule_configure(rule, link, req);
746742
if (r < 0)
747743
return log_link_warning_errno(link, r, "Failed to configure routing policy rule: %m");
748744

0 commit comments

Comments
 (0)
X Tutup