Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

netconfig: Use ell's rtnl API

This commit is contained in:
Daniel Wagner 2020-02-15 10:48:40 +01:00 committed by Denis Kenzior
parent 0af1207a6c
commit 280658c73b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/netconfig.c
View File

@ -502,8 +502,8 @@ static void netconfig_ifaddr_added(struct netconfig *netconfig,
ifaddr->family = ifa->ifa_family;
ifaddr->prefix_len = ifa->ifa_prefixlen;
rtnl_ifaddr_extract(ifa, len, &label, &ifaddr->ip,
&ifaddr->broadcast);
l_rtnl_ifaddr4_extract(ifa, len, &label, &ifaddr->ip,
&ifaddr->broadcast);
l_debug("%s: ifaddr %s/%u broadcast %s", label, ifaddr->ip,
ifaddr->prefix_len, ifaddr->broadcast);
@ -519,7 +519,7 @@ static void netconfig_ifaddr_deleted(struct netconfig *netconfig,
struct netconfig_ifaddr *ifaddr;
struct netconfig_ifaddr query;
rtnl_ifaddr_extract(ifa, len, NULL, &query.ip, NULL);
l_rtnl_ifaddr4_extract(ifa, len, NULL, &query.ip, NULL);
query.family = ifa->ifa_family;
query.prefix_len = ifa->ifa_prefixlen;
@ -586,7 +586,7 @@ static void netconfig_ifaddr_ipv6_added(struct netconfig *netconfig,
ifaddr->family = ifa->ifa_family;
ifaddr->prefix_len = ifa->ifa_prefixlen;
rtnl_ifaddr_ipv6_extract(ifa, len, &ifaddr->ip);
l_rtnl_ifaddr6_extract(ifa, len, &ifaddr->ip);
l_debug("ifindex %u: ifaddr %s/%u", netconfig->ifindex, ifaddr->ip,
ifaddr->prefix_len);
@ -601,7 +601,7 @@ static void netconfig_ifaddr_ipv6_deleted(struct netconfig *netconfig,
struct netconfig_ifaddr *ifaddr;
struct netconfig_ifaddr query;
rtnl_ifaddr_ipv6_extract(ifa, len, &query.ip);
l_rtnl_ifaddr6_extract(ifa, len, &query.ip);
query.family = ifa->ifa_family;
query.prefix_len = ifa->ifa_prefixlen;
@ -707,7 +707,7 @@ static bool netconfig_ipv4_routes_install(struct netconfig *netconfig,
if (!network)
return false;
if (!rtnl_route_ipv4_add_connected(rtnl, netconfig->ifindex,
if (!l_rtnl_route4_add_connected(rtnl, netconfig->ifindex,
ifaddr->prefix_len, network,
ifaddr->ip,
netconfig->rtm_protocol,
@ -727,7 +727,7 @@ static bool netconfig_ipv4_routes_install(struct netconfig *netconfig,
return false;
}
if (!rtnl_route_ipv4_add_gateway(rtnl, netconfig->ifindex, gateway,
if (!l_rtnl_route4_add_gateway(rtnl, netconfig->ifindex, gateway,
ifaddr->ip,
ROUTE_PRIORITY_OFFSET,
netconfig->rtm_protocol,
@ -806,7 +806,7 @@ static bool netconfig_ipv6_routes_install(struct netconfig *netconfig)
return false;
}
if (!rtnl_route_ipv6_add_gateway(rtnl, netconfig->ifindex, gateway,
if (!l_rtnl_route6_add_gateway(rtnl, netconfig->ifindex, gateway,
ROUTE_PRIORITY_OFFSET,
netconfig->rtm_v6_protocol,
netconfig_route_add_cmd_cb,
@ -860,7 +860,7 @@ static void netconfig_install_address(struct netconfig *netconfig,
switch (ifaddr->family) {
case AF_INET:
if (rtnl_ifaddr_add(rtnl, netconfig->ifindex,
if (l_rtnl_ifaddr4_add(rtnl, netconfig->ifindex,
ifaddr->prefix_len, ifaddr->ip,
ifaddr->broadcast,
netconfig_ipv4_ifaddr_add_cmd_cb,
@ -871,7 +871,7 @@ static void netconfig_install_address(struct netconfig *netconfig,
ifaddr->prefix_len);
break;
case AF_INET6:
if (rtnl_ifaddr_ipv6_add(rtnl, netconfig->ifindex,
if (l_rtnl_ifaddr6_add(rtnl, netconfig->ifindex,
ifaddr->prefix_len, ifaddr->ip,
netconfig_ipv6_ifaddr_add_cmd_cb,
netconfig, NULL))
@ -916,7 +916,7 @@ static void netconfig_uninstall_address(struct netconfig *netconfig,
switch (ifaddr->family) {
case AF_INET:
if (rtnl_ifaddr_delete(rtnl, netconfig->ifindex,
if (l_rtnl_ifaddr4_delete(rtnl, netconfig->ifindex,
ifaddr->prefix_len, ifaddr->ip,
ifaddr->broadcast,
netconfig_ifaddr_del_cmd_cb, netconfig,
@ -927,7 +927,7 @@ static void netconfig_uninstall_address(struct netconfig *netconfig,
ifaddr->ip, ifaddr->prefix_len);
break;
case AF_INET6:
if (rtnl_ifaddr_ipv6_delete(rtnl, netconfig->ifindex,
if (l_rtnl_ifaddr6_delete(rtnl, netconfig->ifindex,
ifaddr->prefix_len, ifaddr->ip,
netconfig_ifaddr_del_cmd_cb, netconfig,
NULL))
@ -1094,7 +1094,7 @@ static void netconfig_ipv6_select_and_uninstall(struct netconfig *netconfig)
if (!gateway)
return;
if (!rtnl_route_ipv6_delete_gateway(rtnl, netconfig->ifindex,
if (!l_rtnl_route6_delete_gateway(rtnl, netconfig->ifindex,
gateway, ROUTE_PRIORITY_OFFSET,
netconfig->rtm_v6_protocol,
netconfig_route_del_cmd_cb, NULL, NULL)) {
@ -1233,7 +1233,7 @@ static int netconfig_init(void)
goto error;
}
r = rtnl_ifaddr_get(rtnl, netconfig_ifaddr_cmd_cb, NULL, NULL);
r = l_rtnl_ifaddr4_dump(rtnl, netconfig_ifaddr_cmd_cb, NULL, NULL);
if (!r) {
l_error("netconfig: Failed to get addresses from RTNL link.");
goto error;
@ -1247,7 +1247,7 @@ static int netconfig_init(void)
goto error;
}
r = rtnl_ifaddr_ipv6_get(rtnl, netconfig_ifaddr_ipv6_cmd_cb, NULL,
r = l_rtnl_ifaddr6_dump(rtnl, netconfig_ifaddr_ipv6_cmd_cb, NULL,
NULL);
if (!r) {
l_error("netconfig: Failed to get IPv6 addresses from RTNL"