diff options
| author | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2018-06-06 11:11:52 +0200 |
|---|---|---|
| committer | Christian Mauderer <christian.mauderer@embedded-brains.de> | 2018-08-01 09:55:27 +0200 |
| commit | 8645c9d72011bfeae72ccecd3edd0f9b295c59c6 (patch) | |
| tree | eef2015473744e60eeec429eeb44ec98bf12167a /ipsec-tools/src/racoon/pfkey.c | |
| parent | Import ipsec-tools 0.8.2. (diff) | |
| download | rtems-libbsd-8645c9d72011bfeae72ccecd3edd0f9b295c59c6.tar.bz2 | |
ipsec-tools: Apply patches from FreeBSD ports.
Source: https://svnweb.freebsd.org/ports/head/security/ipsec-tools/files/ revision 468617.
Diffstat (limited to '')
| -rw-r--r-- | ipsec-tools/src/racoon/pfkey.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipsec-tools/src/racoon/pfkey.c b/ipsec-tools/src/racoon/pfkey.c index d00b166d..68879992 100644 --- a/ipsec-tools/src/racoon/pfkey.c +++ b/ipsec-tools/src/racoon/pfkey.c @@ -1190,7 +1190,10 @@ pk_sendupdate(iph2) sa_args.l_natt_type = iph2->ph1->natt_options->encaps_type; sa_args.l_natt_sport = extract_port(iph2->ph1->remote); sa_args.l_natt_dport = extract_port(iph2->ph1->local); - sa_args.l_natt_oa = iph2->natoa_src; + /* if (iph2->ph1->natt_flags & NAT_DETECTED_PEER) */ + sa_args.l_natt_oai = iph2->natoa_dst; + /* if (iph2->ph1->natt_flags & NAT_DETECTED_ME) */ + sa_args.l_natt_oar = iph2->natoa_src; #ifdef SADB_X_EXT_NAT_T_FRAG sa_args.l_natt_frag = iph2->ph1->rmconf->esp_frag; #endif @@ -1477,7 +1480,6 @@ pk_sendadd(iph2) sa_args.l_natt_type = UDP_ENCAP_ESPINUDP; sa_args.l_natt_sport = extract_port(iph2->ph1->local); sa_args.l_natt_dport = extract_port(iph2->ph1->remote); - sa_args.l_natt_oa = iph2->natoa_dst; #ifdef SADB_X_EXT_NAT_T_FRAG sa_args.l_natt_frag = iph2->ph1->rmconf->esp_frag; #endif |