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

Commit 4780bd1f authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Gerrit Code Review
Browse files

Merge "Update fmtlib to 10.1.1" into main

parents 6bcd0ff2 9fc009ea

PrivateDnsConfiguration.cpp

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,8 @@ base::Result<DnsTlsServer*> PrivateDnsConfiguration::getDotServerLocked( 


    auto iter = netPair->second.find(identity);

    if (iter == netPair->second.end()) {

        return Errorf("Failed to get private DNS: server {{{}/{}}} not found", identity.sockaddr,

                      identity.provider);

        return Errorf("Failed to get private DNS: server {{{}/{}}} not found",

                      identity.sockaddr.toString(), identity.provider);

    }



    return &iter->second;

res_debug.cpp

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void do_section(ns_msg* handle, ns_sect section) { 


            rdatalen = ns_rr_rdlen(rr);

            format_to(out, "; EDNS: version: {}, udp={}, flags={}\n", (rr.ttl >> 16) & 0xff,

                      ns_rr_class(rr), rr.ttl & 0xffff);

                      static_cast<int>(ns_rr_class(rr)), rr.ttl & 0xffff);

            const uint8_t* cp = ns_rr_rdata(rr);

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

                int i;