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

Commit 10a90283 authored by Bernie Innocenti's avatar Bernie Innocenti
Browse files

Delete dead code in res_comp.cpp and misc cleanups 

No functionality changes, this is mostly meant to improve our code
coverage and cleanup our headers a bit.

 - delete dead functions res_ownok() and res_mailok()
 - Move prototypes of the remaining functions to the new header res_comp.h
 - Replace resolv_private.h with res_comp.h as needed
 - Drop the dependency on Bionic's <resolv.h> wherever possible
 - Eliminate the horrible maybe_XXX() macros
 - Make res_hnok() and res_dnok() return a proper bool instead of 0 and 1

Change-Id: Ic2e27753355d873925044a7561ccb78bd2c2d162
parent f1deb1c9

DnsProxyListener.cpp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <net/if.h>

#include <netdb.h>

#include <netinet/in.h>

#include <resolv.h>  // b64_pton()

#include <stdlib.h>

#include <string.h>

#include <sys/socket.h>

getaddrinfo.cpp

+4 −1
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ 
#include <android-base/logging.h>



#include "netd_resolv/resolv.h"

#include "res_comp.h"

#include "res_debug.h"

#include "res_init.h"

#include "resolv_cache.h"

#include "resolv_private.h"
@@ -848,7 +850,6 @@ static struct addrinfo* getanswer(const std::vector<uint8_t>& answer, int anslen 
    int type, ancount, qdcount;

    int haveanswer, had_error;

    char tbuf[MAXDNAME];

    int (*name_ok)(const char*);

    char hostbuf[8 * 1024];



    assert(qname != NULL);
@@ -858,6 +859,8 @@ static struct addrinfo* getanswer(const std::vector<uint8_t>& answer, int anslen 


    canonname = NULL;

    eom = answer.data() + anslen;



    bool (*name_ok)(const char* dn);

    switch (qtype) {

        case T_A:

        case T_AAAA:

gethnamaddr.cpp

+9 −11
Original line number Diff line number Diff line
@@ -74,9 +74,10 @@ 


#include "hostent.h"

#include "netd_resolv/resolv.h"

#include "res_comp.h"

#include "res_debug.h"  // p_class(), p_type()

#include "res_init.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "stats.pb.h"



using android::net::NetworkDnsEventReported;
@@ -91,10 +92,6 @@ using android::net::NetworkDnsEventReported; 
#define ALIGNBYTES (sizeof(uintptr_t) - 1)

#define ALIGN(p) (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)



#define maybe_ok(res, nm, ok) ((ok)(nm) != 0)

#define maybe_hnok(res, hn) maybe_ok((res), (hn), res_hnok)

#define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)



constexpr int MAXADDRS = 35;



typedef union {
@@ -142,7 +139,6 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
    char tbuf[MAXDNAME];

    char* addr_ptrs[MAXADDRS];

    const char* tname;

    int (*name_ok)(const char*);

    std::vector<char*> aliases;



    _DIAGASSERT(answer != NULL);
@@ -151,6 +147,8 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
    tname = qname;

    hent->h_name = NULL;

    eom = answer->buf + anslen;



    bool (*name_ok)(const char* dn);

    switch (qtype) {

        case T_A:

        case T_AAAA:
@@ -177,7 +175,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
    if (qdcount != 1) goto no_recovery;



    n = dn_expand(answer->buf, eom, cp, bp, (int) (ep - bp));

    if ((n < 0) || !maybe_ok(res, bp, name_ok)) goto no_recovery;

    if ((n < 0) || !name_ok(bp)) goto no_recovery;



    BOUNDED_INCR(n + QFIXEDSZ);

    if (qtype == T_A || qtype == T_AAAA) {
@@ -198,7 +196,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
    had_error = 0;

    while (ancount-- > 0 && cp < eom && !had_error) {

        n = dn_expand(answer->buf, eom, cp, bp, (int) (ep - bp));

        if ((n < 0) || !maybe_ok(res, bp, name_ok)) {

        if ((n < 0) || !name_ok(bp)) {

            had_error++;

            continue;

        }
@@ -219,7 +217,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
        }

        if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {

            n = dn_expand(answer->buf, eom, cp, tbuf, (int) sizeof tbuf);

            if ((n < 0) || !maybe_ok(res, tbuf, name_ok)) {

            if ((n < 0) || !name_ok(tbuf)) {

                had_error++;

                continue;

            }
@@ -246,7 +244,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
        }

        if (qtype == T_PTR && type == T_CNAME) {

            n = dn_expand(answer->buf, eom, cp, tbuf, (int) sizeof tbuf);

            if (n < 0 || !maybe_dnok(res, tbuf)) {

            if (n < 0 || !res_dnok(tbuf)) {

                had_error++;

                continue;

            }
@@ -279,7 +277,7 @@ static struct hostent* getanswer(const querybuf* answer, int anslen, const char* 
                    continue; /* XXX - had_error++ ? */

                }

                n = dn_expand(answer->buf, eom, cp, bp, (int) (ep - bp));

                if ((n < 0) || !maybe_hnok(res, bp)) {

                if ((n < 0) || !res_hnok(bp)) {

                    had_error++;

                    break;

                }

res_cache.cpp

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include <server_configurable_flags/get_flags.h>



#include "DnsStats.h"

#include "res_comp.h"

#include "res_debug.h"

#include "resolv_private.h"

#include "util.h"

res_comp.cpp

+11 −47
Original line number Diff line number Diff line
@@ -70,14 +70,13 @@ 
 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "res_comp.h"



#include <arpa/nameser.h>

#include <ctype.h>

#include <netinet/in.h>

#include <string.h>

#include <unistd.h>



#include "resolv_private.h"



/*

 * Expand compressed domain name 'src' to full domain name.

 * 'msg' is a pointer to the begining of the message,
@@ -89,7 +88,7 @@ int dn_expand(const uint8_t* msg, const uint8_t* eom, const uint8_t* src, char* 
    int n = ns_name_uncompress(msg, eom, src, dst, (size_t) dstsiz);



    if (n > 0 && dst[0] == '.') dst[0] = '\0';

    return (n);

    return n;

}



/*
@@ -141,7 +140,7 @@ int dn_skipname(const uint8_t* ptr, const uint8_t* eom) { 
#define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))

#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)



int res_hnok(const char* dn) {

bool res_hnok(const char* dn) {

    int pch = PERIOD, ch = *dn++;



    while (ch != '\0') {
@@ -150,60 +149,25 @@ int res_hnok(const char* dn) { 
        if (periodchar(ch)) {

            ;

        } else if (periodchar(pch)) {

            if (!borderchar(ch)) return (0);

            if (!borderchar(ch)) return false;

        } else if (periodchar(nch) || nch == '\0') {

            if (!borderchar(ch)) return (0);

            if (!borderchar(ch)) return false;

        } else {

            if (!middlechar(ch)) return (0);

            if (!middlechar(ch)) return false;

        }

        pch = ch, ch = nch;

    }

    return (1);

}



/*

 * hostname-like (A, MX, WKS) owners can have "*" as their first label

 * but must otherwise be as a host name.

 */

int res_ownok(const char* dn) {

    if (asterchar(dn[0])) {

        if (periodchar(dn[1])) return (res_hnok(dn + 2));

        if (dn[1] == '\0') return (1);

    }

    return (res_hnok(dn));

}



/*

 * SOA RNAMEs and RP RNAMEs can have any printable character in their first

 * label, but the rest of the name has to look like a host name.

 */

int res_mailok(const char* dn) {

    int ch, escaped = 0;



    /* "." is a valid missing representation */

    if (*dn == '\0') return (1);



    /* otherwise <label>.<hostname> */

    while ((ch = *dn++) != '\0') {

        if (!domainchar(ch)) return (0);

        if (!escaped && periodchar(ch)) break;

        if (escaped)

            escaped = 0;

        else if (bslashchar(ch))

            escaped = 1;

    }

    if (periodchar(ch)) return (res_hnok(dn));

    return (0);

    return true;

}



/*

 * This function is quite liberal, since RFC 1034's character sets are only

 * recommendations.

 */

int res_dnok(const char* dn) {

bool res_dnok(const char* dn) {

    int ch;



    while ((ch = *dn++) != '\0')

        if (!domainchar(ch)) return (0);

    return (1);

        if (!domainchar(ch)) return false;

    return true;

}