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

Commit c2b88041 authored by Bruce Chen's avatar Bruce Chen Committed by android-build-merger
Browse files

Merge "[Resolver-log]: Refactor EDNS OPT log print." 

am: 5c626d4b6a

Change-Id: If991445c5b5dbb9722f193d055ab69634e71ad21
parents 1fef3335 f3cc6e8a

res_debug.cpp

+3 −2
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ static void do_section(ns_msg* handle, ns_sect section) { 
            ttl = ns_rr_ttl(rr);

            dbprint(p, end, "; EDNS: version: %zu, udp=%u, flags=%04zx\n", (ttl >> 16) & 0xff,

                    ns_rr_class(rr), ttl & 0xffff);

            while (rdatalen >= 4) {

            const u_char* cp = ns_rr_rdata(rr);

            while (rdatalen <= ns_rr_rdlen(rr) && rdatalen >= 4) {

                int i;



                GETSHORT(optcode, cp);
@@ -223,6 +223,7 @@ static void do_section(ns_msg* handle, ns_sect section) { 
                    }

                }

                rdatalen -= 4 + optlen;

                cp += optlen;

            }

        } else {

            n = ns_sprintrr(handle, &rr, NULL, NULL, buf, (u_int) buflen);