commit 4150d6c1e51c10c9a7ea1fe40efa2e56ea7d0485
author Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Tue Jul 25 19:20:32 2017 -0600
committer Lorenzo Colitti <lorenzo@google.com> Tue Aug 08 08:59:50 2017 +0900
tree 3ca9773d9e59b194e14cd795dc0b007b09708f9b
parent 74be71b57ab385ff0fb049da48efc169b66d1020

netutils_wrapper: Add support for NDK type in ndc commands

This fixes the following error -

~:/system/bin/ndc-wrapper-1.0 network interface add handle8606370526 r_rmnet_data0
NetUtilsWrapper: Unexpected command: /system/bin/ndc network interface add handle8606370526 r_rmnet_data0

Bug: 36682246
Test: netutils_wrapper_test passes
Change-Id: I0b0bb76ed47cdead672dd97ed0c040330ec0b8de

netutils_wrappers/NetUtilsWrapper-1.0.cpp

diff --git a/netutils_wrappers/NetUtilsWrapper-1.0.cpp b/netutils_wrappers/NetUtilsWrapper-1.0.cpp
index a9fbf3f..ccf32ad 100644
--- a/netutils_wrappers/NetUtilsWrapper-1.0.cpp
+++ b/netutils_wrappers/NetUtilsWrapper-1.0.cpp
@@ -52,9 +52,9 @@
 const char *EXPECTED_REGEXPS[] = {
 #define CMD "^" SYSTEM_DIRNAME
     // Create, delete, and manage OEM networks.
-    CMD "ndc network (create|destroy) oem[0-9]+( |$)",
-    CMD "ndc network interface (add|remove) oem[0-9]+ " VENDOR_IFACE,
-    CMD "ndc network route (add|remove) oem[0-9]+ ",
+    CMD "ndc network (create|destroy) (oem|handle)[0-9]+( |$)",
+    CMD "ndc network interface (add|remove) (oem|handle)[0-9]+ " VENDOR_IFACE,
+    CMD "ndc network route (add|remove) (oem|handle)[0-9]+ ",
     CMD "ndc ipfwd (enable|disable) ",
     CMD "ndc ipfwd (add|remove) .*" VENDOR_IFACE,