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

shunt-mananger: Make outbound FWD shunt policies optional

Browse Source
This commit is contained in:
Tobias Brunner
2017-11-02 10:47:53 +01:00
parent 2dad293647
commit 6ebf852c3f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/shunt_manager.c
+15 -6
View File
@@ -96,6 +96,7 @@ static bool install_shunt_policy(child_cfg_t *child)
status_t status = SUCCESS; status_t status = SUCCESS;
uint32_t manual_prio; uint32_t manual_prio;
char *interface; char *interface;
bool fwd_out;
ipsec_sa_cfg_t sa = { .mode = MODE_TRANSPORT }; ipsec_sa_cfg_t sa = { .mode = MODE_TRANSPORT };
switch (child->get_mode(child)) switch (child->get_mode(child))
@@ -122,6 +123,7 @@ static bool install_shunt_policy(child_cfg_t *child)
manual_prio = child->get_manual_prio(child); manual_prio = child->get_manual_prio(child);
interface = child->get_interface(child); interface = child->get_interface(child);
fwd_out = child->has_option(child, OPT_FWD_OUT_POLICIES);
/* enumerate pairs of traffic selectors */ /* enumerate pairs of traffic selectors */
e_my_ts = my_ts_list->create_enumerator(my_ts_list); e_my_ts = my_ts_list->create_enumerator(my_ts_list);
@@ -157,9 +159,11 @@ static bool install_shunt_policy(child_cfg_t *child)
.sa = &sa, .sa = &sa,
}; };
status |= charon->kernel->add_policy(charon->kernel, &id, &policy); status |= charon->kernel->add_policy(charon->kernel, &id, &policy);
/* install "outbound" forward policy */ if (fwd_out)
id.dir = POLICY_FWD; { /* install "outbound" forward policy */
status |= charon->kernel->add_policy(charon->kernel, &id, &policy); id.dir = POLICY_FWD;
status |= charon->kernel->add_policy(charon->kernel, &id, &policy);
}
/* install in policy */ /* install in policy */
id = (kernel_ipsec_policy_id_t){ id = (kernel_ipsec_policy_id_t){
.dir = POLICY_IN, .dir = POLICY_IN,
@@ -255,6 +259,7 @@ static void uninstall_shunt_policy(child_cfg_t *child)
status_t status = SUCCESS; status_t status = SUCCESS;
uint32_t manual_prio; uint32_t manual_prio;
char *interface; char *interface;
bool fwd_out;
ipsec_sa_cfg_t sa = { .mode = MODE_TRANSPORT }; ipsec_sa_cfg_t sa = { .mode = MODE_TRANSPORT };
switch (child->get_mode(child)) switch (child->get_mode(child))
@@ -281,6 +286,7 @@ static void uninstall_shunt_policy(child_cfg_t *child)
manual_prio = child->get_manual_prio(child); manual_prio = child->get_manual_prio(child);
interface = child->get_interface(child); interface = child->get_interface(child);
fwd_out = child->has_option(child, OPT_FWD_OUT_POLICIES);
/* enumerate pairs of traffic selectors */ /* enumerate pairs of traffic selectors */
e_my_ts = my_ts_list->create_enumerator(my_ts_list); e_my_ts = my_ts_list->create_enumerator(my_ts_list);
@@ -316,9 +322,12 @@ static void uninstall_shunt_policy(child_cfg_t *child)
.sa = &sa, .sa = &sa,
}; };
status |= charon->kernel->del_policy(charon->kernel, &id, &policy); status |= charon->kernel->del_policy(charon->kernel, &id, &policy);
/* uninstall "outbound" forward policy */ if (fwd_out)
id.dir = POLICY_FWD; {
status |= charon->kernel->del_policy(charon->kernel, &id, &policy); /* uninstall "outbound" forward policy */
id.dir = POLICY_FWD;
status |= charon->kernel->del_policy(charon->kernel, &id, &policy);
}
/* uninstall in policy */ /* uninstall in policy */
id = (kernel_ipsec_policy_id_t){ id = (kernel_ipsec_policy_id_t){
.dir = POLICY_IN, .dir = POLICY_IN,