diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2013-10-10 11:02:16 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-10-11 15:29:10 +0200 |
| commit | bd085dd978b2dc7891c0d8486dd883e76e15e9a3 (patch) | |
| tree | 5a10d4f4fcbb3af8250ccc6cf16d32da6085a473 /src/libhydra/plugins/attr_sql/sql_attribute.c | |
| parent | b283a6e9efd2ff16ec5b189435604b0d82d714cd (diff) | |
| download | strongswan-bd085dd978b2dc7891c0d8486dd883e76e15e9a3.tar.bz2 strongswan-bd085dd978b2dc7891c0d8486dd883e76e15e9a3.tar.xz | |
attr-sql: Use a serializable transaction when inserting identities
Diffstat (limited to 'src/libhydra/plugins/attr_sql/sql_attribute.c')
| -rw-r--r-- | src/libhydra/plugins/attr_sql/sql_attribute.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/libhydra/plugins/attr_sql/sql_attribute.c b/src/libhydra/plugins/attr_sql/sql_attribute.c index 20c606ef3..0a06c419f 100644 --- a/src/libhydra/plugins/attr_sql/sql_attribute.c +++ b/src/libhydra/plugins/attr_sql/sql_attribute.c @@ -50,9 +50,8 @@ static u_int get_identity(private_sql_attribute_t *this, identification_t *id) { enumerator_t *e; u_int row; - int try = 0; -retry: + this->db->transaction(this->db, TRUE); /* look for peer identity in the identities table */ e = this->db->query(this->db, "SELECT id FROM identities WHERE type = ? AND data = ?", @@ -61,26 +60,20 @@ retry: if (e && e->enumerate(e, &row)) { e->destroy(e); + this->db->commit(this->db); return row; } DESTROY_IF(e); - if (try > 0) - { - return 0; - } /* not found, insert new one */ if (this->db->execute(this->db, &row, "INSERT INTO identities (type, data) VALUES (?, ?)", DB_INT, id->get_type(id), DB_BLOB, id->get_encoding(id)) == 1) { + this->db->commit(this->db); return row; } - /* the INSERT could fail due to the UNIQUE constraint, if the identity was - * added concurrently by another thread or the pool utility, - * therefore try finding it again. a nicer fix would be to use locking - * on the database, but our API currently not supports that */ - try++; - goto retry; + this->db->rollback(this->db); + return 0; } /** |