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

Commit 406b7206 authored by Luke Huang's avatar Luke Huang Committed by Automerger Merge Worker
Browse files

Merge "Add VPN test for DnsResolver" am: 12fb6a19 am: 7d9494d2 am: ca381c15 am: f28d42ea 

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

Change-Id: I50dd0b9346aa6ed09dfeff071e84ac722e23abf1
parents 59bcbe25 f28d42ea

tests/dns_responder/dns_responder.h

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ class DNSResponder { 
        : DNSResponder(kDefaultListenAddr, kDefaultListenService, kDefaultErrorCode,

                       mapping_type){};



    DNSResponder(unsigned netId, std::string listen_address) : DNSResponder(listen_address) {

        mNetId = netId;

    };



    ~DNSResponder();



    // Functions used for accessing mapping {ADDRESS_OR_HOSTNAME, DNS_HEADER, BINARY_PACKET}.

tests/resolv_integration_test.cpp

+364 −98

File changed.

Preview size limit exceeded, changes collapsed.

tests/resolv_test_utils.h

+2 −1
Original line number Diff line number Diff line
@@ -82,8 +82,9 @@ struct DnsRecord { 


// TODO: make this dynamic and stop depending on implementation details.

constexpr int TEST_NETID = 30;

// Use maximum reserved appId for applications to avoid conflict with existing uids.

// Use the biggest two reserved appId for applications to avoid conflict with existing uids.

constexpr int TEST_UID = 99999;

constexpr int TEST_UID2 = 99998;



static constexpr char kLocalHost[] = "localhost";

static constexpr char kLocalHostAddr[] = "127.0.0.1";