LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Snap for 6374687 from 1ff0d350eb768ca44e0b0d5fdf117c0819ec810d to rvc-release

Browse Source 
Change-Id: I77ac8c79681f06386e56e99c80c6b93835491615
This commit is contained in:
android-build-team Robot
2020-04-08 02:07:20 +00:00
parent cf2dda7669 50756739b5
commit 3c3cdb252f
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkAgent.java
View File

@@ -556,12 +556,12 @@ public abstract class NetworkAgent {
@NonNull
public Network register() {
if (VDBG) log("Registering NetworkAgent");
final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context
.getSystemService(Context.CONNECTIVITY_SERVICE);
synchronized (mRegisterLock) {
if (mNetwork != null) {
throw new IllegalStateException("Agent already registered");
}
final ConnectivityManager cm = (ConnectivityManager) mInitialConfiguration.context
.getSystemService(Context.CONNECTIVITY_SERVICE);
mNetwork = cm.registerNetworkAgent(new Messenger(mHandler),
new NetworkInfo(mInitialConfiguration.info),
mInitialConfiguration.properties, mInitialConfiguration.capabilities,

61
services/core/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -213,12 +213,10 @@ public class Nat464Xlat extends BaseNetworkObserver {
}
mIface = null;
mBaseIface = null;
mState = State.IDLE;
if (requiresClat(mNetwork)) {
mState = State.DISCOVERING;
} else {
stopPrefixDiscovery();
mState = State.IDLE;
}
}
@@ -285,6 +283,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
private void stopPrefixDiscovery() {
try {
mDnsResolver.stopPrefix64Discovery(getNetId());
mState = State.IDLE;
} catch (RemoteException | ServiceSpecificException e) {
Slog.e(TAG, "Error stopping prefix discovery on netId " + getNetId() + ": " + e);
}
@@ -294,27 +293,43 @@ public class Nat464Xlat extends BaseNetworkObserver {
* Starts/stops NAT64 prefix discovery and clatd as necessary.
*/
public void update() {
// TODO: turn this class into a proper StateMachine. // http://b/126113090
if (requiresClat(mNetwork)) {
if (!isPrefixDiscoveryStarted()) {
startPrefixDiscovery();
} else if (shouldStartClat(mNetwork)) {
// NAT64 prefix detected. Start clatd.
// TODO: support the NAT64 prefix changing after it's been discovered. There is no
// need to support this at the moment because it cannot happen without changes to
// the Dns64Configuration code in netd.
start();
} else {
// NAT64 prefix removed. Stop clatd and go back into DISCOVERING state.
stop();
}
} else {
// Network no longer requires clat. Stop clat and prefix discovery.
if (isStarted()) {
stop();
} else if (isPrefixDiscoveryStarted()) {
leaveStartedState();
}
// TODO: turn this class into a proper StateMachine. http://b/126113090
switch (mState) {
case IDLE:
if (requiresClat(mNetwork)) {
// Network is detected to be IPv6-only.
// TODO: consider going to STARTING directly if the NAT64 prefix is already
// known. This would however result in clatd running without prefix discovery
// running, which might be a surprising combination.
startPrefixDiscovery(); // Enters DISCOVERING state.
return;
}
break;
case DISCOVERING:
if (shouldStartClat(mNetwork)) {
// NAT64 prefix detected. Start clatd.
start(); // Enters STARTING state.
return;
}
if (!requiresClat(mNetwork)) {
// IPv4 address added. Go back to IDLE state.
stopPrefixDiscovery();
return;
}
break;
case STARTING:
case RUNNING:
// NAT64 prefix removed, or IPv4 address added.
// Stop clatd and go back into DISCOVERING or idle.
if (!shouldStartClat(mNetwork)) {
stop();
}
break;
// TODO: support the NAT64 prefix changing after it's been discovered. There is
// no need to support this at the moment because it cannot happen without
// changes to the Dns64Configuration code in netd.
}
}