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

kernel-netlink: Add priority and refcount to policy log

Browse Source
This commit is contained in:
Tobias Brunner
2016-06-10 10:34:09 +02:00
parent 25178f4594
commit 471b907613
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+31 -10
View File
@@ -2393,6 +2393,8 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
enumerator_t *enumerator; enumerator_t *enumerator;
bool found = FALSE, update = TRUE; bool found = FALSE, update = TRUE;
char markstr[32] = ""; char markstr[32] = "";
uint32_t cur_priority = 0;
int use_count;
/* create a policy */ /* create a policy */
INIT(policy, INIT(policy,
@@ -2463,15 +2465,23 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
break; break;
} }
} }
update = FALSE; if (update)
{
cur_priority = current_sa->priority;
update = FALSE;
}
} }
policy->used_by->insert_before(policy->used_by, enumerator, assigned_sa); policy->used_by->insert_before(policy->used_by, enumerator, assigned_sa);
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
use_count = policy->used_by->get_count(policy->used_by);
if (!update) if (!update)
{ /* we don't update the policy if the priority is lower than that of { /* we don't update the policy if the priority is lower than that of
* the currently installed one */ * the currently installed one */
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
DBG2(DBG_KNL, "not updating policy %R === %R %N%s [priority %u,"
"refcount %d]", id->src_ts, id->dst_ts, policy_dir_names,
id->dir, markstr, cur_priority, use_count);
return SUCCESS; return SUCCESS;
} }
@@ -2480,8 +2490,9 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
found = TRUE; found = TRUE;
} }
DBG2(DBG_KNL, "%s policy %R === %R %N%s", found ? "updating" : "adding", DBG2(DBG_KNL, "%s policy %R === %R %N%s [priority %u, refcount %d]",
id->src_ts, id->dst_ts, policy_dir_names, id->dir, markstr); found ? "updating" : "adding", id->src_ts, id->dst_ts,
policy_dir_names, id->dir, markstr, assigned_sa->priority, use_count);
if (add_policy_internal(this, policy, assigned_sa, found) != SUCCESS) if (add_policy_internal(this, policy, assigned_sa, found) != SUCCESS)
{ {
@@ -2586,7 +2597,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
struct nlmsghdr *hdr; struct nlmsghdr *hdr;
struct xfrm_userpolicy_id *policy_id; struct xfrm_userpolicy_id *policy_id;
bool is_installed = TRUE; bool is_installed = TRUE;
uint32_t priority, auto_priority; uint32_t priority, auto_priority, cur_priority;
ipsec_sa_t assigned_sa = { ipsec_sa_t assigned_sa = {
.src = data->src, .src = data->src,
.dst = data->dst, .dst = data->dst,
@@ -2594,6 +2605,7 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
.cfg = *data->sa, .cfg = *data->sa,
}; };
char markstr[32] = ""; char markstr[32] = "";
int use_count;
format_mark(markstr, sizeof(markstr), id->mark); format_mark(markstr, sizeof(markstr), id->mark);
@@ -2635,23 +2647,32 @@ METHOD(kernel_ipsec_t, del_policy, status_t,
policy_sa_destroy(mapping, &id->dir, this); policy_sa_destroy(mapping, &id->dir, this);
break; break;
} }
is_installed = FALSE; if (is_installed)
{
cur_priority = mapping->priority;
is_installed = FALSE;
}
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (current->used_by->get_count(current->used_by) > 0) use_count = current->used_by->get_count(current->used_by);
if (use_count > 0)
{ /* policy is used by more SAs, keep in kernel */ { /* policy is used by more SAs, keep in kernel */
DBG2(DBG_KNL, "policy still used by another CHILD_SA, not removed"); DBG2(DBG_KNL, "policy still used by another CHILD_SA, not removed");
if (!is_installed) if (!is_installed)
{ /* no need to update as the policy was not installed for this SA */ { /* no need to update as the policy was not installed for this SA */
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
DBG2(DBG_KNL, "not updating policy %R === %R %N%s [priority %u, "
"refcount %d]", id->src_ts, id->dst_ts, policy_dir_names,
id->dir, markstr, cur_priority, use_count);
return SUCCESS; return SUCCESS;
} }
DBG2(DBG_KNL, "updating policy %R === %R %N%s", id->src_ts, id->dst_ts,
policy_dir_names, id->dir, markstr);
current->used_by->get_first(current->used_by, (void**)&mapping); current->used_by->get_first(current->used_by, (void**)&mapping);
DBG2(DBG_KNL, "updating policy %R === %R %N%s [priority %u, "
"refcount %d]", id->src_ts, id->dst_ts, policy_dir_names, id->dir,
markstr, mapping->priority, use_count);
if (add_policy_internal(this, current, mapping, TRUE) != SUCCESS) if (add_policy_internal(this, current, mapping, TRUE) != SUCCESS)
{ {
DBG1(DBG_KNL, "unable to update policy %R === %R %N%s", DBG1(DBG_KNL, "unable to update policy %R === %R %N%s",