commit 8b3b91c6cad577e2928a29073fc962c57ef75af5
author Sreeram Ramachandran <sreeram@google.com> Tue Jul 22 12:40:36 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Tue Jul 22 12:40:36 2014 -0700
tree 11b2ef7fe4e943b728b4b8769ab5f6010b35548f
parent b717e74df3571951890cf36ee8bd559501d7fdc4

Try to undo iptables rules if a command fails.

As per review comments at:
https://googleplex-android-review.git.corp.google.com/#/c/504240/5/server/NatController.cpp@194

Bug: 15413694
Bug: 15413741
Change-Id: I99e2f83792fa81498447e4c03f5f8be1d2c43b7d

server/NatController.cpp

diff --git a/server/NatController.cpp b/server/NatController.cpp
index 3594a5d..902756b 100644
--- a/server/NatController.cpp
+++ b/server/NatController.cpp
@@ -190,6 +190,9 @@
 
     if (int ret = RouteController::enableTethering(intIface, extIface)) {
         ALOGE("failed to add tethering rule for iif=%s oif=%s", intIface, extIface);
+        if (natCount == 0) {
+            setDefaults();
+        }
         errno = -ret;
         return -1;
     }