diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2013-03-15 17:14:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-15 17:14:43 +0000 |
| commit | e78aa8964766e5e2a9684de13176b08b7bd09e06 (patch) | |
| tree | d80bd67987bb61cdc9a757ae6d3ba5a17b919e93 /services/java | |
| parent | 827ef6e0bd696b2cd0ff8d2bf28e4564b913c345 (diff) | |
| parent | f83d90c6671371c9fb95c7946461795efe5a1da3 (diff) | |
| download | frameworks_base-e78aa8964766e5e2a9684de13176b08b7bd09e06.zip frameworks_base-e78aa8964766e5e2a9684de13176b08b7bd09e06.tar.gz frameworks_base-e78aa8964766e5e2a9684de13176b08b7bd09e06.tar.bz2 | |
Merge "Set routes from stacked links as well." into jb-mr2-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index c83a919..0b3df35 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1430,11 +1430,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { private boolean modifyRouteToAddress(LinkProperties lp, InetAddress addr, boolean doAdd, boolean toDefaultTable) { - String iface = lp.getInterfaceName(); - RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), addr); + RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getAllRoutes(), addr); if (bestRoute == null) { - bestRoute = RouteInfo.makeHostRoute(addr, iface); + bestRoute = RouteInfo.makeHostRoute(addr, lp.getInterfaceName()); } else { + String iface = bestRoute.getInterface(); if (bestRoute.getGateway().equals(addr)) { // if there is no better route, add the implied hostroute for our gateway bestRoute = RouteInfo.makeHostRoute(addr, iface); @@ -1449,9 +1449,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { private boolean modifyRoute(LinkProperties lp, RouteInfo r, int cycleCount, boolean doAdd, boolean toDefaultTable) { - String ifaceName = lp.getInterfaceName(); - if ((ifaceName == null) || (lp == null) || (r == null)) { - if (DBG) log("modifyRoute got unexpected null: " + ifaceName + ", " + lp + ", " + r); + if ((lp == null) || (r == null)) { + if (DBG) log("modifyRoute got unexpected null: " + lp + ", " + r); return false; } @@ -1460,8 +1459,14 @@ public class ConnectivityService extends IConnectivityManager.Stub { return false; } + String ifaceName = r.getInterface(); + if(ifaceName == null) { + loge("Error modifying route - no interface name"); + return false; + } + if (r.isHostRoute() == false) { - RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getRoutes(), r.getGateway()); + RouteInfo bestRoute = RouteInfo.selectBestRoute(lp.getAllRoutes(), r.getGateway()); if (bestRoute != null) { if (bestRoute.getGateway().equals(r.getGateway())) { // if there is no better route, add the implied hostroute for our gateway @@ -2300,7 +2305,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { routeDiff = curLp.compareRoutes(newLp); dnsDiff = curLp.compareDnses(newLp); } else if (newLp != null) { - routeDiff.added = newLp.getRoutes(); + routeDiff.added = newLp.getAllRoutes(); dnsDiff.added = newLp.getDnses(); } |