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

Commit 5f6c22eb authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

Merge "Dead code removal - delete CANNOT_CONNECT_DGRAM" am: 64cfa97a93 am:... 

Merge "Dead code removal - delete CANNOT_CONNECT_DGRAM" am: 64cfa97a93 am: b5135e5d45 am: ee202746cd am: 35b115c685
am: 454519be6c

Change-Id: Ia39a4c471fc7d434dc56584e917ec8f34b090825
parents bf95c5d0 d516090f

res_send.cpp

+4 −21
Original line number Diff line number Diff line
@@ -1027,18 +1027,10 @@ static int send_dg(res_state statp, res_params* params, const u_char* buf, int b 
                return -1;

            }

        }

#ifndef CANNOT_CONNECT_DGRAM

        /*

         * On a 4.3BSD+ machine (client and server,

         * actually), sending to a nameserver datagram

         * port with no nameserver will cause an

         * ICMP port unreachable message to be returned.

         * If our datagram socket is "connected" to the

         * server, we get an ECONNREFUSED error on the next

         * socket operation, and select returns if the

         * error message is received.  We can thus detect

         * the absence of a nameserver without timing out.

         */

        // Use a "connected" datagram socket to receive an ECONNREFUSED error

        // on the next socket operation when the server responds with an

        // ICMP port-unreachable error. This way we can detect the absence of

        // a nameserver without timing out.

        if (random_bind(statp->_u._ext.nssocks[ns], nsap->sa_family) < 0) {

            dump_error("bind(dg)", nsap, nsaplen);

            res_nclose(statp);
@@ -1049,23 +1041,14 @@ static int send_dg(res_state statp, res_params* params, const u_char* buf, int b 
            res_nclose(statp);

            return (0);

        }

#endif /* !CANNOT_CONNECT_DGRAM */

        LOG(DEBUG) << __func__ << ": new DG socket";

    }

    s = statp->_u._ext.nssocks[ns];

#ifndef CANNOT_CONNECT_DGRAM

    if (send(s, (const char*) buf, (size_t) buflen, 0) != buflen) {

        PLOG(DEBUG) << __func__ << ": send: ";

        res_nclose(statp);

        return 0;

    }

#else  /* !CANNOT_CONNECT_DGRAM */

    if (sendto(s, (const char*) buf, buflen, 0, nsap, nsaplen) != buflen) {

        dump_error("sendto", nsap, nsaplen);

        res_nclose(statp);

        return 0;

    }

#endif /* !CANNOT_CONNECT_DGRAM */



    // Wait for reply.

    timeout = get_timeout(statp, params, ns);