denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-pfroute: Remove IP addresses from hashtable if interface disappears

Browse Source 
Fixes: f80093e2ee ("kernel-pfroute: Delete interfaces on RTM_IFANNOUNCE/IFAN_DEPARTURE events")
This commit is contained in:
Tobias Brunner
2026-07-24 08:47:37 +02:00
parent 62a4cde4d0
commit 8b1f8e0e46
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c
+12 -6
View File
@@ -538,11 +538,10 @@ static void addr_map_entry_add(private_kernel_pfroute_net_t *this,
} }
/** /**
* Remove an address map entry (the argument order is a bit strange because * Remove an address map entry
* it is also used with linked_list_t.invoke_function)
*/ */
static void addr_map_entry_remove(addr_entry_t *addr, iface_entry_t *iface, static void addr_map_entry_remove(private_kernel_pfroute_net_t *this,
private_kernel_pfroute_net_t *this) addr_entry_t *addr, iface_entry_t *iface)
{ {
addr_map_entry_t *entry, lookup = { addr_map_entry_t *entry, lookup = {
.ip = addr->ip, .ip = addr->ip,
@@ -732,7 +731,7 @@ static void process_addr(private_kernel_pfroute_net_t *this,
DBG1(DBG_KNL, "%H disappeared from %s", DBG1(DBG_KNL, "%H disappeared from %s",
host, iface->ifname); host, iface->ifname);
} }
addr_map_entry_remove(addr, iface, this); addr_map_entry_remove(this, addr, iface);
addr_entry_destroy(addr); addr_entry_destroy(addr);
} }
} }
@@ -851,7 +850,7 @@ static void repopulate_iface(private_kernel_pfroute_net_t *this,
while (addrs->remove_last(addrs, (void**)&addr) == SUCCESS) while (addrs->remove_last(addrs, (void**)&addr) == SUCCESS)
{ {
addr_map_entry_remove(addr, iface, this); addr_map_entry_remove(this, addr, iface);
addr_entry_destroy(addr); addr_entry_destroy(addr);
} }
addrs->destroy(addrs); addrs->destroy(addrs);
@@ -955,6 +954,7 @@ static void process_announce(private_kernel_pfroute_net_t *this,
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
iface_entry_t *iface; iface_entry_t *iface;
addr_entry_t *addr;
if (msg->ifan_what != IFAN_DEPARTURE) if (msg->ifan_what != IFAN_DEPARTURE)
{ {
@@ -970,6 +970,12 @@ static void process_announce(private_kernel_pfroute_net_t *this,
{ {
DBG1(DBG_KNL, "interface %s disappeared", iface->ifname); DBG1(DBG_KNL, "interface %s disappeared", iface->ifname);
this->ifaces->remove_at(this->ifaces, enumerator); this->ifaces->remove_at(this->ifaces, enumerator);
while (iface->addrs->remove_last(iface->addrs,
(void**)&addr) == SUCCESS)
{
addr_map_entry_remove(this, addr, iface);
addr_entry_destroy(addr);
}
iface_entry_destroy(iface); iface_entry_destroy(iface);
break; break;
} }