Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c0378e7 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Inform the DNS resolver when it needs to do DNS64 synthesis." am: 808cb66c am: eae6b8a2 

Change-Id: I06278ddff31d8c0dbb4ce6cfded01a38369d8a3c
parents 66edffeb eae6b8a2

services/core/java/com/android/server/connectivity/Nat464Xlat.java

+17 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ public class Nat464Xlat extends BaseNetworkObserver { 
        if (mPrefixDiscoveryRunning && !isPrefixDiscoveryNeeded()) {

            stopPrefixDiscovery();

        }

        if (!mPrefixDiscoveryRunning) {

            setPrefix64(mNat64PrefixInUse);

        }

    }



    /**
@@ -221,6 +224,10 @@ public class Nat464Xlat extends BaseNetworkObserver { 
        mIface = null;

        mBaseIface = null;



        if (!mPrefixDiscoveryRunning) {

            setPrefix64(null);

        }



        if (isPrefixDiscoveryNeeded()) {

            if (!mPrefixDiscoveryRunning) {

                startPrefixDiscovery();
@@ -308,6 +315,16 @@ public class Nat464Xlat extends BaseNetworkObserver { 
        return requiresClat(mNetwork) && mNat64PrefixFromRa == null;

    }



    private void setPrefix64(IpPrefix prefix) {

        final String prefixString = (prefix != null) ? prefix.toString() : "";

        try {

            mDnsResolver.setPrefix64(getNetId(), prefixString);

        } catch (RemoteException | ServiceSpecificException e) {

            Slog.e(TAG, "Error setting NAT64 prefix on netId " + getNetId() + " to "

                    + prefix + ": " + e);

        }

    }



    private void maybeHandleNat64PrefixChange() {

        final IpPrefix newPrefix = selectNat64Prefix();

        if (!Objects.equals(mNat64PrefixInUse, newPrefix)) {

tests/net/java/com/android/server/ConnectivityServiceTest.java

+43 −0
Original line number Diff line number Diff line
@@ -6322,6 +6322,7 @@ public class ConnectivityServiceTest { 
        int netId = network.getNetId();

        callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);

        inOrder.verify(mMockNetd).clatdStart(iface, pref64FromRa.toString());

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, pref64FromRa.toString());

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);

        callback.assertNoCallback();

        assertEquals(pref64FromRa, mCm.getLinkProperties(network).getNat64Prefix());
@@ -6331,6 +6332,7 @@ public class ConnectivityServiceTest { 
        mCellNetworkAgent.sendLinkProperties(lp);

        expectNat64PrefixChange(callback, mCellNetworkAgent, null);

        inOrder.verify(mMockNetd).clatdStop(iface);

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, "");

        inOrder.verify(mMockDnsResolver).startPrefix64Discovery(netId);



        // If the RA prefix appears while DNS discovery is in progress, discovery is stopped and
@@ -6340,6 +6342,7 @@ public class ConnectivityServiceTest { 
        expectNat64PrefixChange(callback, mCellNetworkAgent, pref64FromRa);

        inOrder.verify(mMockNetd).clatdStart(iface, pref64FromRa.toString());

        inOrder.verify(mMockDnsResolver).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, pref64FromRa.toString());



        // Withdraw the RA prefix so we can test the case where an RA prefix appears after DNS

        // discovery has succeeded.
@@ -6347,6 +6350,7 @@ public class ConnectivityServiceTest { 
        mCellNetworkAgent.sendLinkProperties(lp);

        expectNat64PrefixChange(callback, mCellNetworkAgent, null);

        inOrder.verify(mMockNetd).clatdStop(iface);

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, "");

        inOrder.verify(mMockDnsResolver).startPrefix64Discovery(netId);



        mService.mNetdEventCallback.onNat64PrefixEvent(netId, true /* added */,
@@ -6363,6 +6367,7 @@ public class ConnectivityServiceTest { 
        inOrder.verify(mMockNetd, never()).clatdStart(eq(iface), anyString());

        inOrder.verify(mMockDnsResolver, never()).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), anyString());



        // If the RA is later withdrawn, nothing happens again.

        lp.setNat64Prefix(null);
@@ -6372,6 +6377,7 @@ public class ConnectivityServiceTest { 
        inOrder.verify(mMockNetd, never()).clatdStart(eq(iface), anyString());

        inOrder.verify(mMockDnsResolver, never()).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), anyString());



        // If the RA prefix changes, clatd is restarted and prefix discovery is stopped.

        lp.setNat64Prefix(pref64FromRa);
@@ -6385,6 +6391,7 @@ public class ConnectivityServiceTest { 
                pref64FromDnsStr, 96);



        inOrder.verify(mMockNetd).clatdStart(iface, pref64FromRa.toString());

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, pref64FromRa.toString());

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);



        // If the RA prefix changes, clatd is restarted and prefix discovery is not started.
@@ -6392,7 +6399,9 @@ public class ConnectivityServiceTest { 
        mCellNetworkAgent.sendLinkProperties(lp);

        expectNat64PrefixChange(callback, mCellNetworkAgent, newPref64FromRa);

        inOrder.verify(mMockNetd).clatdStop(iface);

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, "");

        inOrder.verify(mMockNetd).clatdStart(iface, newPref64FromRa.toString());

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, newPref64FromRa.toString());

        inOrder.verify(mMockDnsResolver, never()).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);
@@ -6405,11 +6414,45 @@ public class ConnectivityServiceTest { 
        inOrder.verify(mMockNetd, never()).clatdStart(eq(iface), anyString());

        inOrder.verify(mMockDnsResolver, never()).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), anyString());



        // The transition between no prefix and DNS prefix is tested in testStackedLinkProperties.



        // If the same prefix is learned first by DNS and then by RA, and clat is later stopped,

        // (e.g., because the network disconnects) setPrefix64(netid, "") is never called.

        lp.setNat64Prefix(null);

        mCellNetworkAgent.sendLinkProperties(lp);

        expectNat64PrefixChange(callback, mCellNetworkAgent, null);

        inOrder.verify(mMockNetd).clatdStop(iface);

        inOrder.verify(mMockDnsResolver).setPrefix64(netId, "");

        inOrder.verify(mMockDnsResolver).startPrefix64Discovery(netId);

        mService.mNetdEventCallback.onNat64PrefixEvent(netId, true /* added */,

                pref64FromDnsStr, 96);

        expectNat64PrefixChange(callback, mCellNetworkAgent, pref64FromDns);

        inOrder.verify(mMockNetd).clatdStart(iface, pref64FromDns.toString());

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), any());



        lp.setNat64Prefix(pref64FromDns);

        mCellNetworkAgent.sendLinkProperties(lp);

        callback.assertNoCallback();

        inOrder.verify(mMockNetd, never()).clatdStop(iface);

        inOrder.verify(mMockNetd, never()).clatdStart(eq(iface), anyString());

        inOrder.verify(mMockDnsResolver, never()).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).startPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), anyString());



        // When tearing down a network, clat state is only updated after CALLBACK_LOST is fired, but

        // before CONNECTIVITY_ACTION is sent. Wait for CONNECTIVITY_ACTION before verifying that

        // clat has been stopped, or the test will be flaky.

        ConditionVariable cv = registerConnectivityBroadcast(1);

        mCellNetworkAgent.disconnect();

        callback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);

        waitFor(cv);



        inOrder.verify(mMockNetd).clatdStop(iface);

        inOrder.verify(mMockDnsResolver).stopPrefix64Discovery(netId);

        inOrder.verify(mMockDnsResolver, never()).setPrefix64(eq(netId), anyString());



        mCm.unregisterNetworkCallback(callback);

    }