diff options
author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2001-06-15 22:08:30 +0000 |
---|---|---|
committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2001-06-15 22:08:30 +0000 |
commit | c6e57ae65f2f513fab5275434c608dddfe523538 (patch) | |
tree | c5e8923c3b546c92999dfb59b91944da68009ef1 /include | |
parent | 3f5e2ce6144c77e2ce330db6d8e00805ebc80350 (diff) | |
download | src-c6e57ae65f2f513fab5275434c608dddfe523538.tar.gz src-c6e57ae65f2f513fab5275434c608dddfe523538.zip |
MFC: Implement EDNS0 support, as EDNS0 support will be made mandatory for
IPv6 transport-ready resolvers/DNS servers. Need careful configuration
when enable it. (default config is not affected).
See manpage for details.
XXX visible symbol __res_opt() is added, however, it is not supposed to be
called from outside, libc minor is not bumped.
src/include/resolv.h: 1.19->1.20
src/include/arpa/nameser.h: 1.14->1.15
src/include/arpa/nameser_compat.h: 1.2->1.3
src/lib/libc/net/getaddrinfo.c: 1.20->1.21
src/lib/libc/net/res_debug.c: 1.18->1.19
src/lib/libc/net/res_init.c: 1.23->1.24
src/lib/libc/net/res_mkquery.c: 1.15->1.16
src/lib/libc/net/res_query.c: 1.19->1.20
src/lib/libc/net/resolver.3: 1.14->1.15
src/share/examples/IPv6/USAGE: 1.1->1.2
Notes
Notes:
svn path=/stable/4/; revision=78301
Diffstat (limited to 'include')
-rw-r--r-- | include/arpa/nameser.h | 1 | ||||
-rw-r--r-- | include/arpa/nameser_compat.h | 1 | ||||
-rw-r--r-- | include/resolv.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 3e09c912ddac..343e6416a402 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -273,6 +273,7 @@ typedef enum __ns_type { ns_t_srv = 33, /* Server Selection. */ ns_t_atma = 34, /* ATM Address */ ns_t_naptr = 35, /* Naming Authority PoinTeR */ + ns_t_opt = 41, /* OPT pseudo-RR, RFC2761 */ /* Query type values which do not appear in resource records. */ ns_t_ixfr = 251, /* Incremental zone transfer. */ ns_t_axfr = 252, /* Transfer zone of authority. */ diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h index 850fb8a0890d..232179730fe5 100644 --- a/include/arpa/nameser_compat.h +++ b/include/arpa/nameser_compat.h @@ -173,6 +173,7 @@ typedef struct { #define T_SRV ns_t_srv #define T_ATMA ns_t_atma #define T_NAPTR ns_t_naptr +#define T_OPT ns_t_opt #define T_IXFR ns_t_ixfr #define T_AXFR ns_t_axfr #define T_MAILB ns_t_mailb diff --git a/include/resolv.h b/include/resolv.h index 4a0cf7470aba..a076c7e0fdd9 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -150,6 +150,8 @@ struct __res_state_ext { #define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ #define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ #define RES_NOTLDQUERY 0x00004000 /* Don't query TLD names */ +/* KAME extensions: use higher bit to avoid conflict with ISC use */ +#define RES_USE_EDNS0 0x40000000 /* use EDNS0 */ #define RES_DEFAULT (RES_RECURSE | RES_DEFNAMES | RES_DNSRCH) @@ -249,6 +251,7 @@ extern const struct res_sym __p_type_syms[]; #define res_nameinquery __res_nameinquery #define res_queriesmatch __res_queriesmatch #define res_close __res_close +#define res_opt __res_opt #define res_mkupdate __res_mkupdate #define res_mkupdrec __res_mkupdrec #define res_freeupdrec __res_freeupdrec @@ -303,6 +306,7 @@ int res_nameinquery __P((const char *, int, int, int res_queriesmatch __P((const u_char *, const u_char *, const u_char *, const u_char *)); void res_close __P((void)); +int res_opt __P((int, u_char *, int, int)); const char * p_section __P((int, int)); /* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */ #ifdef _ARPA_NAMESER_H_ |