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

Commit 51c14f03 authored by Hungming Chen's avatar Hungming Chen Committed by Automerger Merge Worker
Browse files

Follow-up CL to the change at aosp/1495896 am: ec5fd18c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1555097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib01b1eef8c8aa8acf0edd1de8cffaf00bab3585a
parents ae044dbf ec5fd18c

tests/unit/src/android/net/ip/ConntrackMonitorTest.java

+8 −14
Original line number Diff line number Diff line
@@ -257,24 +257,18 @@ public class ConntrackMonitorTest { 
        assertNotEquals(e, timeoutSecNotEqual);

    }



    // TODO: consider moving to a common file for sharing.

    private static void assertContains(String actualValue, String expectedSubstring) {

        if (actualValue.contains(expectedSubstring)) return;

        fail("\"" + actualValue + "\" does not contain \"" + expectedSubstring + "\"");

    }



    @Test

    public void testToString() {

        final ConntrackEvent event = makeTestConntrackEvent(IPCTNL_MSG_CT_NEW,

                0x198 /* status */, 120 /* timeoutSec */);

        final String s = event.toString();



        // Verify the converted string of msg_type, tuple_orig, tuple_reply, status and timeout.

        assertContains(s, "IPCTNL_MSG_CT_NEW");

        assertContains(s, "IPPROTO_TCP: 192.168.80.12:62449 -> 140.112.8.116:443");

        assertContains(s, "IPPROTO_TCP: 140.112.8.116:443 -> 100.81.179.1:62449");

        assertContains(s, "IPS_CONFIRMED|IPS_SRC_NAT|IPS_SRC_NAT_DONE|IPS_DST_NAT_DONE");

        assertContains(s, "timeout_sec{120}");

        final String expected = ""

                + "ConntrackEvent{"

                + "msg_type{IPCTNL_MSG_CT_NEW}, "

                + "tuple_orig{Tuple{IPPROTO_TCP: 192.168.80.12:62449 -> 140.112.8.116:443}}, "

                + "tuple_reply{Tuple{IPPROTO_TCP: 140.112.8.116:443 -> 100.81.179.1:62449}}, "

                + "status{408(IPS_CONFIRMED|IPS_SRC_NAT|IPS_SRC_NAT_DONE|IPS_DST_NAT_DONE)}, "

                + "timeout_sec{120}}";

        assertEquals(expected, event.toString());

    }



    public static final String CT_V4DELETE_TCP_HEX =

tests/unit/src/android/net/netlink/ConntrackMessageTest.java

+16 −18
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.junit.Assume.assumeTrue;



import android.system.OsConstants;
@@ -404,12 +403,6 @@ public class ConntrackMessageTest { 
        assertEquals(4, messageCount);

    }



    // TODO: consider moving to a common file for sharing.

    private static void assertContains(String actualValue, String expectedSubstring) {

        if (actualValue.contains(expectedSubstring)) return;

        fail("\"" + actualValue + "\" does not contain \"" + expectedSubstring + "\"");

    }



    @Test

    public void testToString() {

        assumeTrue(USING_LE);
@@ -420,16 +413,21 @@ public class ConntrackMessageTest { 
        assertNotNull(msg);

        assertTrue(msg instanceof ConntrackMessage);

        final ConntrackMessage conntrackMessage = (ConntrackMessage) msg;

        final String s = conntrackMessage.toString();



        // Verify the converted string of nlmsg_type, tuple_orig, tuple_reply, status and timeout.

        // Note that the "nlmsg_flags" string doesn't verify because the flags which have the same

        // value is not distinguishable now. See StructNlMsgHdr#stringForNlMsgFlags.

        // TODO: verify the converted string of nlmsg_flags once it has fixed.

        assertContains(s, "IPCTNL_MSG_CT_NEW");

        assertContains(s, "IPPROTO_TCP: 192.168.80.12:62449 -> 140.112.8.116:443");

        assertContains(s, "IPPROTO_TCP: 140.112.8.116:443 -> 100.81.179.1:62449");

        assertContains(s, "IPS_CONFIRMED|IPS_SRC_NAT|IPS_SRC_NAT_DONE|IPS_DST_NAT_DONE");

        assertContains(s, "timeout_sec{120}");



        // Bug: "nlmsg_flags{1536(NLM_F_MATCH))" is not correct because StructNlMsgHdr

        // #stringForNlMsgFlags can't convert all flags (ex: NLM_F_CREATE) and can't distinguish

        // the flags which have the same value (ex: NLM_F_MATCH <0x200> and NLM_F_EXCL <0x200>).

        // The flags output string should be "NLM_F_CREATE|NLM_F_EXCL" in this case.

        // TODO: correct the flag converted string once #stringForNlMsgFlags does.

        final String expected = ""

                + "ConntrackMessage{"

                + "nlmsghdr{StructNlMsgHdr{ nlmsg_len{140}, nlmsg_type{256(IPCTNL_MSG_CT_NEW)}, "

                + "nlmsg_flags{1536(NLM_F_MATCH))}, nlmsg_seq{0}, nlmsg_pid{0} }}, "

                + "nfgenmsg{NfGenMsg{ nfgen_family{AF_INET}, version{0}, res_id{4660} }}, "

                + "tuple_orig{Tuple{IPPROTO_TCP: 192.168.80.12:62449 -> 140.112.8.116:443}}, "

                + "tuple_reply{Tuple{IPPROTO_TCP: 140.112.8.116:443 -> 100.81.179.1:62449}}, "

                + "status{408(IPS_CONFIRMED|IPS_SRC_NAT|IPS_SRC_NAT_DONE|IPS_DST_NAT_DONE)}, "

                + "timeout_sec{120}}";

        assertEquals(expected, conntrackMessage.toString());

    }

}

common/moduleutils/src/android/net/ip/ConntrackMonitor.java

+2 −2

File changed.

Contains only whitespace changes.

common/netlinkclient/src/android/net/netlink/ConntrackMessage.java

+4 −4

File changed.

Contains only whitespace changes.