Skip to content

Commit f4cc136

Browse files
yuwatayuwata
committed
network: drop unused "callback" arguments in route_remove() and address_remove()
1 parent 50b7477 commit f4cc136

File tree

8 files changed

+33
-54
lines changed

8 files changed

+33
-54
lines changed

‎src/network/networkd-address.c‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,14 +653,13 @@ static int address_set_netlink_message(const Address *address, sd_netlink_messag
653653
return 0;
654654
}
655655

656-
int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg) {
656+
static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
657657
int r;
658658

659659
assert(rtnl);
660660
assert(m);
661661
assert(link);
662662
assert(link->address_remove_messages > 0);
663-
assert(error_msg);
664663

665664
link->address_remove_messages--;
666665

@@ -669,22 +668,14 @@ int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Lin
669668

670669
r = sd_netlink_message_get_errno(m);
671670
if (r < 0 && r != -EADDRNOTAVAIL)
672-
log_link_message_warning_errno(link, m, r, error_msg);
671+
log_link_message_warning_errno(link, m, r, "Could not drop address");
673672
else if (r >= 0)
674673
(void) manager_rtnl_process_address(rtnl, m, link->manager);
675674

676675
return 1;
677676
}
678677

679-
static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
680-
return address_remove_handler_internal(rtnl, m, link, "Could not drop address");
681-
}
682-
683-
int address_remove(
684-
const Address *address,
685-
Link *link,
686-
link_netlink_message_handler_t callback) {
687-
678+
int address_remove(const Address *address, Link *link) {
688679
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
689680
int r;
690681

@@ -707,7 +698,7 @@ int address_remove(
707698
return r;
708699

709700
r = netlink_call_async(link->manager->rtnl, NULL, req,
710-
callback ?: address_remove_handler,
701+
address_remove_handler,
711702
link_netlink_destroy_callback, link);
712703
if (r < 0)
713704
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
@@ -834,7 +825,7 @@ int link_drop_foreign_addresses(Link *link) {
834825
r = k;
835826
}
836827
} else {
837-
k = address_remove(address, link, NULL);
828+
k = address_remove(address, link);
838829
if (k < 0 && r >= 0)
839830
r = k;
840831
}
@@ -854,7 +845,7 @@ int link_drop_addresses(Link *link) {
854845
if (address->family == AF_INET6 && in6_addr_is_link_local(&address->in_addr.in6) == 1 && link_ipv6ll_enabled(link))
855846
continue;
856847

857-
k = address_remove(address, link, NULL);
848+
k = address_remove(address, link);
858849
if (k < 0 && r >= 0) {
859850
r = k;
860851
continue;
@@ -1434,7 +1425,7 @@ static void static_address_on_acd(sd_ipv4acd *acd, int event, void *userdata) {
14341425
case SD_IPV4ACD_EVENT_CONFLICT:
14351426
log_link_warning(link, "DAD conflict. Dropping address "IPV4_ADDRESS_FMT_STR,
14361427
IPV4_ADDRESS_FMT_VAL(address->in_addr.in));
1437-
r = address_remove(address, link, NULL);
1428+
r = address_remove(address, link);
14381429
if (r < 0)
14391430
log_link_error_errno(link, r, "Failed to drop DAD conflicted address "IPV4_ADDRESS_FMT_STR,
14401431
IPV4_ADDRESS_FMT_VAL(address->in_addr.in));

‎src/network/networkd-address.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ int address_new(Address **ret);
5353
Address *address_free(Address *address);
5454
int address_get(Link *link, const Address *in, Address **ret);
5555
int address_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
56-
int address_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
57-
int address_remove(const Address *address, Link *link, link_netlink_message_handler_t callback);
56+
int address_remove(const Address *address, Link *link);
5857
bool address_equal(const Address *a1, const Address *a2);
5958
bool address_is_ready(const Address *a);
6059
void address_set_broadcast(Address *a);

‎src/network/networkd-dhcp4.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ static int dhcp4_release_old_lease(Link *link) {
6666
log_link_debug(link, "Removing old DHCPv4 address and routes.");
6767

6868
SET_FOREACH(route, link->dhcp_routes_old) {
69-
k = route_remove(route, NULL, link, NULL);
69+
k = route_remove(route, NULL, link);
7070
if (k < 0)
7171
r = k;
7272
}
7373

7474
if (link->dhcp_address_old) {
75-
k = address_remove(link->dhcp_address_old, link, NULL);
75+
k = address_remove(link->dhcp_address_old, link);
7676
if (k < 0)
7777
r = k;
7878
}
@@ -723,13 +723,13 @@ static int dhcp4_remove_all(Link *link) {
723723
assert(link);
724724

725725
SET_FOREACH(route, link->dhcp_routes) {
726-
k = route_remove(route, NULL, link, NULL);
726+
k = route_remove(route, NULL, link);
727727
if (k < 0)
728728
r = k;
729729
}
730730

731731
if (link->dhcp_address) {
732-
k = address_remove(link->dhcp_address, link, NULL);
732+
k = address_remove(link->dhcp_address, link);
733733
if (k < 0)
734734
r = k;
735735
}
@@ -948,7 +948,7 @@ static int dhcp4_after_address_configure(Request *req, void *object) {
948948
if (link->dhcp_address_old &&
949949
!address_equal(link->dhcp_address_old, link->dhcp_address)) {
950950
/* Still too old address exists? Let's remove it immediately. */
951-
r = address_remove(link->dhcp_address_old, link, NULL);
951+
r = address_remove(link->dhcp_address_old, link);
952952
if (r < 0)
953953
return r;
954954
}

‎src/network/networkd-dhcp6.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static int dhcp6_pd_remove_old(Link *link, bool force) {
170170
log_link_debug(link, "Removing old DHCPv6 Prefix Delegation addresses and routes.");
171171

172172
SET_FOREACH(route, link->dhcp6_pd_routes_old) {
173-
k = route_remove(route, NULL, link, NULL);
173+
k = route_remove(route, NULL, link);
174174
if (k < 0)
175175
r = k;
176176

@@ -180,7 +180,7 @@ static int dhcp6_pd_remove_old(Link *link, bool force) {
180180
}
181181

182182
SET_FOREACH(address, link->dhcp6_pd_addresses_old) {
183-
k = address_remove(address, link, NULL);
183+
k = address_remove(address, link);
184184
if (k < 0)
185185
r = k;
186186
}
@@ -212,7 +212,7 @@ int dhcp6_pd_remove(Link *link) {
212212
log_link_debug(link, "Removing DHCPv6 Prefix Delegation addresses and routes.");
213213

214214
SET_FOREACH(route, link->dhcp6_pd_routes) {
215-
k = route_remove(route, NULL, link, NULL);
215+
k = route_remove(route, NULL, link);
216216
if (k < 0)
217217
r = k;
218218

@@ -222,7 +222,7 @@ int dhcp6_pd_remove(Link *link) {
222222
}
223223

224224
SET_FOREACH(address, link->dhcp6_pd_addresses) {
225-
k = address_remove(address, link, NULL);
225+
k = address_remove(address, link);
226226
if (k < 0)
227227
r = k;
228228
}
@@ -761,13 +761,13 @@ static int dhcp6_remove_old(Link *link, bool force) {
761761
log_link_debug(link, "Removing old DHCPv6 addresses and routes.");
762762

763763
SET_FOREACH(route, link->dhcp6_routes_old) {
764-
k = route_remove(route, NULL, link, NULL);
764+
k = route_remove(route, NULL, link);
765765
if (k < 0)
766766
r = k;
767767
}
768768

769769
SET_FOREACH(address, link->dhcp6_addresses_old) {
770-
k = address_remove(address, link, NULL);
770+
k = address_remove(address, link);
771771
if (k < 0)
772772
r = k;
773773
}
@@ -795,13 +795,13 @@ static int dhcp6_remove(Link *link) {
795795
log_link_debug(link, "Removing DHCPv6 addresses and routes.");
796796

797797
SET_FOREACH(route, link->dhcp6_routes) {
798-
k = route_remove(route, NULL, link, NULL);
798+
k = route_remove(route, NULL, link);
799799
if (k < 0)
800800
r = k;
801801
}
802802

803803
SET_FOREACH(address, link->dhcp6_addresses) {
804-
k = address_remove(address, link, NULL);
804+
k = address_remove(address, link);
805805
if (k < 0)
806806
r = k;
807807
}

‎src/network/networkd-ipv4ll.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static int ipv4ll_address_lost(Link *link) {
5656
log_link_debug(link, "IPv4 link-local release "IPV4_ADDRESS_FMT_STR,
5757
IPV4_ADDRESS_FMT_VAL(address->in_addr.in));
5858

59-
return address_remove(address, link, NULL);
59+
return address_remove(address, link);
6060
}
6161

6262
static int ipv4ll_address_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {

‎src/network/networkd-ndisc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ static int ndisc_remove_old_one(Link *link, const struct in6_addr *router, bool
171171

172172
SET_FOREACH(na, link->ndisc_addresses)
173173
if (na->marked && in6_addr_equal(&na->router, router)) {
174-
k = address_remove(na->address, link, NULL);
174+
k = address_remove(na->address, link);
175175
if (k < 0)
176176
r = k;
177177
}
178178

179179
SET_FOREACH(nr, link->ndisc_routes)
180180
if (nr->marked && in6_addr_equal(&nr->router, router)) {
181-
k = route_remove(nr->route, NULL, link, NULL);
181+
k = route_remove(nr->route, NULL, link);
182182
if (k < 0)
183183
r = k;
184184
}

‎src/network/networkd-route.c‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -903,13 +903,12 @@ static int route_set_netlink_message(const Route *route, sd_netlink_message *req
903903
return 0;
904904
}
905905

906-
int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg) {
906+
static int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
907907
int r;
908908

909909
assert(m);
910910
assert(link);
911911
assert(link->route_remove_messages > 0);
912-
assert(error_msg);
913912

914913
link->route_remove_messages--;
915914

@@ -918,15 +917,11 @@ int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m,
918917

919918
r = sd_netlink_message_get_errno(m);
920919
if (r < 0 && r != -ESRCH)
921-
log_link_message_warning_errno(link, m, r, error_msg);
920+
log_link_message_warning_errno(link, m, r, "Could not drop route, ignoring");
922921

923922
return 1;
924923
}
925924

926-
static int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
927-
return link_route_remove_handler_internal(rtnl, m, link, "Could not drop route, ignoring");
928-
}
929-
930925
static int manager_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Manager *manager) {
931926
int r;
932927

@@ -943,12 +938,7 @@ static int manager_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m,
943938
return 1;
944939
}
945940

946-
int route_remove(
947-
const Route *route,
948-
Manager *manager,
949-
Link *link,
950-
link_netlink_message_handler_t callback) {
951-
941+
int route_remove(const Route *route, Manager *manager, Link *link) {
952942
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
953943
unsigned char type;
954944
int r;
@@ -988,7 +978,7 @@ int route_remove(
988978

989979
if (link) {
990980
r = netlink_call_async(manager->rtnl, NULL, req,
991-
callback ?: link_route_remove_handler,
981+
link_route_remove_handler,
992982
link_netlink_destroy_callback, link);
993983
if (r < 0)
994984
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
@@ -1062,7 +1052,7 @@ static int manager_drop_routes_internal(Manager *manager, bool foreign, const Li
10621052

10631053
/* The existing links do not have the route. Let's drop this now. It may be
10641054
* re-configured later. */
1065-
k = route_remove(route, manager, NULL, NULL);
1055+
k = route_remove(route, manager, NULL);
10661056
if (k < 0 && r >= 0)
10671057
r = k;
10681058

@@ -1112,7 +1102,7 @@ int link_drop_foreign_routes(Link *link) {
11121102
if (link_has_static_route(link, route))
11131103
k = route_add(NULL, link, route, NULL, NULL, NULL);
11141104
else
1115-
k = route_remove(route, NULL, link, NULL);
1105+
k = route_remove(route, NULL, link);
11161106
if (k < 0 && r >= 0)
11171107
r = k;
11181108
}
@@ -1135,7 +1125,7 @@ int link_drop_routes(Link *link) {
11351125
if (route->protocol == RTPROT_KERNEL)
11361126
continue;
11371127

1138-
k = route_remove(route, NULL, link, NULL);
1128+
k = route_remove(route, NULL, link);
11391129
if (k < 0 && r >= 0)
11401130
r = k;
11411131
}
@@ -1153,7 +1143,7 @@ static int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdat
11531143

11541144
assert(route);
11551145

1156-
r = route_remove(route, route->manager, route->link, NULL);
1146+
r = route_remove(route, route->manager, route->link);
11571147
if (r < 0) {
11581148
log_link_warning_errno(route->link, r, "Could not remove route: %m");
11591149
route_free(route);

‎src/network/networkd-route.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ DEFINE_NETWORK_SECTION_FUNCTIONS(Route, route_free);
7474
int route_dup(const Route *src, Route **ret);
7575

7676
int route_configure_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
77-
int link_route_remove_handler_internal(sd_netlink *rtnl, sd_netlink_message *m, Link *link, const char *error_msg);
78-
int route_remove(const Route *route, Manager *manager, Link *link, link_netlink_message_handler_t callback);
77+
int route_remove(const Route *route, Manager *manager, Link *link);
7978

8079
int link_has_route(Link *link, const Route *route);
8180
bool manager_address_is_reachable(Manager *manager, int family, const union in_addr_union *address);

0 commit comments

Comments
 (0)