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

Commit a9c77ff4 authored by Martin Wu's avatar Martin Wu Committed by Automerger Merge Worker
Browse files

Merge "Fix DnsResolver log print" am: 03a274f8 

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

Change-Id: I79717f29f303a07a6cb9b0bb5f475e9baa9d1a3d
parents a27bd73d 03a274f8

res_send.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ static int send_dg(ResState* statp, res_params* params, span<const uint8_t> msg, 
            // Leave the UDP sockets open on timeout so we can keep listening for

            // a late response from this server while retrying on the next server.

            if (!isTimeout) statp->closeSockets();

            LOG(DEBUG) << __func__ << ": " << (isTimeout) ? "timeout" : "poll";

            LOG(DEBUG) << __func__ << ": " << (isTimeout ? "timeout" : "poll");

            return 0;

        }

        bool needRetry = false;
@@ -1233,7 +1233,7 @@ static int send_mdns(ResState* statp, span<const uint8_t> msg, span<uint8_t> ans 
    if (retrying_poll(fd, POLLIN, &finish) <= 0) {

        *terrno = errno;

        if (*terrno == ETIMEDOUT) *rcode = RCODE_TIMEOUT;

        LOG(ERROR) << __func__ << ": " << (*terrno == ETIMEDOUT) ? "timeout" : "poll";

        LOG(ERROR) << __func__ << ": " << ((*terrno == ETIMEDOUT) ? "timeout" : "poll failed");

        return 0;

    }