X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fadns.h;h=a6599f6db3cb13e8e5e1c4b1cc754b706bdb1e99;hb=e45372c163ef6a942f7856acf87173c8a79c3d85;hp=7d78bf7ed7dded496ed5e8862bd5569bd7589a01;hpb=cdf51ff0be2d71b61dec430d08c985f20cc5dffd;p=adns.git diff --git a/src/adns.h b/src/adns.h index 7d78bf7..a6599f6 100644 --- a/src/adns.h +++ b/src/adns.h @@ -5,16 +5,16 @@ /* * * This file is - * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson * * It is part of adns, which is - * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson * Copyright (C) 1999-2000,2003,2006 Tony Finch * Copyright (C) 1991 Massachusetts Institute of Technology * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -48,11 +48,8 @@ * * You should have received a copy of the GNU General Public License, * or the GNU Library General Public License, as appropriate, along - * with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * with this program; if not, write to the Free Software Foundation. * - * - * $Id$ */ #ifndef ADNS_H_INCLUDED @@ -72,6 +69,25 @@ extern "C" { /* I really dislike this - iwj. */ #endif +/* Whether to support address families other than IPv4 in responses which use + * the `adns_rr_addr' structure. This is a source-compatibility issue: old + * clients may not expect to find address families other than AF_INET in + * their query results. There's a separate binary compatibility issue to do + * with the size of the `adns_rr_addr' structure, but we'll assume you can + * cope with that because you have this header file. Define + * `ADNS_FEATURE_IPV4ONLY' if you only want to see AF_INET addresses by + * default, or `ADNS_FEATURE_MANYAF' to allow multiple address families; the + * default is currently to stick with AF_INET only, but this is likely to + * change in a later release of ADNS. Note that any adns_qf_want_... flags + * in your query are observed: this setting affects only the default address + * families. + */ +#if !defined(ADNS_FEATURE_IPV4ONLY) && !defined(ADNS_FEATURE_MANYAF) +# define ADNS_FEATURE_IPV4ONLY +#elif defined(ADNS_FEATURE_IPV4ONLY) && defined(ADNS_FEATURE_MANYAF) +# error "Feature flags ADNS_FEATURE_IPV4ONLY and ..._MANYAF are incompatible" +#endif + /* All struct in_addr anywhere in adns are in NETWORK byte order. */ typedef struct adns__state *adns_state; @@ -88,7 +104,18 @@ typedef enum { /* In general, or together the desired flags: */ adns_if_eintr= 0x0020,/* allow _wait and _synchronous to return EINTR */ adns_if_nosigpipe= 0x0040,/* applic has SIGPIPE ignored, do not protect */ adns_if_checkc_entex=0x0100,/* consistency checks on entry/exit to adns fns */ - adns_if_checkc_freq= 0x0300 /* consistency checks very frequently (slow!) */ + adns_if_checkc_freq= 0x0300,/* consistency checks very frequently (slow!) */ + + adns_if_permit_ipv4= 0x0400,/* allow _addr queries to return IPv4 addresses */ + adns_if_permit_ipv6= 0x0800,/* allow _addr queries to return IPv6 addresses */ + adns_if_afmask= 0x0c00, + /* These are policy flags, and overridden by the adns_af:... option in + * resolv.conf. If the adns_qf_want_... query flags are incompatible with + * these settings (in the sense that no address families are permitted at + * all) then the query flags take precedence; otherwise only records which + * satisfy all of the stated requirements are allowed. + */ + adns__if_sizeforce= 0x7fff, } adns_initflags; typedef enum { /* In general, or together the desired flags: */ @@ -101,12 +128,25 @@ typedef enum { /* In general, or together the desired flags: */ adns_qf_quoteok_anshost=0x00000040,/* ... in things supposedly hostnames */ adns_qf_quotefail_cname=0x00000080,/* refuse if quote-req chars in CNAME we go via */ adns_qf_cname_loose= 0x00000100,/* allow refs to CNAMEs - without, get _s_cname */ + adns_qf_cname_strict= 0x00010000,/* forbid CNAME refs (default, currently) */ adns_qf_cname_forbid= 0x00000200,/* don't follow CNAMEs, instead give _s_cname */ + + adns_qf_want_ipv4= 0x00000400,/* try to return IPv4 addresses */ + adns_qf_want_ipv6= 0x00000800,/* try to return IPv6 addresses */ + adns_qf_want_allaf= 0x00000c00,/* all the above flag bits */ + /* Without any of the _qf_want_... flags, _qtf_deref queries try to return + * all address families permitted by _if_permit_... (as overridden by the + * `adns_af:...' configuration option). Set flags to restrict the + * returned address families to the ones selected. + */ adns_qf_ipv6_mapv4= 0x00001000,/* ... return IPv4 addresses as v6-mapped */ + adns_qf_addrlit_scope_forbid=0x00002000,/* forbid % in IPv6 literals */ adns_qf_addrlit_scope_numeric=0x00004000,/* % may only be numeric */ adns_qf_addrlit_ipv4_quadonly=0x00008000,/* reject non-dotted-quad ipv4 */ - adns__qf_internalmask= 0x0ff00000 + + adns__qf_internalmask= 0x0ff00000, + adns__qf_sizeforce= 0x7fffffff } adns_queryflags; typedef enum { @@ -116,8 +156,12 @@ typedef enum { adns__qtf_mail822= 0x20000,/* return mailboxes in RFC822 rcpt field fmt */ adns__qtf_bigaddr=0x1000000,/* use the new larger sockaddr union */ + adns__qtf_manyaf= 0x2000000,/* permitted to return multiple address families */ adns__qtf_deref= adns__qtf_deref_bit|adns__qtf_bigaddr +#ifdef ADNS_FEATURE_MANYAF + |adns__qtf_manyaf +#endif ,/* dereference domains; perhaps get extra data */ adns_r_unknown= 0x40000, @@ -150,7 +194,7 @@ typedef enum { adns_r_soa_raw= 6, adns_r_soa= adns_r_soa_raw|adns__qtf_mail822, - adns_r_ptr_raw= 12, /* do not mind PTR with wrong or missing A */ + adns_r_ptr_raw= 12, /* do not mind PTR with wrong or missing addr */ adns_r_ptr= adns_r_ptr_raw|adns__qtf_deref, adns_r_hinfo= 13, @@ -171,7 +215,9 @@ typedef enum { adns_r_srv_raw= 33, adns_r_srv= adns_r_srv_raw|adns__qtf_deref, - adns_r_addr= adns_r_a|adns__qtf_deref + adns_r_addr= adns_r_a|adns__qtf_deref, + + adns__rrt_sizeforce= 0x7fffffff, } adns_rrtype; @@ -272,8 +318,8 @@ typedef enum { adns_s_max_tempfail= 99, /* remote configuration errors */ - adns_s_inconsistent, /* PTR gives domain whose A does not exist and match */ - adns_s_prohibitedcname, /* CNAME, but eg A expected (not if _qf_loosecname) */ + adns_s_inconsistent, /* PTR gives domain whose addr is missing or mismatch */ + adns_s_prohibitedcname, /* CNAME, but eg A expected (not if _qf_cname_loose) */ adns_s_answerdomaininvalid, adns_s_answerdomaintoolong, adns_s_invaliddata, @@ -534,6 +580,21 @@ int adns_init_logfn(adns_state *newstate_r, adns_initflags flags, * Changes the consistency checking frequency; this overrides the * setting of adns_if_check_entex, adns_if_check_freq, or neither, * in the flags passed to adns_init. + * + * adns_af:{ipv4,ipv6},... adns_af:any + * Determines which address families ADNS looks up (either as an + * adns_r_addr query, or when dereferencing an answer yielding hostnames + * (e.g., adns_r_mx). The argument is a comma-separated list: only the + * address families listed will be looked up. The default is `any'. + * Lookups occur (logically) concurrently; use the `sortlist' directive to + * control the relative order of addresses in answers. This option + * overrides the corresponding init flags (covered by adns_if_afmask). + * + * adns_ignoreunkcfg + * Ignore unknown options and configuration directives, rather than + * logging them. To be effective, appear in the configuration + * before the unknown options. ADNS_RES_OPTIONS is generally early + * enough. * * There are a number of environment variables which can modify the * behaviour of adns. They take effect only if adns_init is used, and @@ -654,8 +715,7 @@ int adns_addr2text(const struct sockaddr *sa, adns_queryflags flags, * port is always in host byte order and is simply copied to and * from the appropriate sockaddr field (byteswapped as necessary). * - * The only flags supported are adns_qf_addrlit_...; others are - * ignored. + * The only flags supported are adns_qf_addrlit_... * * Error return values are: * @@ -678,6 +738,8 @@ int adns_addr2text(const struct sockaddr *sa, adns_queryflags flags, * * EAFNOSUPPORT sa->sa_family is not supported (addr2text only). * + * ENOSYS Unsupported flags set. + * * Only if neither adns_qf_addrlit_scope_forbid nor * adns_qf_addrlit_scope_numeric are set: *