Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 23:09:34 +01:00
Code Releases Activity

netconfig: Track the IPv6 route add netlink command

Browse Source 
For symmetry with IPv4, save the command id for this netlink command so
we can later add logic to the callback as well as be able to cancel the
command.  No functional change in this commit alone.
This commit is contained in:
Andrew Zaborowski 2021-09-25 03:11:46 +02:00 committed by Denis Kenzior
parent 83a30fe5ae
commit d71a604385
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/netconfig.c
View File

@ -74,6 +74,7 @@ struct netconfig {
uint32_t addr4_add_cmd_id; uint32_t addr4_add_cmd_id;
uint32_t addr6_add_cmd_id; uint32_t addr6_add_cmd_id;
uint32_t route4_add_gateway_cmd_id; uint32_t route4_add_gateway_cmd_id;
uint32_t route6_add_cmd_id;
}; };
static struct l_netlink *rtnl; static struct l_netlink *rtnl;
@ -739,6 +740,21 @@ static void netconfig_route_add_cmd_cb(int error, uint16_t type,
netconfig->notify = NULL; netconfig->notify = NULL;
} }
static void netconfig_route6_add_cb(int error, uint16_t type,
const void *data, uint32_t len,
void *user_data)
{
struct netconfig *netconfig = user_data;
netconfig->route6_add_cmd_id = 0;
if (error) {
l_error("netconfig: Failed to add route. Error %d: %s",
error, strerror(-error));
return;
}
}
static bool netconfig_ipv4_routes_install(struct netconfig *netconfig) static bool netconfig_ipv4_routes_install(struct netconfig *netconfig)
{ {
L_AUTO_FREE_VAR(char *, gateway) = NULL; L_AUTO_FREE_VAR(char *, gateway) = NULL;
@ -859,10 +875,12 @@ static void netconfig_ipv6_ifaddr_add_cmd_cb(int error, uint16_t type,
gateway = netconfig_get_static6_gateway(netconfig, &gateway_mac); gateway = netconfig_get_static6_gateway(netconfig, &gateway_mac);
if (gateway) { if (gateway) {
L_WARN_ON(!l_rtnl_route_add(rtnl, netconfig->ifindex, netconfig->route6_add_cmd_id = l_rtnl_route_add(rtnl,
gateway, netconfig->ifindex,
netconfig_route_generic_cb, gateway,
netconfig, NULL)); netconfig_route6_add_cb,
netconfig, NULL);
L_WARN_ON(unlikely(!netconfig->route6_add_cmd_id));
l_rtnl_route_free(gateway); l_rtnl_route_free(gateway);
if (gateway_mac && !l_rtnl_neighbor_set_hwaddr(rtnl, if (gateway_mac && !l_rtnl_neighbor_set_hwaddr(rtnl,
@ -1361,6 +1379,11 @@ bool netconfig_reset(struct netconfig *netconfig)
netconfig->route4_add_gateway_cmd_id = 0; netconfig->route4_add_gateway_cmd_id = 0;
} }
if (netconfig->route6_add_cmd_id) {
l_netlink_cancel(rtnl, netconfig->route6_add_cmd_id);
netconfig->route6_add_cmd_id = 0;
}
if (netconfig->addr4_add_cmd_id) { if (netconfig->addr4_add_cmd_id) {
l_netlink_cancel(rtnl, netconfig->addr4_add_cmd_id); l_netlink_cancel(rtnl, netconfig->addr4_add_cmd_id);
netconfig->addr4_add_cmd_id = 0; netconfig->addr4_add_cmd_id = 0;