Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IPv6: enable IPv6 link local routing for local network"

Browse Source
This commit is contained in:
Jimmy Chen
2019-03-08 15:08:07 +00:00
committed by Gerrit Code Review
parent 27a6501a19 086779de11
commit f635f12666
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -2506,6 +2506,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub
modifyRoute(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, route); modifyRoute(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID, route);
} }
} }
// IPv6 link local should be activated always.
modifyRoute(MODIFY_OPERATION_ADD, INetd.LOCAL_NET_ID,
new RouteInfo(new IpPrefix("fe80::/64"), null, iface));
} }
@Override @Override

11
services/net/java/android/net/ip/IpServer.java
View File

@@ -87,7 +87,6 @@ public class IpServer extends StateMachine {
return "UNKNOWN: " + state; return "UNKNOWN: " + state;
} }
private static final IpPrefix LINK_LOCAL_PREFIX = new IpPrefix("fe80::/64");
private static final byte DOUG_ADAMS = (byte) 42; private static final byte DOUG_ADAMS = (byte) 42;
private static final String USB_NEAR_IFACE_ADDR = "192.168.42.129"; private static final String USB_NEAR_IFACE_ADDR = "192.168.42.129";
@@ -557,16 +556,6 @@ public class IpServer extends StateMachine {
addedPrefixes.removeAll(mLastRaParams.prefixes); addedPrefixes.removeAll(mLastRaParams.prefixes);
} }
if (mLastRaParams == null || mLastRaParams.prefixes.isEmpty()) {
// We need to be able to send unicast RAs, and clients might
// like to ping the default router's link-local address. Note
// that we never remove the link-local route from the network
// until Tethering disables tethering on the interface. We
// only need to add the link-local prefix once, but in the
// event we add it more than once netd silently ignores EEXIST.
addedPrefixes.add(LINK_LOCAL_PREFIX);
}
if (!addedPrefixes.isEmpty()) { if (!addedPrefixes.isEmpty()) {
final ArrayList<RouteInfo> toBeAdded = final ArrayList<RouteInfo> toBeAdded =
getLocalRoutesFor(mIfaceName, addedPrefixes); getLocalRoutesFor(mIfaceName, addedPrefixes);