commit 9c63b6924a1b882c053ad12651c1140f0806dd74
author Maciej Żenczykowski <maze@google.com> Sat May 23 16:10:31 2020 -0700
committer Maciej Zenczykowski <maze@google.com> Wed Jun 10 01:56:46 2020 +0000
tree 7b3b0259d9b3eb80fc2cd139090fe0ebba7feb6f
parent c44d4667bdce6b7852bcbdbb3d97ae1e60af8292

use/test pmtu from TetherOffloadRuleParcel

Tested: atest
Bug: 149816401
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Original-Change: https://android-review.googlesource.com/1316720
Merged-In: Id8a91ed5c0176b41c079ede5533af90b8756de6b
Change-Id: Id8a91ed5c0176b41c079ede5533af90b8756de6b

server/TetherController.cpp

diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 6b5b060..ad6e8a9 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -844,6 +844,9 @@
     if (rule.dstL2Address.size() != sizeof(hdr.h_dest)) {
         return Error(ENXIO) << "Invalid L2 dst address length " << rule.dstL2Address.size();
     }
+    if (rule.pmtu < IPV6_MIN_MTU || rule.pmtu > 0xFFFF) {
+        return Error(EINVAL) << "Invalid IPv6 path mtu " << rule.pmtu;
+    }
     return Result<void>();
 }
 }  // namespace
@@ -867,7 +870,7 @@
     TetherIngressValue value = {
             .oif = static_cast<uint32_t>(rule.outputInterfaceIndex),
             .macHeader = hdr,
-            .pmtu = 1500,  // TODO: don't just blindly use this default
+            .pmtu = static_cast<uint16_t>(rule.pmtu),
     };
 
     return mBpfIngressMap.writeValue(key, value, BPF_ANY);