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

fixed encap enabling in xfrm (using new encap state, not the old one)

Browse Source
This commit is contained in:
Martin Willi
2008-11-14 13:12:07 +00:00
parent fb6c8591a3
commit fd2ebf0cf9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+3 -3
View File
@@ -1209,7 +1209,7 @@ static status_t update_sa(private_kernel_netlink_ipsec_t *this,
u_int32_t spi, protocol_id_t protocol, u_int16_t cpi, u_int32_t spi, protocol_id_t protocol, u_int16_t cpi,
host_t *src, host_t *dst, host_t *src, host_t *dst,
host_t *new_src, host_t *new_dst, host_t *new_src, host_t *new_dst,
bool encap, bool new_encap) bool old_encap, bool new_encap)
{ {
unsigned char request[NETLINK_BUFFER_SIZE], *pos; unsigned char request[NETLINK_BUFFER_SIZE], *pos;
struct nlmsghdr *hdr, *out = NULL; struct nlmsghdr *hdr, *out = NULL;
@@ -1320,7 +1320,7 @@ static status_t update_sa(private_kernel_netlink_ipsec_t *this,
while(RTA_OK(rta, rtasize)) while(RTA_OK(rta, rtasize))
{ {
/* copy all attributes, but not XFRMA_ENCAP if we are disabling it */ /* copy all attributes, but not XFRMA_ENCAP if we are disabling it */
if (rta->rta_type != XFRMA_ENCAP || encap) if (rta->rta_type != XFRMA_ENCAP || new_encap)
{ {
if (rta->rta_type == XFRMA_ENCAP) if (rta->rta_type == XFRMA_ENCAP)
{ /* update encap tmpl */ { /* update encap tmpl */
@@ -1336,7 +1336,7 @@ static status_t update_sa(private_kernel_netlink_ipsec_t *this,
} }
rta = (struct rtattr*)pos; rta = (struct rtattr*)pos;
if (tmpl == NULL && encap) if (tmpl == NULL && new_encap)
{ /* add tmpl if we are enabling it */ { /* add tmpl if we are enabling it */
rta->rta_type = XFRMA_ENCAP; rta->rta_type = XFRMA_ENCAP;
rta->rta_len = RTA_LENGTH(sizeof(struct xfrm_encap_tmpl)); rta->rta_len = RTA_LENGTH(sizeof(struct xfrm_encap_tmpl));