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

netconfig: Remove tracking of addresses

Browse Source 
Tracking of addresses that weren't set by us seemed a bit questionable.
Take this out for now.  If this is ever needed, then a queue with
l_rtnl_address objects should be used.
This commit is contained in:
Denis Kenzior 2020-11-19 14:10:03 -06:00
parent 6f5ec005e9
commit 69e86f4d21
1 changed files with 19 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
src/netconfig.c
View File

@ -52,7 +52,6 @@ struct netconfig {
uint32_t ifindex; uint32_t ifindex;
struct l_dhcp_client *dhcp_client; struct l_dhcp_client *dhcp_client;
struct l_dhcp6_client *dhcp6_client; struct l_dhcp6_client *dhcp6_client;
struct l_queue *ifaddr_list;
uint8_t rtm_protocol; uint8_t rtm_protocol;
uint8_t rtm_v6_protocol; uint8_t rtm_v6_protocol;
struct l_rtnl_address *v4_address; struct l_rtnl_address *v4_address;
@ -67,13 +66,6 @@ struct netconfig {
struct resolve *resolve; struct resolve *resolve;
}; };
struct netconfig_ifaddr {
uint8_t family;
uint8_t prefix_len;
char *ip;
char *broadcast;
};
static struct l_netlink *rtnl; static struct l_netlink *rtnl;
static struct l_queue *netconfig_list; static struct l_queue *netconfig_list;
@ -123,16 +115,6 @@ static int sysfs_write_ipv6_setting(const char *ifname, const char *setting,
return r; return r;
} }
static void netconfig_ifaddr_destroy(void *data)
{
struct netconfig_ifaddr *ifaddr = data;
l_free(ifaddr->ip);
l_free(ifaddr->broadcast);
l_free(ifaddr);
}
static void netconfig_free(void *data) static void netconfig_free(void *data)
{ {
struct netconfig *netconfig = data; struct netconfig *netconfig = data;
@ -140,8 +122,6 @@ static void netconfig_free(void *data)
l_dhcp_client_destroy(netconfig->dhcp_client); l_dhcp_client_destroy(netconfig->dhcp_client);
l_dhcp6_client_destroy(netconfig->dhcp6_client); l_dhcp6_client_destroy(netconfig->dhcp6_client);
l_queue_destroy(netconfig->ifaddr_list, netconfig_ifaddr_destroy);
l_free(netconfig); l_free(netconfig);
} }
@ -457,66 +437,27 @@ static struct l_rtnl_address *netconfig_get_dhcp4_address(
return ret; return ret;
} }
static bool netconfig_ifaddr_match(const void *a, const void *b)
{
const struct netconfig_ifaddr *entry = a;
const struct netconfig_ifaddr *query = b;
if (entry->family != query->family)
return false;
if (entry->prefix_len != query->prefix_len)
return false;
if (strcmp(entry->ip, query->ip))
return false;
return true;
}
static void netconfig_ifaddr_added(struct netconfig *netconfig, static void netconfig_ifaddr_added(struct netconfig *netconfig,
const struct ifaddrmsg *ifa, const struct ifaddrmsg *ifa,
uint32_t len) uint32_t len)
{ {
struct netconfig_ifaddr *ifaddr; L_AUTO_FREE_VAR(char *, label);
char *label; L_AUTO_FREE_VAR(char *, ip);
L_AUTO_FREE_VAR(char *, broadcast);
ifaddr = l_new(struct netconfig_ifaddr, 1); l_rtnl_ifaddr4_extract(ifa, len, &label, &ip, &broadcast);
ifaddr->family = ifa->ifa_family; l_debug("%s: ifaddr %s/%u broadcast %s", label,
ifaddr->prefix_len = ifa->ifa_prefixlen; ip, ifa->ifa_prefixlen, 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);
l_free(label);
l_queue_push_tail(netconfig->ifaddr_list, ifaddr);
} }
static void netconfig_ifaddr_deleted(struct netconfig *netconfig, static void netconfig_ifaddr_deleted(struct netconfig *netconfig,
const struct ifaddrmsg *ifa, const struct ifaddrmsg *ifa,
uint32_t len) uint32_t len)
{ {
struct netconfig_ifaddr *ifaddr; L_AUTO_FREE_VAR(char *, ip);
struct netconfig_ifaddr query;
l_rtnl_ifaddr4_extract(ifa, len, NULL, &query.ip, NULL); l_rtnl_ifaddr4_extract(ifa, len, NULL, &ip, NULL);
l_debug("ifaddr %s/%u", ip, ifa->ifa_prefixlen);
query.family = ifa->ifa_family;
query.prefix_len = ifa->ifa_prefixlen;
ifaddr = l_queue_remove_if(netconfig->ifaddr_list,
netconfig_ifaddr_match, &query);
l_free(query.ip);
if (!ifaddr)
return;
l_debug("ifaddr %s/%u", ifaddr->ip, ifaddr->prefix_len);
netconfig_ifaddr_destroy(ifaddr);
} }
static void netconfig_ifaddr_notify(uint16_t type, const void *data, static void netconfig_ifaddr_notify(uint16_t type, const void *data,
@ -563,32 +504,25 @@ static void netconfig_ifaddr_ipv6_added(struct netconfig *netconfig,
const struct ifaddrmsg *ifa, const struct ifaddrmsg *ifa,
uint32_t len) uint32_t len)
{ {
struct netconfig_ifaddr *ifaddr;
struct in6_addr in6; struct in6_addr in6;
L_AUTO_FREE_VAR(char *, ip) = NULL;
if (ifa->ifa_flags & IFA_F_TENTATIVE) if (ifa->ifa_flags & IFA_F_TENTATIVE)
return; return;
ifaddr = l_new(struct netconfig_ifaddr, 1); l_rtnl_ifaddr6_extract(ifa, len, &ip);
ifaddr->family = ifa->ifa_family;
ifaddr->prefix_len = ifa->ifa_prefixlen;
l_rtnl_ifaddr6_extract(ifa, len, &ifaddr->ip); l_debug("ifindex %u: ifaddr %s/%u", netconfig->ifindex,
ip, ifa->ifa_prefixlen);
l_debug("ifindex %u: ifaddr %s/%u", netconfig->ifindex, ifaddr->ip,
ifaddr->prefix_len);
l_queue_push_tail(netconfig->ifaddr_list, ifaddr);
if (netconfig->rtm_v6_protocol != RTPROT_DHCP) if (netconfig->rtm_v6_protocol != RTPROT_DHCP)
return; return;
inet_pton(AF_INET6, ifaddr->ip, &in6); inet_pton(AF_INET6, ip, &in6);
if (!IN6_IS_ADDR_LINKLOCAL(&in6)) if (!IN6_IS_ADDR_LINKLOCAL(&in6))
return; return;
l_dhcp6_client_set_link_local_address(netconfig->dhcp6_client, l_dhcp6_client_set_link_local_address(netconfig->dhcp6_client, ip);
ifaddr->ip);
if (l_dhcp6_client_start(netconfig->dhcp6_client)) if (l_dhcp6_client_start(netconfig->dhcp6_client))
return; return;
@ -601,25 +535,11 @@ static void netconfig_ifaddr_ipv6_deleted(struct netconfig *netconfig,
const struct ifaddrmsg *ifa, const struct ifaddrmsg *ifa,
uint32_t len) uint32_t len)
{ {
struct netconfig_ifaddr *ifaddr; L_AUTO_FREE_VAR(char *, ip);
struct netconfig_ifaddr query;
l_rtnl_ifaddr6_extract(ifa, len, &query.ip); l_rtnl_ifaddr6_extract(ifa, len, &ip);
l_debug("ifindex %u: ifaddr %s/%u", netconfig->ifindex,
query.family = ifa->ifa_family; ip, ifa->ifa_prefixlen);
query.prefix_len = ifa->ifa_prefixlen;
ifaddr = l_queue_remove_if(netconfig->ifaddr_list,
netconfig_ifaddr_match, &query);
l_free(query.ip);
if (!ifaddr)
return;
l_debug("ifaddr %s/%u", ifaddr->ip, ifaddr->prefix_len);
netconfig_ifaddr_destroy(ifaddr);
} }
static void netconfig_ifaddr_ipv6_notify(uint16_t type, const void *data, static void netconfig_ifaddr_ipv6_notify(uint16_t type, const void *data,
@ -1088,7 +1008,6 @@ struct netconfig *netconfig_new(uint32_t ifindex)
netconfig = l_new(struct netconfig, 1); netconfig = l_new(struct netconfig, 1);
netconfig->ifindex = ifindex; netconfig->ifindex = ifindex;
netconfig->ifaddr_list = l_queue_new();
netconfig->resolve = resolve_new(ifindex); netconfig->resolve = resolve_new(ifindex);
netconfig->dhcp_client = l_dhcp_client_new(ifindex); netconfig->dhcp_client = l_dhcp_client_new(ifindex);