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

Commit a4eab209 authored by lifr's avatar lifr Committed by Luke Huang
Browse files

Restore the PrivateDnsMode emun to its original definition 

Westworld requires the first field of all enums to be set to
UNKNOWN/UNSET, but this is awkward for the resolver code and
makes it hard to verify whether we have any PrivateDnsMode
variables initialized to UNKNOWN by accident.

So revert this change, and add a simple function to convert
the internal PrivateDnsMode enum to the other PrivateDnsMode
emun defined in the stats proto.

Bug: 119862317
Test: atest
Change-Id: Id146a16e41e0183867b3a4e2d87a2b0fc09df27d
parent 21a7679c

PrivateDnsConfiguration.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace android { 
namespace net {



// The DNS over TLS mode on a specific netId.

enum class PrivateDnsMode : uint8_t { UNKNOWN, OFF, OPPORTUNISTIC, STRICT };

enum class PrivateDnsMode : uint8_t { OFF, OPPORTUNISTIC, STRICT };



// Validation status of a DNS over TLS server (on a specific netId).

enum class Validation : uint8_t { in_process, success, fail, unknown_server, unknown_netid };

ResolverController.cpp

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ std::string addrToString(const sockaddr_storage* addr) { 


const char* getPrivateDnsModeString(PrivateDnsMode mode) {

    switch (mode) {

        case PrivateDnsMode::UNKNOWN:

            return "UNKNOWN";

        case PrivateDnsMode::OFF:

            return "OFF";

        case PrivateDnsMode::OPPORTUNISTIC:

res_send.cpp

+13 −1
Original line number Diff line number Diff line
@@ -1262,13 +1262,25 @@ static int sock_eq(struct sockaddr* a, struct sockaddr* b) { 
    }

}



PrivateDnsModes convertEnumType(PrivateDnsMode privateDnsmode) {

    switch (privateDnsmode) {

        case PrivateDnsMode::OFF:

            return PrivateDnsModes::PDM_OFF;

        case PrivateDnsMode::OPPORTUNISTIC:

            return PrivateDnsModes::PDM_OPPORTUNISTIC;

        case PrivateDnsMode::STRICT:

            return PrivateDnsModes::PDM_STRICT;

    }

    return PrivateDnsModes::PDM_UNKNOWN;

}



static int res_tls_send(res_state statp, const Slice query, const Slice answer, int* rcode,

                        bool* fallback) {

    int resplen = 0;

    const unsigned netId = statp->netid;



    PrivateDnsStatus privateDnsStatus = gPrivateDnsConfiguration.getStatus(netId);

    statp->event->set_private_dns_modes(static_cast<PrivateDnsModes>(privateDnsStatus.mode));

    statp->event->set_private_dns_modes(convertEnumType(privateDnsStatus.mode));



    if (privateDnsStatus.mode == PrivateDnsMode::OFF) {

        *fallback = true;