commit a561e121c724e9163b2e256e15eef660e3a326da
author Paul Jensen <pauljensen@google.com> Thu Jun 12 16:46:37 2014 -0400
committer Paul Jensen <pauljensen@google.com> Tue Jun 17 16:30:30 2014 +0000
tree 8490eb9cf8c9f54de243dc1d7787f192bb282f2b
parent 5ad1c281da21ebe1863fbad50f7c20dce4f08512

Cache interface indices in case interfaces go away.

Without caching them netd will fail to remove rules and routes,
for example, when the Bluetooth reverse-tether interface ("bt-pan")
goes away.

bug:15407087

Change-Id: I99fcf00f9645a0b029455516a705b70110f62ff6

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index a32dd67..f5739e9 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -250,17 +250,17 @@
     }
 
     Permission permission = mPermissionsController->getPermissionForNetwork(netId);
-    if (!mRouteController->removeInterfaceFromNetwork(netId, interface, permission)) {
-        ALOGE("failed to remove interface %s from netId %u", interface, netId);
-        status = false;
-    }
-
     if (netId == getDefaultNetwork() &&
             !mRouteController->removeFromDefaultNetwork(interface, permission)) {
         ALOGE("failed to remove interface %s from default netId %u", interface, netId);
         status = false;
     }
 
+    if (!mRouteController->removeInterfaceFromNetwork(netId, interface, permission)) {
+        ALOGE("failed to remove interface %s from netId %u", interface, netId);
+        status = false;
+    }
+
     return status;
 }