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

Commit 610162c2 authored by Luke Huang's avatar Luke Huang Committed by android-build-merger
Browse files

Merge "Follow-up changes for running resolv_integration_test on Q devices" am: ef61bff5 

am: 4ac62c17

Change-Id: Ifa0066baf816ba204c0afe3610787e7e812ebf93
parents b2ea3e4c 4ac62c17

tests/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -122,12 +122,12 @@ cc_test { 
        "libcrypto_static",

        "libgmock",

        "liblog",

        "libnetdutils",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_metrics_listener",

        "libnetd_test_resolv_utils",

        "libnetd_test_tun_interface",

        "libnetd_test_utils",

        "libnetd_test_metrics_listener",

        "libnetd_test_dnsresponder_ndk",

        "libnetdutils",

        "libssl",

        "libutils",

        "netd_aidl_interface-ndk_platform",

tests/dns_metrics_listener/base_metrics_listener.cpp

+12 −12
Original line number Diff line number Diff line
@@ -22,17 +22,17 @@ namespace metrics { 


::ndk::ScopedAStatus BaseMetricsListener::onDnsEvent(

        int32_t /*netId*/, int32_t /*eventType*/, int32_t /*returnCode*/, int32_t /*latencyMs*/,

        const std::string& /*hostname*/, const ::std::vector<std::string>& /*ipAddresses*/,

        const std::string& /*hostname*/, const std::vector<std::string>& /*ipAddresses*/,

        int32_t /*ipAddressesCount*/, int32_t /*uid*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



::ndk::ScopedAStatus BaseMetricsListener::onPrivateDnsValidationEvent(

        int32_t /*netId*/, const std::string& /*ipAddress*/, const std::string& /*hostname*/,

        bool /*validated*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



::ndk::ScopedAStatus BaseMetricsListener::onConnectEvent(int32_t /*netId*/, int32_t /*error*/,
@@ -40,31 +40,31 @@ namespace metrics { 
                                                         const std::string& /*ipAddr*/,

                                                         int32_t /*port*/, int32_t /*uid*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



::ndk::ScopedAStatus BaseMetricsListener::onWakeupEvent(

        const std::string& /*prefix*/, int32_t /*uid*/, int32_t /*ethertype*/,

        int32_t /*ipNextHeader*/, const ::std::vector<int8_t>& /*dstHw*/,

        int32_t /*ipNextHeader*/, const std::vector<int8_t>& /*dstHw*/,

        const std::string& /*srcIp*/, const std::string& /*dstIp*/, int32_t /*srcPort*/,

        int32_t /*dstPort*/, int64_t /*timestampNs*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



::ndk::ScopedAStatus BaseMetricsListener::onTcpSocketStatsEvent(

        const ::std::vector<int32_t>& /*networkIds*/, const ::std::vector<int32_t>& /*sentPackets*/,

        const ::std::vector<int32_t>& /*lostPackets*/, const ::std::vector<int32_t>& /*rttUs*/,

        const ::std::vector<int32_t>& /*sentAckDiffMs*/) {

        const std::vector<int32_t>& /*networkIds*/, const std::vector<int32_t>& /*sentPackets*/,

        const std::vector<int32_t>& /*lostPackets*/, const std::vector<int32_t>& /*rttUs*/,

        const std::vector<int32_t>& /*sentAckDiffMs*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



::ndk::ScopedAStatus BaseMetricsListener::onNat64PrefixEvent(int32_t /*netId*/, bool /*added*/,

                                                             const ::std::string& /*prefixString*/,

                                                             const std::string& /*prefixString*/,

                                                             int32_t /*prefixLength*/) {

    // default no-op

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



}  // namespace metrics

tests/dns_metrics_listener/base_metrics_listener.h

+6 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class BaseMetricsListener : public aidl::android::net::metrics::BnNetdEventListe 
    virtual ::ndk::ScopedAStatus onDnsEvent(int32_t /*netId*/, int32_t /*eventType*/,

                                            int32_t /*returnCode*/, int32_t /*latencyMs*/,

                                            const std::string& /*hostname*/,

                                            const ::std::vector<std::string>& /*ipAddresses*/,

                                            const std::vector<std::string>& /*ipAddresses*/,

                                            int32_t /*ipAddressesCount*/, int32_t /*uid*/) override;

    virtual ::ndk::ScopedAStatus onPrivateDnsValidationEvent(int32_t /*netId*/,

                                                             const std::string& /*ipAddress*/,
@@ -45,18 +45,17 @@ class BaseMetricsListener : public aidl::android::net::metrics::BnNetdEventListe 
                                                int32_t /*uid*/) override;

    virtual ::ndk::ScopedAStatus onWakeupEvent(const std::string& /*prefix*/, int32_t /*uid*/,

                                               int32_t /*ethertype*/, int32_t /*ipNextHeader*/,

                                               const ::std::vector<int8_t>& /*dstHw*/,

                                               const std::vector<int8_t>& /*dstHw*/,

                                               const std::string& /*srcIp*/,

                                               const std::string& /*dstIp*/, int32_t /*srcPort*/,

                                               int32_t /*dstPort*/,

                                               int64_t /*timestampNs*/) override;

    virtual ::ndk::ScopedAStatus onTcpSocketStatsEvent(

            const ::std::vector<int32_t>& /*networkIds*/,

            const ::std::vector<int32_t>& /*sentPackets*/,

            const ::std::vector<int32_t>& /*lostPackets*/, const ::std::vector<int32_t>& /*rttUs*/,

            const ::std::vector<int32_t>& /*sentAckDiffMs*/) override;

            const std::vector<int32_t>& /*networkIds*/, const std::vector<int32_t>& /*sentPackets*/,

            const std::vector<int32_t>& /*lostPackets*/, const std::vector<int32_t>& /*rttUs*/,

            const std::vector<int32_t>& /*sentAckDiffMs*/) override;

    virtual ::ndk::ScopedAStatus onNat64PrefixEvent(int32_t /*netId*/, bool /*added*/,

                                                    const ::std::string& /*prefixString*/,

                                                    const std::string& /*prefixString*/,

                                                    int32_t /*prefixLength*/) override;

};

tests/dns_metrics_listener/dns_metrics_listener.cpp

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ constexpr milliseconds kEventTimeoutMs{5000}; 
                                                            int32_t /*prefixLength*/) {

    std::lock_guard lock(mMutex);

    if (netId == mNetId) mNat64Prefix = added ? prefixString : "";

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

}



::ndk::ScopedAStatus DnsMetricsListener::onPrivateDnsValidationEvent(
@@ -46,7 +46,7 @@ constexpr milliseconds kEventTimeoutMs{5000}; 
        mValidationRecords.insert_or_assign({netId, ipAddress}, validated);

    }

    mCv.notify_one();

    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

}



bool DnsMetricsListener::waitForNat64Prefix(ExpectNat64PrefixStatus status,

tests/dns_metrics_listener/test_metrics.cpp

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void BaseTestMetricsEvent::setVerified(EventFlag event) { 
        notify();

    }



    return ::ndk::ScopedAStatus(AStatus_newOk());

    return ::ndk::ScopedAStatus::ok();

};



}  // namespace metrics