commit 6e76dda2a9f671238ae1820ba2cfc5ccb016e055
author Ken Chen <cken@google.com> Mon Apr 12 14:08:22 2021 +0800
committer Ken Chen <cken@google.com> Mon Apr 12 14:18:48 2021 +0800
tree 72970b79064ac0e1bf16dc181a731c2bcb682b8c
parent 09d646081836f7008732eba129dd9c3b6a39658c

Fix ndc network create vpn command

Create vpn from ndc is broken since aosp/841619. Correct argc number to
make it work.

Test: adb shell ndc network create 150 vpn 0
Change-Id: I4e8f9480b9159409bbcf53bd25bef5a3f699584c

server/NdcDispatcher.cpp

diff --git a/server/NdcDispatcher.cpp b/server/NdcDispatcher.cpp
index ad3dc37..e5cad45 100644
--- a/server/NdcDispatcher.cpp
+++ b/server/NdcDispatcher.cpp
@@ -1049,7 +1049,7 @@
             return syntaxError(cli, "Missing argument");
         }
         unsigned netId = stringToNetId(argv[2]);
-        if (argc == 6 && !strcmp(argv[3], "vpn")) {
+        if (argc == 5 && !strcmp(argv[3], "vpn")) {
             bool secure = strtol(argv[4], nullptr, 2);
             if (Status status = mNetd->networkCreateVpn(netId, secure); !status.isOk()) {
                 return operationError(cli, "createVirtualNetwork() failed",