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

Commit 9c7fd97c authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

Add more traces in error cases am: b6efaac1 am: c39eb9e7 

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



Change-Id: Ic5d0ff20d1d1ac6e3ae445f2d2f091e5913e4e09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 790fcece c39eb9e7

getaddrinfo.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1660,7 +1660,8 @@ QueryResult doQuery(const char* name, res_target* t, ResState* res, 
        }

    }



    LOG(INFO) << __func__ << ": rcode=" << rcode << ", ancount=" << ntohs(hp->ancount);

    LOG(INFO) << __func__ << ": rcode=" << rcode << ", ancount=" << ntohs(hp->ancount)

              << ", return value=" << n;



    t->n = n;

    return {

res_cache.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1851,7 +1851,10 @@ int resolv_cache_get_resolver_stats(unsigned netid, res_params* params, res_stat 
                                    const std::vector<IPSockAddr>& serverSockAddrs) {

    std::lock_guard guard(cache_mutex);

    NetConfig* info = find_netconfig_locked(netid);

    if (!info) return -1;

    if (!info) {

        LOG(WARNING) << __func__ << ": NetConfig for netid " << netid << " not found";

        return -1;

    }



    for (size_t i = 0; i < serverSockAddrs.size(); i++) {

        for (size_t j = 0; j < info->nameserverSockAddrs.size(); j++) {

res_send.cpp

+3 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ int res_nsend(ResState* statp, span<const uint8_t> msg, span<uint8_t> ans, int* 
        // asking the same question will block for PENDING_REQUEST_TIMEOUT seconds instead

        // of failing fast.

        _resolv_cache_query_failed(statp->netid, msg, flags);



        LOG(DEBUG) << __func__ << ": no nameserver";

        // TODO: Remove errno once callers stop using it

        errno = ESRCH;

        return -ESRCH;
@@ -526,6 +526,7 @@ int res_nsend(ResState* statp, span<const uint8_t> msg, span<uint8_t> ans, int* 
        }

        if (!fallback) {

            _resolv_cache_query_failed(statp->netid, msg, flags);

            LOG(DEBUG) << __func__ << ": private DNS failed";

            return -ETIMEDOUT;

        }

    }
@@ -540,6 +541,7 @@ int res_nsend(ResState* statp, span<const uint8_t> msg, span<uint8_t> ans, int* 
    res_params params;

    int revision_id = resolv_cache_get_resolver_stats(statp->netid, &params, stats, statp->nsaddrs);

    if (revision_id < 0) {

        LOG(ERROR) << __func__ << ": revision_id < 0";

        // TODO: Remove errno once callers stop using it

        errno = ESRCH;

        return -ESRCH;