diff options
author | Martin Willi <martin@strongswan.org> | 2008-07-16 12:33:19 +0000 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2008-07-16 12:33:19 +0000 |
commit | 7ca49551c8cab62c66347d8240e02b832f8f6b98 (patch) | |
tree | 75bc6fdabbc0c46d2c78c332da57cd779a419400 /src/charon/kernel/kernel_interface.c | |
parent | 7b9e1ff0fdad9f045fde24a7bbe0b416f35bd1f5 (diff) | |
download | strongswan-7ca49551c8cab62c66347d8240e02b832f8f6b98.tar.bz2 strongswan-7ca49551c8cab62c66347d8240e02b832f8f6b98.tar.xz |
do not distinguish different policy protocols in userland cache
Diffstat (limited to 'src/charon/kernel/kernel_interface.c')
-rw-r--r-- | src/charon/kernel/kernel_interface.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/charon/kernel/kernel_interface.c b/src/charon/kernel/kernel_interface.c index b32b198b9..c5fba5238 100644 --- a/src/charon/kernel/kernel_interface.c +++ b/src/charon/kernel/kernel_interface.c @@ -224,9 +224,6 @@ struct policy_entry_t { /** direction of this policy: in, out, forward */ u_int8_t direction; - /** protocol ID: ESP/AH */ - protocol_id_t proto; - /** reqid of the policy */ u_int32_t reqid; @@ -2617,7 +2614,6 @@ static status_t add_policy(private_kernel_interface_t *this, memset(policy, 0, sizeof(policy_entry_t)); policy->sel = ts2selector(src_ts, dst_ts); policy->direction = direction; - policy->proto = protocol; /* find the policy, which matches EXACTLY */ pthread_mutex_lock(&this->mutex); @@ -2625,8 +2621,7 @@ static status_t add_policy(private_kernel_interface_t *this, while (iterator->iterate(iterator, (void**)¤t)) { if (memeq(¤t->sel, &policy->sel, sizeof(struct xfrm_selector)) && - policy->direction == current->direction && - policy->proto == current->proto) + policy->direction == current->direction) { /* use existing policy */ current->refcount++; |