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

Clarified code when hashing/comparing cached policies in kernel-netlink

Browse Source
This commit is contained in:
Tobias Brunner
2012-09-28 18:30:16 +02:00
parent 8b0dce08f2
commit 6ffb8f8634
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+4 -5
View File
@@ -590,9 +590,8 @@ static void policy_entry_destroy(private_kernel_netlink_ipsec_t *this,
*/ */
static u_int policy_hash(policy_entry_t *key) static u_int policy_hash(policy_entry_t *key)
{ {
chunk_t chunk = chunk_create((void*)&key->sel, chunk_t chunk = chunk_from_thing(key->sel);
sizeof(struct xfrm_selector) + sizeof(u_int32_t)); return chunk_hash_inc(chunk, chunk_hash(chunk_from_thing(key->mark)));
return chunk_hash(chunk);
} }
/** /**
@@ -600,8 +599,8 @@ static u_int policy_hash(policy_entry_t *key)
*/ */
static bool policy_equals(policy_entry_t *key, policy_entry_t *other_key) static bool policy_equals(policy_entry_t *key, policy_entry_t *other_key)
{ {
return memeq(&key->sel, &other_key->sel, return memeq(&key->sel, &other_key->sel, sizeof(struct xfrm_selector)) &&
sizeof(struct xfrm_selector) + sizeof(u_int32_t)) && key->mark == other_key->mark &&
key->direction == other_key->direction; key->direction == other_key->direction;
} }