Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979ee3cc authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Routing workaround. 

Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d
parent b4c13c4b

services/java/com/android/server/ConnectivityService.java

+23 −22
Original line number Diff line number Diff line
@@ -2348,28 +2348,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            }

        }



        for (RouteInfo r :  routeDiff.added) {

            if (isLinkDefault || ! r.isDefaultRoute()) {

                addRoute(newLp, r, TO_DEFAULT_TABLE);

            } else {

                // add to a secondary route table

                addRoute(newLp, r, TO_SECONDARY_TABLE);



                // many radios add a default route even when we don't want one.

                // remove the default route unless somebody else has asked for it

                String ifaceName = newLp.getInterfaceName();

                if (TextUtils.isEmpty(ifaceName) == false && mAddedRoutes.contains(r) == false) {

                    if (VDBG) log("Removing " + r + " for interface " + ifaceName);

                    try {

                        mNetd.removeRoute(ifaceName, r);

                    } catch (Exception e) {

                        // never crash - catch them all

                        if (DBG) loge("Exception trying to remove a route: " + e);

                    }

                }

            }

        }



        if (!isLinkDefault) {

            // handle DNS routes

            if (routesChanged) {
@@ -2394,6 +2372,29 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                }

            }

        }



        for (RouteInfo r :  routeDiff.added) {

            if (isLinkDefault || ! r.isDefaultRoute()) {

                addRoute(newLp, r, TO_DEFAULT_TABLE);

            } else {

                // add to a secondary route table

                addRoute(newLp, r, TO_SECONDARY_TABLE);



                // many radios add a default route even when we don't want one.

                // remove the default route unless somebody else has asked for it

                String ifaceName = newLp.getInterfaceName();

                if (TextUtils.isEmpty(ifaceName) == false && mAddedRoutes.contains(r) == false) {

                    if (VDBG) log("Removing " + r + " for interface " + ifaceName);

                    try {

                        mNetd.removeRoute(ifaceName, r);

                    } catch (Exception e) {

                        // never crash - catch them all

                        if (DBG) loge("Exception trying to remove a route: " + e);

                    }

                }

            }

        }



        return routesChanged;

    }