diff options
| author | Luke Huang <huangluke@google.com> | 2018-07-23 20:30:16 +0800 |
|---|---|---|
| committer | Luke Huang <huangluke@google.com> | 2018-07-30 18:34:44 +0800 |
| commit | 0051a62a47c6a047d7ebbf40dd7372d7b6a8f0db (patch) | |
| tree | 1054ac81164174676ca3bf2d22792ac1e579329d /server/IdletimerController.cpp | |
| parent | cdeff56409df1e795daf235bf11cf43f4f4349cf (diff) | |
| download | platform_system_netd-0051a62a47c6a047d7ebbf40dd7372d7b6a8f0db.tar.gz platform_system_netd-0051a62a47c6a047d7ebbf40dd7372d7b6a8f0db.tar.bz2 platform_system_netd-0051a62a47c6a047d7ebbf40dd7372d7b6a8f0db.zip | |
Idletimer-related commands porting
Test: built, flashed, booted
system/netd/tests/runtests.sh passes
Change-Id: I10eec44acca8e4d5a7c8de64b89590e3cccda597
Diffstat (limited to 'server/IdletimerController.cpp')
| -rw-r--r-- | server/IdletimerController.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/server/IdletimerController.cpp b/server/IdletimerController.cpp index 5c0cc86da..acb8c6a40 100644 --- a/server/IdletimerController.cpp +++ b/server/IdletimerController.cpp @@ -138,29 +138,6 @@ bool IdletimerController::setupIptablesHooks() { return true; } -int IdletimerController::setDefaults() { - std::vector<std::string> cmds = { - "*raw", - StringPrintf(":%s -", LOCAL_RAW_PREROUTING), - "COMMIT", - "*mangle", - StringPrintf(":%s -", LOCAL_MANGLE_POSTROUTING), - "COMMIT\n", - }; - - return execIptablesRestore(V4V6, Join(cmds, '\n')); -} - -int IdletimerController::enableIdletimerControl() { - int res = setDefaults(); - return res; -} - -int IdletimerController::disableIdletimerControl() { - int res = setDefaults(); - return res; -} - int IdletimerController::modifyInterfaceIdletimer(IptOp op, const char *iface, uint32_t timeout, const char *classLabel) { @@ -181,7 +158,7 @@ int IdletimerController::modifyInterfaceIdletimer(IptOp op, const char *iface, "COMMIT\n", }; - return execIptablesRestore(V4V6, Join(cmds, '\n')); + return (execIptablesRestore(V4V6, Join(cmds, '\n')) == 0) ? 0 : -EREMOTEIO; } int IdletimerController::addInterfaceIdletimer(const char *iface, |