lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

resolv: Mirror the entire resolver configuration in struct resolv_conf

Browse Source 
This commit adds the remaining unchanging members (which are loaded
from /etc/resolv.conf) to struct resolv_conf.

The extended name server list is currently not used by the stub
resolver.  The switch depends on a cleanup: The _u._ext.nssocks
array stores just a single socket, and needs to be replaced with
a single socket value.

(The compatibility gethostname implementation does not use the
extended addres sort list, either.  Updating the compat code is
not worthwhile.)
This commit is contained in:
Florian Weimer
2017-06-30 20:19:10 +02:00
parent 3f853f22c8
commit a1c4eb8794
7 changed files with 572 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resolv/resolv_conf.h
View File

@ -19,9 +19,17 @@
#ifndef RESOLV_STATE_H
#define RESOLV_STATE_H
#include <netinet/in.h>
#include <stdbool.h>
#include <stddef.h>
/* This type corresponds to members of the _res.sort_list array. */
struct resolv_sortlist_entry
{
struct in_addr addr;
uint32_t mask;
};
/* Extended resolver state associated with res_state objects. Client
code can reach this state through a struct resolv_context
object. */
@ -36,9 +44,24 @@ struct resolv_conf
zero. For internal use within resolv_conf only. */
size_t __refcount;
/* List of IPv4 and IPv6 name server addresses. */
const struct sockaddr **nameserver_list;
size_t nameserver_list_size;
/* The domain names forming the search list. */
const char *const *search_list;
size_t search_list_size;
/* IPv4 address preference rules. */
const struct resolv_sortlist_entry *sort_list;
size_t sort_list_size;
/* _res.options has type unsigned long, but we can only use 32 bits
for portability across all architectures. */
unsigned int options;
unsigned int retrans; /* Timeout. */
unsigned int retry; /* Number of times to retry. */
unsigned int ndots; /* Dots needed for initial non-search query. */
};
/* The functions below are for use by the res_init resolv.conf parser