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

fixed problem with static leases over multiple pools

Browse Source
This commit is contained in:
Andreas Steffen
2009-07-16 21:53:46 +02:00
parent 375a91bb9b
commit 07be083b7f
1 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/sql/sql_attribute.c
+36 -8
View File
@@ -137,13 +137,29 @@ static host_t *get_address(private_sql_attribute_t *this, char *name,
} }
} }
/* check for an expired lease */ /* check for an available address */
while (TRUE) while (TRUE)
{ {
e = this->db->query(this->db, int hits;
if (timeout)
{
/* check for an expired lease */
e = this->db->query(this->db,
"SELECT id, address FROM addresses " "SELECT id, address FROM addresses "
"WHERE pool = ? AND released != 0 AND released < ? LIMIT 1", "WHERE pool = ? AND released != 0 AND released < ? LIMIT 1",
DB_UINT, pool, DB_UINT, now - timeout, DB_UINT, DB_BLOB); DB_UINT, pool, DB_UINT, now - timeout, DB_UINT, DB_BLOB);
}
else
{
/* with static leases, check for an unallocated address */
e = this->db->query(this->db,
"SELECT id, address FROM addresses "
"WHERE pool = ? AND identity = 0 LIMIT 1",
DB_UINT, pool, DB_UINT, DB_BLOB);
}
if (!e || !e->enumerate(e, &id, &address)) if (!e || !e->enumerate(e, &id, &address))
{ {
DESTROY_IF(e); DESTROY_IF(e);
@@ -152,12 +168,24 @@ static host_t *get_address(private_sql_attribute_t *this, char *name,
address = chunk_clonea(address); address = chunk_clonea(address);
e->destroy(e); e->destroy(e);
if (this->db->execute(this->db, NULL, if (timeout)
"UPDATE addresses SET " {
"acquired = ?, released = 0, identity = ? " hits = this->db->execute(this->db, NULL,
"WHERE id = ? AND released != 0 AND released < ?", "UPDATE addresses SET "
DB_UINT, now, DB_UINT, identity, "acquired = ?, released = 0, identity = ? "
DB_UINT, id, DB_UINT, now - timeout) > 0) "WHERE id = ? AND released != 0 AND released < ?",
DB_UINT, now, DB_UINT, identity,
DB_UINT, id, DB_UINT, now - timeout);
}
else
{
hits = this->db->execute(this->db, NULL,
"UPDATE addresses SET "
"acquired = ?, released = 0, identity = ? "
"WHERE id = ? AND identity = 0",
DB_UINT, now, DB_UINT, identity, DB_UINT, id);
}
if (hits > 0)
{ {
host = host_create_from_chunk(AF_UNSPEC, address, 0); host = host_create_from_chunk(AF_UNSPEC, address, 0);
if (host) if (host)