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

Do not overwrite the original mode when installing policies.

Browse Source 
The mode is later used to decide if a route has to be installed.
This commit is contained in:
Tobias Brunner
2010-09-02 19:04:20 +02:00
parent afc4505e11
commit 6da26f3008
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+5 -4
View File
@@ -1021,7 +1021,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
} }
} }
if (int_alg != AUTH_UNDEFINED) if (int_alg != AUTH_UNDEFINED)
{ {
alg_name = lookup_algorithm(integrity_algs, int_alg); alg_name = lookup_algorithm(integrity_algs, int_alg);
if (alg_name == NULL) if (alg_name == NULL)
@@ -1719,6 +1719,7 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
{ IPPROTO_ESP, spi != 0 }, { IPPROTO_ESP, spi != 0 },
{ IPPROTO_AH, ah_spi != 0 }, { IPPROTO_AH, ah_spi != 0 },
}; };
ipsec_mode_t proto_mode = mode;
rthdr->rta_type = XFRMA_TMPL; rthdr->rta_type = XFRMA_TMPL;
rthdr->rta_len = 0; /* actual length is set below */ rthdr->rta_len = 0; /* actual length is set below */
@@ -1740,12 +1741,12 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
tmpl->reqid = reqid; tmpl->reqid = reqid;
tmpl->id.proto = protos[i].proto; tmpl->id.proto = protos[i].proto;
tmpl->aalgos = tmpl->ealgos = tmpl->calgos = ~0; tmpl->aalgos = tmpl->ealgos = tmpl->calgos = ~0;
tmpl->mode = mode2kernel(mode); tmpl->mode = mode2kernel(proto_mode);
tmpl->optional = protos[i].proto == IPPROTO_COMP && tmpl->optional = protos[i].proto == IPPROTO_COMP &&
direction != POLICY_OUT; direction != POLICY_OUT;
tmpl->family = src->get_family(src); tmpl->family = src->get_family(src);
if (mode == MODE_TUNNEL) if (proto_mode == MODE_TUNNEL)
{ /* only for tunnel mode */ { /* only for tunnel mode */
host2xfrm(src, &tmpl->saddr); host2xfrm(src, &tmpl->saddr);
host2xfrm(dst, &tmpl->id.daddr); host2xfrm(dst, &tmpl->id.daddr);
@@ -1754,7 +1755,7 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
tmpl++; tmpl++;
/* use transport mode for other SAs */ /* use transport mode for other SAs */
mode = MODE_TRANSPORT; proto_mode = MODE_TRANSPORT;
} }
rthdr = XFRM_RTA_NEXT(rthdr); rthdr = XFRM_RTA_NEXT(rthdr);