diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2011-07-22 13:52:23 -0700 |
|---|---|---|
| committer | Chia-chi Yeh <chiachi@android.com> | 2011-07-22 13:52:23 -0700 |
| commit | d4f1b2cfa6b6817c6330aef4459a7677094870b8 (patch) | |
| tree | fff9f945772e0ae654f4f8efeaef8721d7e7f958 | |
| parent | a9a07aca7cd1e611f2d73582f20623cd62b917ba (diff) | |
| download | ipsec-tools-d4f1b2cfa6b6817c6330aef4459a7677094870b8.tar.gz | |
ipsec-tools: fix compatibility issue on non-NAT connections.
Change-Id: Iea0e66d2bcc20cfd271402f8115393532bc82d3a
| -rw-r--r-- | src/racoon/ipsec_doi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/racoon/ipsec_doi.c b/src/racoon/ipsec_doi.c index b80a90c..ba91f48 100644 --- a/src/racoon/ipsec_doi.c +++ b/src/racoon/ipsec_doi.c @@ -3200,13 +3200,9 @@ ipsecdoi_transportmode(pp) for (; pp; pp = pp->next) { for (pr = pp->head; pr; pr = pr->next) { -#ifdef ANDROID_PATCHED - if (pr->encmode != IPSECDOI_ATTR_ENC_MODE_TRNS) -#else if (pr->encmode != IPSECDOI_ATTR_ENC_MODE_TRNS && pr->encmode != IPSECDOI_ATTR_ENC_MODE_UDPTRNS_RFC && pr->encmode != IPSECDOI_ATTR_ENC_MODE_UDPTRNS_DRAFT) -#endif return 0; } } @@ -3971,7 +3967,11 @@ ipsecdoi_setid2(iph2) s_ipsecdoi_ident(((struct ipsecdoi_id_b *)iph2->id->v)->type)); /* remote side */ +#ifdef ANDROID_PATCHED + if (1) +#else if (!ipsecdoi_transportmode(iph2->proposal)) +#endif iph2->id_p = ipsecdoi_sockaddr2id((struct sockaddr *)&sp->spidx.dst, sp->spidx.prefd, sp->spidx.ul_proto); else if (iph2->sa_dst != NULL) { |