diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:24:18 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 07:24:18 +0000 |
| commit | 6dee21ed627d9c43a2190bec370914a4e98dcce7 (patch) | |
| tree | 3ca9773d9e59b194e14cd795dc0b007b09708f9b | |
| parent | ccfb745ddc01799137daf3fc78db381c369fa1a6 (diff) | |
| parent | 4150d6c1e51c10c9a7ea1fe40efa2e56ea7d0485 (diff) | |
| download | android_system_netd-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.gz android_system_netd-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.bz2 android_system_netd-staging/lineage-15.0_rebase-android-8.0.0_r23.zip | |
release-request-ef177764-b092-4138-885c-f9ecf5a80dc4-for-git_oc-dr1-release-4253863 snap-temp-L73600000090287988staging/lineage-15.0_rebase-android-8.0.0_r23
Change-Id: I940de6ed3dfbeb1ab6a5a8cd1696fd54f67bfdff
| -rw-r--r-- | netutils_wrappers/NetUtilsWrapper-1.0.cpp | 6 | ||||
| -rw-r--r-- | netutils_wrappers/NetUtilsWrapperTest-1.0.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/netutils_wrappers/NetUtilsWrapper-1.0.cpp b/netutils_wrappers/NetUtilsWrapper-1.0.cpp index a9fbf3fb..ccf32add 100644 --- a/netutils_wrappers/NetUtilsWrapper-1.0.cpp +++ b/netutils_wrappers/NetUtilsWrapper-1.0.cpp @@ -52,9 +52,9 @@ const char *netcmds[] = { 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, diff --git a/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp b/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp index a32cc3b7..4f47c78b 100644 --- a/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp +++ b/netutils_wrappers/NetUtilsWrapperTest-1.0.cpp @@ -47,6 +47,10 @@ std::vector<Command> COMMANDS = { {VALID, "/system/bin/ndc network interface add oem10 oem9"}, {INVALID, "/system/bin/ndc network interface add 100 v_oem9"}, {VALID, "/system/bin/ndc network interface add oem10 r_rmnet_data0"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 v_oem9"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 oem9"}, + {VALID, "/system/bin/ndc network interface add handle42966108894 r_rmnet_data0"}, + {INVALID, "/system/bin/ndc network interface add handle42966108894"}, {VALID, "/system/bin/ip xfrm state"}, }; |