bionic: Replace iface with opaque netid in resolver.
Replace iface cache key with netid. Replace _mark with netid. Mark sockets used to test IPv4/IPv6 support as well as sockets used to determine source address for rfc6724 sort. Remove pid/uid mappings (functionality moved to system/netd). Do not create resolv_cache when it does not exist, but rather only when DNS configuration is supplied. Clean up unused functions. Change-Id: I9ccfda2902cc0943e87c9bc346ad9a2578accdab
This commit is contained in:

committed by
Paul Jensen

parent
bc475bc8d1
commit
ea9bf67881
70
libc/dns/include/resolv_netid.h
Normal file
70
libc/dns/include/resolv_netid.h
Normal file
@@ -0,0 +1,70 @@
|
||||
/*
|
||||
* Copyright (C) 2014 The Android Open Source Project
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef _RESOLV_NETID_H
|
||||
#define _RESOLV_NETID_H
|
||||
|
||||
/* This header contains declarations related to per-network DNS
|
||||
* server selection. They are used by system/netd/ and should not be
|
||||
* exposed by the C library's public NDK headers.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
#include <netinet/in.h>
|
||||
|
||||
/*
|
||||
* Passing NETID_UNSET as the netId causes system/netd/DnsProxyListener.cpp to
|
||||
* fill in the appropriate default netId for the query.
|
||||
*/
|
||||
#define NETID_UNSET 0u
|
||||
|
||||
/*
|
||||
* MARK_UNSET represents the default (i.e. unset) value for a socket mark.
|
||||
*/
|
||||
#define MARK_UNSET 0u
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
struct addrinfo;
|
||||
|
||||
struct hostent *android_gethostbyaddrfornet(const void *, socklen_t, int, unsigned, unsigned);
|
||||
struct hostent *android_gethostbyaddrfornet_proxy(const void *, socklen_t, int , unsigned);
|
||||
struct hostent *android_gethostbynamefornet(const char *, int, unsigned, unsigned);
|
||||
int android_getaddrinfofornet(const char *, const char *, const struct addrinfo *, unsigned,
|
||||
unsigned, struct addrinfo **);
|
||||
int android_getnameinfofornet(const struct sockaddr *, socklen_t, char *, size_t, char *, size_t,
|
||||
int, unsigned, unsigned);
|
||||
|
||||
/* set name servers for a network */
|
||||
extern void _resolv_set_nameservers_for_net(unsigned netid,
|
||||
const char** servers, int numservers, const char *domains);
|
||||
|
||||
/* flush the cache associated with a certain network */
|
||||
extern void _resolv_flush_cache_for_net(unsigned netid);
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _RESOLV_NETID_H */
|
Reference in New Issue
Block a user