Changeset 4656

Show
Ignore:
Timestamp:
11/14/08 14:12:07 (2 months ago)
Author:
martin
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c

    r4654 r4656  
    12101210                          host_t *src, host_t *dst, 
    12111211                          host_t *new_src, host_t *new_dst, 
    1212                           bool encap, bool new_encap) 
     1212                          bool old_encap, bool new_encap) 
    12131213{ 
    12141214    unsigned char request[NETLINK_BUFFER_SIZE], *pos; 
    …… 
    13211321    { 
    13221322        /* copy all attributes, but not XFRMA_ENCAP if we are disabling it */ 
    1323         if (rta->rta_type != XFRMA_ENCAP || encap) 
     1323        if (rta->rta_type != XFRMA_ENCAP || new_encap) 
    13241324        { 
    13251325            if (rta->rta_type == XFRMA_ENCAP) 
    …… 
    13371337     
    13381338    rta = (struct rtattr*)pos; 
    1339     if (tmpl == NULL && encap) 
     1339    if (tmpl == NULL && new_encap) 
    13401340    {   /* add tmpl if we are enabling it */ 
    13411341        rta->rta_type = XFRMA_ENCAP;