commit f7267cfcfc7db62b8365fcff621403c0dadcfd67
author Maciej Żenczykowski <maze@google.com> Sat Apr 23 15:14:58 2022 +0000
committer Nucca Chen <nuccachen@google.com> Tue Apr 26 08:54:29 2022 +0000
tree 3e2a4853bd4634fe9019889dc7fb0ef64a5628d0
parent 10c98a6dd659b969dc374d21fb576774baa4d01d

remove ndc clat command - it's dead now

(due to move of clat related functionality out of netd
 and into mainline, the underlying netd binder calls now always fail)

Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2072095


Test: TreeHugger
Bug: 212345928
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Merged-In: Ifa694dae61068e13389bf31db81cc9257e4e143c
Change-Id: Ifa694dae61068e13389bf31db81cc9257e4e143c

server/NdcDispatcher.cpp

diff --git a/server/NdcDispatcher.cpp b/server/NdcDispatcher.cpp
index 80ad7fb..303d0dd 100644
--- a/server/NdcDispatcher.cpp
+++ b/server/NdcDispatcher.cpp
@@ -136,7 +136,6 @@
     registerCmd(new BandwidthControlCmd());
     registerCmd(new IdletimerControlCmd());
     registerCmd(new FirewallCmd());
-    registerCmd(new ClatdCmd());
     registerCmd(new NetworkCommand());
     registerCmd(new StrictCmd());
 }
@@ -844,40 +843,6 @@
     return 0;
 }
 
-NdcDispatcher::ClatdCmd::ClatdCmd() : NdcNetdCommand("clatd") {}
-
-int NdcDispatcher::ClatdCmd::runCommand(NdcClient* cli, int argc, char** argv) const {
-    int rc = 0;
-    if (argc < 3) {
-        cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing argument", false);
-        return 0;
-    }
-
-    std::string v6Addr;
-
-    if (!strcmp(argv[1], "stop")) {
-        rc = !mNetd->clatdStop(argv[2]).isOk();
-    } else if (!strcmp(argv[1], "start")) {
-        if (argc < 4) {
-            cli->sendMsg(ResponseCode::CommandSyntaxError, "Missing argument", false);
-            return 0;
-        }
-        rc = !mNetd->clatdStart(argv[2], argv[3], &v6Addr).isOk();
-    } else {
-        cli->sendMsg(ResponseCode::CommandSyntaxError, "Unknown clatd cmd", false);
-        return 0;
-    }
-
-    if (!rc) {
-        cli->sendMsg(ResponseCode::CommandOkay,
-                     std::string(("Clatd operation succeeded ") + v6Addr).c_str(), false);
-    } else {
-        cli->sendMsg(ResponseCode::OperationFailed, "Clatd operation failed", false);
-    }
-
-    return 0;
-}
-
 NdcDispatcher::StrictCmd::StrictCmd() : NdcNetdCommand("strict") {}
 
 int NdcDispatcher::StrictCmd::sendGenericOkFail(NdcClient* cli, int cond) const {

server/NdcDispatcher.h

diff --git a/server/NdcDispatcher.h b/server/NdcDispatcher.h
index 5732e22..2b01116 100644
--- a/server/NdcDispatcher.h
+++ b/server/NdcDispatcher.h
@@ -137,13 +137,6 @@
         static int parseChildChain(const char* arg);
     };
 
-    class ClatdCmd : public NdcNetdCommand {
-      public:
-        ClatdCmd();
-        virtual ~ClatdCmd() {}
-        int runCommand(NdcClient* cli, int argc, char** argv) const;
-    };
-
     class StrictCmd : public NdcNetdCommand {
       public:
         StrictCmd();