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

Merge "Stop prefix discovery if an RA prefix arrives in DISCOVERING" am: c44ca579ad am: d0359ea573

Browse Source 
Change-Id: If6dd56d2860611586af3c434af3ddc4b6df76ab3
This commit is contained in:
Lorenzo Colitti
2020-04-20 11:38:11 +00:00
committed by Automerger Merge Worker
parent 9a8f4c8067 d0359ea573
commit 6bb660e9f4
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -195,6 +195,9 @@ public class Nat464Xlat extends BaseNetworkObserver {
} catch (ClassCastException | IllegalArgumentException | NullPointerException e) {
Slog.e(TAG, "Invalid IPv6 address " + addrStr);
}
if (mPrefixDiscoveryRunning && !isPrefixDiscoveryNeeded()) {
stopPrefixDiscovery();
}
}
/**
@@ -221,12 +224,11 @@ public class Nat464Xlat extends BaseNetworkObserver {
if (isPrefixDiscoveryNeeded()) {
if (!mPrefixDiscoveryRunning) {
startPrefixDiscovery();
} else {
// Prefix discovery is already running. Nothing to do.
mState = State.DISCOVERING;
}
mState = State.DISCOVERING;
} else {
stopPrefixDiscovery(); // Enters IDLE state.
stopPrefixDiscovery();
mState = State.IDLE;
}
}
@@ -287,7 +289,6 @@ public class Nat464Xlat extends BaseNetworkObserver {
} catch (RemoteException | ServiceSpecificException e) {
Slog.e(TAG, "Error starting prefix discovery on netId " + getNetId() + ": " + e);
}
mState = State.DISCOVERING;
mPrefixDiscoveryRunning = true;
}
@@ -297,7 +298,6 @@ public class Nat464Xlat extends BaseNetworkObserver {
} catch (RemoteException | ServiceSpecificException e) {
Slog.e(TAG, "Error stopping prefix discovery on netId " + getNetId() + ": " + e);
}
mState = State.IDLE;
mPrefixDiscoveryRunning = false;
}
@@ -330,6 +330,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
case IDLE:
if (isPrefixDiscoveryNeeded()) {
startPrefixDiscovery(); // Enters DISCOVERING state.
mState = State.DISCOVERING;
} else if (requiresClat(mNetwork)) {
start(); // Enters STARTING state.
}
@@ -344,6 +345,7 @@ public class Nat464Xlat extends BaseNetworkObserver {
if (!requiresClat(mNetwork)) {
// IPv4 address added. Go back to IDLE state.
stopPrefixDiscovery();
mState = State.IDLE;
return;
}
break;

16
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -6228,6 +6228,22 @@ public class ConnectivityServiceTest {
inOrder.verify(mMockNetd).clatdStop(iface);
inOrder.verify(mMockDnsResolver).startPrefix64Discovery(netId);
// If the RA prefix appears while DNS discovery is in progress, discovery is stopped and
// clatd is started with the prefix from the RA.
lp.setNat64Prefix(pref64FromRa);
mCellNetworkAgent.sendLinkProperties(lp);
expectNat64PrefixChange(callback, mCellNetworkAgent, pref64FromRa);
inOrder.verify(mMockNetd).clatdStart(iface, pref64FromRa.toString());
inOrder.verify(mMockDnsResolver).stopPrefix64Discovery(netId);
// Withdraw the RA prefix so we can test the case where an RA prefix appears after DNS
// discovery has succeeded.
lp.setNat64Prefix(null);
mCellNetworkAgent.sendLinkProperties(lp);
expectNat64PrefixChange(callback, mCellNetworkAgent, null);
inOrder.verify(mMockNetd).clatdStop(iface);
inOrder.verify(mMockDnsResolver).startPrefix64Discovery(netId);
mService.mNetdEventCallback.onNat64PrefixEvent(netId, true /* added */,
pref64FromDnsStr, 96);
expectNat64PrefixChange(callback, mCellNetworkAgent, pref64FromDns);