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

eap-radius: Compare address family when handing out virtual IPs

Browse Source 
This also ensures that the actually released virtual IP is removed from
the list of claimed IPs.

Fixes #1199.
This commit is contained in:
Tobias Brunner
2015-11-12 14:32:11 +01:00
parent d801fedb19
commit fdfbd401c3
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_radius/eap_radius_provider.c
+26 -6
View File
@@ -178,18 +178,38 @@ static void add_addr(private_eap_radius_provider_t *this,
* Remove the next address from the locked hashtable stored for given id * Remove the next address from the locked hashtable stored for given id
*/ */
static host_t* remove_addr(private_eap_radius_provider_t *this, static host_t* remove_addr(private_eap_radius_provider_t *this,
hashtable_t *hashtable, uintptr_t id) hashtable_t *hashtable, uintptr_t id, host_t *addr)
{ {
enumerator_t *enumerator;
entry_t *entry; entry_t *entry;
host_t *addr = NULL; host_t *found = NULL, *current;
entry = hashtable->remove(hashtable, (void*)id); entry = hashtable->remove(hashtable, (void*)id);
if (entry) if (entry)
{ {
entry->addrs->remove_first(entry->addrs, (void**)&addr); enumerator = entry->addrs->create_enumerator(entry->addrs);
while (enumerator->enumerate(enumerator, &current))
{
if (addr->ip_equals(addr, current))
{ /* prefer an exact match */
entry->addrs->remove_at(entry->addrs, enumerator);
enumerator->destroy(enumerator);
put_or_destroy_entry(hashtable, entry);
return current;
}
if (!found && addr->get_family(addr) == current->get_family(current))
{ /* fallback to the first IP with a matching address family */
found = current;
}
}
enumerator->destroy(enumerator);
if (found)
{
entry->addrs->remove(entry->addrs, found, NULL);
}
put_or_destroy_entry(hashtable, entry); put_or_destroy_entry(hashtable, entry);
} }
return addr; return found;
} }
/** /**
@@ -326,7 +346,7 @@ METHOD(attribute_provider_t, acquire_address, host_t*,
if (streq(name, "radius")) if (streq(name, "radius"))
{ {
this->listener.mutex->lock(this->listener.mutex); this->listener.mutex->lock(this->listener.mutex);
addr = remove_addr(this, this->listener.unclaimed, sa); addr = remove_addr(this, this->listener.unclaimed, sa, requested);
if (addr) if (addr)
{ {
add_addr(this, this->listener.claimed, sa, addr->clone(addr)); add_addr(this, this->listener.claimed, sa, addr->clone(addr));
@@ -357,7 +377,7 @@ METHOD(attribute_provider_t, release_address, bool,
if (streq(name, "radius")) if (streq(name, "radius"))
{ {
this->listener.mutex->lock(this->listener.mutex); this->listener.mutex->lock(this->listener.mutex);
found = remove_addr(this, this->listener.claimed, sa); found = remove_addr(this, this->listener.claimed, sa, address);
this->listener.mutex->unlock(this->listener.mutex); this->listener.mutex->unlock(this->listener.mutex);
break; break;
} }