commit e801d3cb07775812f526c66b4e396ab16f3e6edf
author Lorenzo Colitti <lorenzo@google.com> Tue Feb 18 00:00:35 2020 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Feb 18 20:04:45 2020 +0900
tree 282087b192baf86460b0d91435ea4dba0e267593
parent 5e0c80aee08c5a65e788d8c3ec98727816f41fbb

Add binder IPCs to add and remove downstream IPv6 tethering rules

Test: None
Change-Id: Idcb6b9c80de499fafb29e4e8b9202d7b7386340c

server/NetdNativeService.h

diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index 34d6215..0c241d7 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -132,6 +132,16 @@
     binder::Status tetherInterfaceList(std::vector<std::string>* ifList) override;
     binder::Status tetherDnsSet(int32_t netId, const std::vector<std::string>& dnsAddrs) override;
     binder::Status tetherDnsList(std::vector<std::string>* dnsList) override;
+    binder::Status tetherAddForward(const std::string& intIface,
+                                    const std::string& extIface) override;
+    binder::Status tetherRemoveForward(const std::string& intIface,
+                                       const std::string& extIface) override;
+    binder::Status tetherRuleAddDownstreamIpv6(int intIfaceIndex, int extIfaceIndex,
+                                               const std::vector<uint8_t>& ipAddress,
+                                               const std::vector<uint8_t>& srcL2Address,
+                                               const std::vector<uint8_t>& dstL2Address) override;
+    binder::Status tetherRuleRemoveDownstreamIpv6(int extIfaceIndex,
+                                                  const std::vector<uint8_t>& ipAddress) override;
 
     // Interface-related commands.
     binder::Status interfaceAddAddress(const std::string &ifName,
@@ -238,11 +248,6 @@
                                             const std::string& toIface) override;
     binder::Status ipfwdRemoveInterfaceForward(const std::string& fromIface,
                                                const std::string& toIface) override;
-    // Tether-forward-related commands
-    binder::Status tetherAddForward(const std::string& intIface,
-                                    const std::string& extIface) override;
-    binder::Status tetherRemoveForward(const std::string& intIface,
-                                       const std::string& extIface) override;
 
     // tcp_mem-config command
     binder::Status setTcpRWmemorySize(const std::string& rmemValues,