commit a7ed3f9fc8862069a3856efe4a183ca57af3a91d
author Maciej enczykowski <maze@google.com> Wed Aug 28 17:09:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 28 17:09:40 2019 -0700
tree 777569aa2d80488be6c7f8c768af5aaf4e390e8f
parent 78bb58532039d7b39aa1fb4b528bf53f57fc516e
parent 5f68982d02fcbd582e10b96485034f76140f3785

clat: add support for ESP, mirroring existing GRE support
am: 5f68982d02

Change-Id: I1582e1bec08f68ef086f10d9e78c8355b0408cd7

BUGS

diff --git a/BUGS b/BUGS
index 70aeb9f..24e6639 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 known problems/assumptions:
- - does not handle protocols other than ICMP, UDP, TCP and GRE
+ - does not handle protocols other than ICMP, UDP, TCP and GRE/ESP
  - assumes the handset has its own (routed) /64 ipv6 subnet
  - assumes the /128 ipv6 subnet it generates can use the nat64 gateway
  - assumes the nat64 gateway has the ipv4 address in the last 32 bits of the ipv6 address (that it uses a /96 plat subnet)

ipv4.c

diff --git a/ipv4.c b/ipv4.c
index 56d83ac..c052d03 100644
--- a/ipv4.c
+++ b/ipv4.c
@@ -131,7 +131,7 @@
   } else if (nxthdr == IPPROTO_UDP) {
     iov_len =
       udp_packet(out, pos + 2, (const struct udphdr *)next_header, old_sum, new_sum, len_left);
-  } else if (nxthdr == IPPROTO_GRE) {
+  } else if (nxthdr == IPPROTO_GRE || nxthdr == IPPROTO_ESP) {
     iov_len = generic_packet(out, pos + 2, next_header, len_left);
   } else {
 #if CLAT_DEBUG

ipv6.c

diff --git a/ipv6.c b/ipv6.c
index c9b547e..ca3e4c6 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -163,7 +163,7 @@
   } else if (protocol == IPPROTO_UDP) {
     iov_len =
       udp_packet(out, pos + 2, (const struct udphdr *)next_header, old_sum, new_sum, len_left);
-  } else if (protocol == IPPROTO_GRE) {
+  } else if (protocol == IPPROTO_GRE || protocol == IPPROTO_ESP) {
     iov_len = generic_packet(out, pos + 2, next_header, len_left);
   } else {
 #if CLAT_DEBUG