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

Merge "Use RFC 7217 stable privacy addresses" into oc-dr1-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2017-07-12 07:57:49 +00:00
committed by Android (Google) Code Review
parent 09a93b9739 3ee447c5a6
commit 5e7b01c823
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/INetworkManagementService.aidl
View File

@@ -96,6 +96,12 @@ interface INetworkManagementService
*/
void enableIpv6(String iface);
/**
* Set IPv6 autoconf address generation mode.
* This is a no-op if an unsupported mode is requested.
*/
void setIPv6AddrGenMode(String iface, int mode);
/**
* Enables or enables IPv6 ND offload.
*/

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

@@ -1057,6 +1057,15 @@ public class NetworkManagementService extends INetworkManagementService.Stub
}
}
@Override
public void setIPv6AddrGenMode(String iface, int mode) throws ServiceSpecificException {
try {
mNetdService.setIPv6AddrGenMode(iface, mode);
} catch (RemoteException e) {
throw e.rethrowAsRuntimeException();
}
}
@Override
public void disableIpv6(String iface) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);

40
services/net/java/android/net/ip/IpManager.java
View File

@@ -20,16 +20,17 @@ import com.android.internal.util.MessageUtils;
import com.android.internal.util.WakeupMessage;
import android.content.Context;
import android.net.apf.ApfCapabilities;
import android.net.apf.ApfFilter;
import android.net.DhcpResults;
import android.net.INetd;
import android.net.InterfaceConfiguration;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.LinkProperties.ProvisioningChange;
import android.net.LinkProperties;
import android.net.ProxyInfo;
import android.net.RouteInfo;
import android.net.StaticIpConfiguration;
import android.net.apf.ApfCapabilities;
import android.net.apf.ApfFilter;
import android.net.dhcp.DhcpClient;
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.IpManagerEvent;
@@ -39,7 +40,9 @@ import android.os.INetworkManagementService;
import android.os.Message;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.ServiceSpecificException;
import android.os.SystemClock;
import android.system.OsConstants;
import android.text.TextUtils;
import android.util.LocalLog;
import android.util.Log;
@@ -320,6 +323,16 @@ public class IpManager extends StateMachine {
return this;
}
public Builder withIPv6AddrGenModeEUI64() {
mConfig.mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_EUI64;
return this;
}
public Builder withIPv6AddrGenModeStablePrivacy() {
mConfig.mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_STABLE_PRIVACY;
return this;
}
public ProvisioningConfiguration build() {
return new ProvisioningConfiguration(mConfig);
}
@@ -332,6 +345,7 @@ public class IpManager extends StateMachine {
/* package */ StaticIpConfiguration mStaticIpConfig;
/* package */ ApfCapabilities mApfCapabilities;
/* package */ int mProvisioningTimeoutMs = DEFAULT_TIMEOUT_MS;
/* package */ int mIPv6AddrGenMode = INetd.IPV6_ADDR_GEN_MODE_STABLE_PRIVACY;
public ProvisioningConfiguration() {}
@@ -355,6 +369,7 @@ public class IpManager extends StateMachine {
.add("mStaticIpConfig: " + mStaticIpConfig)
.add("mApfCapabilities: " + mApfCapabilities)
.add("mProvisioningTimeoutMs: " + mProvisioningTimeoutMs)
.add("mIPv6AddrGenMode: " + mIPv6AddrGenMode)
.toString();
}
}
@@ -1045,16 +1060,25 @@ public class IpManager extends StateMachine {
return true;
}
private void setIPv6AddrGenModeIfSupported() throws RemoteException {
try {
mNwService.setIPv6AddrGenMode(mInterfaceName, mConfiguration.mIPv6AddrGenMode);
} catch (ServiceSpecificException e) {
if (e.errorCode != OsConstants.EOPNOTSUPP) {
throw e;
}
}
}
private boolean startIPv6() {
// Set privacy extensions.
try {
mNwService.setInterfaceIpv6PrivacyExtensions(mInterfaceName, true);
setIPv6AddrGenModeIfSupported();
mNwService.enableIpv6(mInterfaceName);
} catch (RemoteException re) {
logError("Unable to change interface settings: %s", re);
return false;
} catch (IllegalStateException ie) {
logError("Unable to change interface settings: %s", ie);
} catch (IllegalStateException | RemoteException | ServiceSpecificException e) {
logError("Unable to change interface settings: %s", e);
return false;
}