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

sql: Also do a reversed ID match

Browse Source 
This is required for the case where IDr is not sent (i.e. is %any).
The backend manager does the same.

Fixes #1044.
This commit is contained in:
Tobias Brunner
2015-08-17 18:58:14 +02:00
parent fffee7c759
commit 6927d6224e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/sql/sql_config.c
+9 -2
View File
@@ -323,6 +323,14 @@ static peer_cfg_t *get_peer_cfg_by_id(private_sql_config_t *this, int id)
return peer_cfg; return peer_cfg;
} }
/**
* Check if the two IDs match (the first one is optional)
*/
static inline bool id_matches(identification_t *id, identification_t *sql_id)
{
return !id || id->matches(id, sql_id) || sql_id->matches(sql_id, id);
}
/** /**
* Build a peer config from an SQL query * Build a peer config from an SQL query
*/ */
@@ -352,8 +360,7 @@ static peer_cfg_t *build_peer_cfg(private_sql_config_t *this, enumerator_t *e,
local_id = identification_create_from_encoding(l_type, l_data); local_id = identification_create_from_encoding(l_type, l_data);
remote_id = identification_create_from_encoding(r_type, r_data); remote_id = identification_create_from_encoding(r_type, r_data);
if ((me && !me->matches(me, local_id)) || if (!id_matches(me, local_id) || !id_matches(other, remote_id))
(other && !other->matches(other, remote_id)))
{ {
local_id->destroy(local_id); local_id->destroy(local_id);
remote_id->destroy(remote_id); remote_id->destroy(remote_id);