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

am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"

Browse Source 
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
  Tethering: Skip link local addresses when enabling NAT
This commit is contained in:
Jeff Sharkey
2014-02-18 09:13:00 -08:00
committed by Android Git Automerger
parent e6d256c50b 02a64daefe
commit df47ecaa09
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/NetworkManagementService.java
View File

@@ -82,6 +82,7 @@ import java.net.SocketException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.StringTokenizer; import java.util.StringTokenizer;
@@ -1022,6 +1023,15 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
} }
private List<InterfaceAddress> excludeLinkLocal(List<InterfaceAddress> addresses) {
ArrayList<InterfaceAddress> filtered = new ArrayList<InterfaceAddress>(addresses.size());
for (InterfaceAddress ia : addresses) {
if (!ia.getAddress().isLinkLocalAddress())
filtered.add(ia);
}
return filtered;
}
private void modifyNat(String action, String internalInterface, String externalInterface) private void modifyNat(String action, String internalInterface, String externalInterface)
throws SocketException { throws SocketException {
final Command cmd = new Command("nat", action, internalInterface, externalInterface); final Command cmd = new Command("nat", action, internalInterface, externalInterface);
@@ -1031,8 +1041,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub
if (internalNetworkInterface == null) { if (internalNetworkInterface == null) {
cmd.appendArg("0"); cmd.appendArg("0");
} else { } else {
Collection<InterfaceAddress> interfaceAddresses = internalNetworkInterface // Don't touch link-local routes, as link-local addresses aren't routable,
.getInterfaceAddresses(); // kernel creates link-local routes on all interfaces automatically
List<InterfaceAddress> interfaceAddresses = excludeLinkLocal(
internalNetworkInterface.getInterfaceAddresses());
cmd.appendArg(interfaceAddresses.size()); cmd.appendArg(interfaceAddresses.size());
for (InterfaceAddress ia : interfaceAddresses) { for (InterfaceAddress ia : interfaceAddresses) {
InetAddress addr = NetworkUtils.getNetworkPart( InetAddress addr = NetworkUtils.getNetworkPart(