commit 85a2160d07043273e8fbc249ba3288aad75a2ee0
author Lorenzo Colitti <lorenzo@google.com> Thu Aug 10 19:22:45 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Aug 15 16:53:35 2017 +0900
tree 8a384de32a2cd1b5f41caab1e4efeea52ea52bb3
parent adc3a5f1beb63d707563ea849a1d541fab40a745

Add a test for IdleTimerController.

Bug: 28362720
Test: bullhead builds,boots
Test: netd_{unit,integration}_test pass
Change-Id: I0e3c2462676969b26a4cbee7aa6552078fde90f5

server/IdletimerController.cpp

diff --git a/server/IdletimerController.cpp b/server/IdletimerController.cpp
index e6306fd..224dec6 100644
--- a/server/IdletimerController.cpp
+++ b/server/IdletimerController.cpp
@@ -95,6 +95,7 @@
 
 #define LOG_NDEBUG 0
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/socket.h>
@@ -116,6 +117,8 @@
 const char* IdletimerController::LOCAL_RAW_PREROUTING = "idletimer_raw_PREROUTING";
 const char* IdletimerController::LOCAL_MANGLE_POSTROUTING = "idletimer_mangle_POSTROUTING";
 
+auto IdletimerController::execFunction = android_fork_execvp;
+
 IdletimerController::IdletimerController() {
 }
 
@@ -127,11 +130,11 @@
 
     // Running for IPv4
     argv[0] = IPTABLES_PATH;
-    resIpv4 = android_fork_execvp(argc, (char **)argv, NULL, false, false);
+    resIpv4 = execFunction(argc, (char **)argv, NULL, false, false);
 
     // Running for IPv6
     argv[0] = IP6TABLES_PATH;
-    resIpv6 = android_fork_execvp(argc, (char **)argv, NULL, false, false);
+    resIpv6 = execFunction(argc, (char **)argv, NULL, false, false);
 
 #if !LOG_NDEBUG
     std::string full_cmd = argv[0];