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

Commit a6f40ca7 authored by Bernie Innocenti's avatar Bernie Innocenti
Browse files

Delete unused variable res_state.rstatic 

Also stop including resolv_static.h from resolv_private.h, and
other minor fixes.

Test: m, flash, atest
Change-Id: I2ba6fdf10900ddbd5afed1cec14a91bfad862d43
parent bb330746

gethnamaddr.cpp

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include "netd_resolv/resolv.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "resolv_static.h"

#include "stats.pb.h"



using android::net::NetworkDnsEventReported;

res_send.cpp

+5 −13
Original line number Diff line number Diff line
@@ -290,16 +290,8 @@ static void res_set_usable_server(int selectedServer, int nscount, bool usable_s 
    }

}



/* int

 * res_isourserver(ina)

 *	looks up "ina" in _res.ns_addr_list[]

 * returns:

 *	0  : not found

 *	>0 : found

 * author:

 *	paul vixie, 29may94

 */

static int res_ourserver_p(res_state statp, const sockaddr* sa) {

// Looks up the nameserver address in res.nsaddrs[], returns true if found, otherwise false.

static bool res_ourserver_p(res_state statp, const sockaddr* sa) {

    const sockaddr_in *inp, *srv;

    const sockaddr_in6 *in6p, *srv6;

    int ns;
@@ -312,7 +304,7 @@ static int res_ourserver_p(res_state statp, const sockaddr* sa) { 
                if (srv->sin_family == inp->sin_family && srv->sin_port == inp->sin_port &&

                    (srv->sin_addr.s_addr == INADDR_ANY ||

                     srv->sin_addr.s_addr == inp->sin_addr.s_addr))

                    return 1;

                    return true;

            }

            break;

        case AF_INET6:
@@ -325,13 +317,13 @@ static int res_ourserver_p(res_state statp, const sockaddr* sa) { 
#endif

                    (IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||

                     IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))

                    return 1;

                    return true;

            }

            break;

        default:

            break;

    }

    return 0;

    return false;

}



/* int

res_state.cpp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "res_init.h"

#include "resolv_cache.h"

#include "resolv_private.h"

#include "resolv_static.h"



typedef struct {

    // TODO: Have one __res_state per network so we don't have to repopulate frequently.

resolv_private.h

+6 −8
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
#include "netd_resolv/params.h"

#include "netd_resolv/resolv.h"

#include "netd_resolv/stats.h"

#include "resolv_static.h"

#include "stats.pb.h"



// Linux defines MAXHOSTNAMELEN as 64, while the domain name limit in
@@ -82,11 +81,11 @@ 
#define RES_DFLRETRY 2    /* Default #/tries. */



// Holds either a sockaddr_in or a sockaddr_in6.

typedef union sockaddr_union {

union sockaddr_union {

    struct sockaddr sa;

    struct sockaddr_in sin;

    struct sockaddr_in6 sin6;

} sockaddr_union;

};



struct __res_state {

    unsigned netid;                           // NetId: cache key and socket mark
@@ -95,12 +94,11 @@ struct __res_state { 
    uint16_t id;                              // current message id

    std::vector<std::string> search_domains;  // domains to search

    sockaddr_union nsaddrs[MAXNS];

    int nssocks[MAXNS];

    int nssocks[MAXNS];                       // UDP sockets to nameservers

    unsigned ndots : 4;                       // threshold for initial abs. query

    unsigned _mark;       /* If non-0 SET_MARK to _mark on all request sockets */

    int _vcsock;          /* PRIVATE: for res_send VC i/o */

    uint32_t _flags;      /* PRIVATE: see below */

    struct res_static rstatic[1];

    unsigned _mark;                           // If non-0 SET_MARK to _mark on all request sockets

    int _vcsock;                              // TCP socket (but why not one per nameserver?)

    uint32_t _flags;                          // See RES_F_* defines below

    android::net::NetworkDnsEventReported* event;

    uint32_t netcontext_flags;

};

sethostent.cpp

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#include "hostent.h"

#include "resolv_private.h"

#include "resolv_static.h"



#define ALIGNBYTES (sizeof(uintptr_t) - 1)

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