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

kernel-pfkey: Update priority calculation formula to the new one in kernel-netlink

Browse Source 
Since the selectors are not exactly the same (no port masks, no interface)
some small tweaks have been applied.
This commit is contained in:
Tobias Brunner
2016-04-15 10:39:00 +02:00
parent 869f4e90b1
commit 4e59618382
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+25 -14
View File
@@ -141,8 +141,8 @@
#define SOL_UDP IPPROTO_UDP #define SOL_UDP IPPROTO_UDP
#endif #endif
/** base priority for installed policies */ /** Base priority for installed policies */
#define PRIO_BASE 384 #define PRIO_BASE 100000
#ifdef __APPLE__ #ifdef __APPLE__
/** from xnu/bsd/net/pfkeyv2.h */ /** from xnu/bsd/net/pfkeyv2.h */
@@ -590,33 +590,44 @@ static inline bool policy_entry_match_byindex(policy_entry_t *current,
/** /**
* Calculate the priority of a policy * Calculate the priority of a policy
*
* This is the same formula we use in the kernel-netlink interface, but some
* features are currently not or only partially supported by PF_KEY.
*
* bits 0-0: reserved for interface restriction (0..1) 1 bit
* bits 1-6: src + dst port mask bits (2 * 0..16) 6 bits
* bits 7-7: restriction to protocol (0..1) 1 bit
* bits 8-16: src + dst network mask bits (2 * 0..128) 9 bits
* 17 bits
*
* smallest value: 000000000 0 000000 0: 0, lowest priority = 100'000
* largest value : 100000000 1 100000 0: 65'728, highst priority = 34'272
*/ */
static inline uint32_t get_priority(policy_entry_t *policy, static inline uint32_t get_priority(policy_entry_t *policy,
policy_priority_t prio) policy_priority_t prio)
{ {
uint32_t priority = PRIO_BASE; uint32_t priority = PRIO_BASE;
switch (prio) switch (prio)
{ {
case POLICY_PRIORITY_FALLBACK: case POLICY_PRIORITY_FALLBACK:
priority <<= 1; priority += PRIO_BASE;
/* fall-through */ /* fall-through */
case POLICY_PRIORITY_ROUTED: case POLICY_PRIORITY_ROUTED:
priority <<= 1; priority += PRIO_BASE;
/* fall-through */ /* fall-through */
case POLICY_PRIORITY_DEFAULT: case POLICY_PRIORITY_DEFAULT:
priority <<= 1; priority += PRIO_BASE;
/* fall-trough */ /* fall-through */
case POLICY_PRIORITY_PASS: case POLICY_PRIORITY_PASS:
break; break;
} }
/* calculate priority based on selector size, small size = high prio */
priority -= policy->src.mask; /* calculate priority */
priority -= policy->dst.mask; priority -= (policy->src.mask + policy->dst.mask) * 256;
priority <<= 2; /* make some room for the two flags */ priority -= policy->src.proto != IPSEC_PROTO_ANY ? 128 : 0;
priority += policy->src.net->get_port(policy->src.net) || priority -= policy->src.net->get_port(policy->src.net) ? 32 : 0;
policy->dst.net->get_port(policy->dst.net) ? priority -= policy->dst.net->get_port(policy->dst.net) ? 32 : 0;
0 : 2;
priority += policy->src.proto != IPSEC_PROTO_ANY ? 0 : 1;
return priority; return priority;
} }