commit bbe2d309343bec3991393af40e24bdba2f094fc9
author Tyler Wear <twear@codeaurora.org> Wed May 02 19:59:49 2018 +0530
committer Shammi Khattar <skhattar@codeaurora.org> Mon Jun 11 05:45:58 2018 +0000
tree e101786b392f435ab73a32c941f871af6ca5025c
parent 90fbb3a0cb75d4838fa961f108c926e3627d2a48

netd: Active FTP Helper

Enable the conntrack helper for active FTP connections when
tethering is started.

Change-Id: I5c812afe9602e80ea1c42d0cafba40fe6019a995
===========================================================

netd: Active FTP Out Iface

Out iface is not used on PREROUTING chain.

Change-Id: I4f89066c52a07ebaad174b513b132de60934fb22
===========================================================

Change-Id: I3f31351b0f032b4aaaad22107c558a8a1a35e617
CRs-fixed: 2151131 2136660

server/TetherControllerTest.cpp

diff --git a/server/TetherControllerTest.cpp b/server/TetherControllerTest.cpp
index bcdb106..6e77bfe 100644
--- a/server/TetherControllerTest.cpp
+++ b/server/TetherControllerTest.cpp
@@ -127,6 +127,10 @@
             "COMMIT\n", intIf);
 
         std::vector<std::string> v4Cmds = {
+            "*raw",
+            StringPrintf("-A tetherctrl_raw_PREROUTING -p tcp --dport 21 -i %s -j CT --helper ftp",
+                         intIf),
+            "COMMIT",
             "*filter",
             StringPrintf("-A tetherctrl_FORWARD -i %s -o %s -m state --state"
                          " ESTABLISHED,RELATED -g tetherctrl_counters", extIf, intIf),
@@ -195,6 +199,10 @@
             "COMMIT\n", intIf);
 
         std::vector<std::string> v4Cmds = {
+            "*raw",
+            StringPrintf("-D tetherctrl_raw_PREROUTING -p tcp --dport 21 -i %s -j CT --helper ftp",
+                         intIf),
+            "COMMIT",
             "*filter",
             StringPrintf("-D tetherctrl_FORWARD -i %s -o %s -m state --state"
                          " ESTABLISHED,RELATED -g tetherctrl_counters", extIf, intIf),