Portability Updates for arpa/nameser.h (#388)

There is too much inconsistency between platforms for arpa/nameser.h and arpa/nameser_compat.h for the way the current files are structured.  Still load the respective system files but make our private nameser.h more forgiving.

Fixes: #388
Fix By: Brad House (@bradh352)
pull/394/head
bradh352 4 years ago
parent 0903dcecab
commit c2f32353e3
  1. 10
      src/lib/ares__parse_into_addrinfo.c
  2. 13
      src/lib/ares_create_query.c
  3. 10
      src/lib/ares_expand_name.c
  4. 7
      src/lib/ares_expand_string.c
  5. 10
      src/lib/ares_getaddrinfo.c
  6. 10
      src/lib/ares_gethostbyaddr.c
  7. 10
      src/lib/ares_gethostbyname.c
  8. 10
      src/lib/ares_getnameinfo.c
  9. 11
      src/lib/ares_init.c
  10. 443
      src/lib/ares_nameser.h
  11. 10
      src/lib/ares_parse_a_reply.c
  12. 10
      src/lib/ares_parse_aaaa_reply.c
  13. 14
      src/lib/ares_parse_caa_reply.c
  14. 10
      src/lib/ares_parse_mx_reply.c
  15. 15
      src/lib/ares_parse_naptr_reply.c
  16. 10
      src/lib/ares_parse_ns_reply.c
  17. 10
      src/lib/ares_parse_ptr_reply.c
  18. 16
      src/lib/ares_parse_soa_reply.c
  19. 15
      src/lib/ares_parse_srv_reply.c
  20. 10
      src/lib/ares_parse_txt_reply.c
  21. 8
      src/lib/ares_process.c
  22. 10
      src/lib/ares_query.c
  23. 10
      src/lib/ares_send.c
  24. 10
      src/lib/inet_net_pton.c
  25. 10
      src/lib/inet_ntop.c
  26. 218
      src/lib/nameser.h
  27. 38
      src/tools/adig.c
  28. 8
      test/ares-test.h
  29. 114
      test/dns-proto.cc
  30. 2
      test/dns-proto.h

@ -24,14 +24,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -19,22 +19,13 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"
#include "ares_private.h"
#ifndef T_OPT
# define T_OPT 41 /* EDNS0 option (meta-RR) */
#endif
/* Header format, from RFC 1035:
* 1 1 1 1 1 1

@ -19,14 +19,8 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_nowarn.h"

@ -19,11 +19,8 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_private.h" /* for the memdebug */

@ -34,14 +34,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>

@ -24,14 +24,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_inet_net_pton.h"

@ -25,14 +25,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>

@ -31,14 +31,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_NET_IF_H
#include <net/if.h>

@ -33,14 +33,7 @@
#include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
@ -1523,7 +1516,7 @@ static int init_by_resolv_conf(ares_channel channel)
}
status = ARES_EOF;
#elif defined(__riscos__)
/* Under RISC OS, name servers are listed in the

@ -0,0 +1,443 @@
#ifndef ARES_NAMESER_H
#define ARES_NAMESER_H
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
/* ============================================================================
* arpa/nameser.h may or may not provide ALL of the below defines, so check
* each one individually and set if not
* ============================================================================
*/
#ifndef NS_PACKETSZ
# define NS_PACKETSZ 512 /* maximum packet size */
#endif
#ifndef NS_MAXDNAME
# define NS_MAXDNAME 256 /* maximum domain name */
#endif
#ifndef NS_MAXCDNAME
# define NS_MAXCDNAME 255 /* maximum compressed domain name */
#endif
#ifndef NS_MAXLABEL
# define NS_MAXLABEL 63
#endif
#ifndef NS_HFIXEDSZ
# define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */
#endif
#ifndef NS_QFIXEDSZ
# define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */
#endif
#ifndef NS_RRFIXEDSZ
# define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
#endif
#ifndef NS_INT16SZ
# define NS_INT16SZ 2
#endif
#ifndef NS_INADDRSZ
# define NS_INADDRSZ 4
#endif
#ifndef NS_IN6ADDRSZ
# define NS_IN6ADDRSZ 16
#endif
#ifndef NS_CMPRSFLGS
# define NS_CMPRSFLGS 0xc0 /* Flag bits indicating name compression. */
#endif
#ifndef NS_DEFAULTPORT
# define NS_DEFAULTPORT 53 /* For both TCP and UDP. */
#endif
/* ============================================================================
* arpa/nameser.h should provide these enumerations always, so if not found,
* provide them
* ============================================================================
*/
#ifndef HAVE_ARPA_NAMESER_H
typedef enum __ns_class {
ns_c_invalid = 0, /* Cookie. */
ns_c_in = 1, /* Internet. */
ns_c_2 = 2, /* unallocated/unsupported. */
ns_c_chaos = 3, /* MIT Chaos-net. */
ns_c_hs = 4, /* MIT Hesiod. */
/* Query class values which do not appear in resource records */
ns_c_none = 254, /* for prereq. sections in update requests */
ns_c_any = 255, /* Wildcard match. */
ns_c_max = 65536
} ns_class;
typedef enum __ns_type {
ns_t_invalid = 0, /* Cookie. */
ns_t_a = 1, /* Host address. */
ns_t_ns = 2, /* Authoritative server. */
ns_t_md = 3, /* Mail destination. */
ns_t_mf = 4, /* Mail forwarder. */
ns_t_cname = 5, /* Canonical name. */
ns_t_soa = 6, /* Start of authority zone. */
ns_t_mb = 7, /* Mailbox domain name. */
ns_t_mg = 8, /* Mail group member. */
ns_t_mr = 9, /* Mail rename name. */
ns_t_null = 10, /* Null resource record. */
ns_t_wks = 11, /* Well known service. */
ns_t_ptr = 12, /* Domain name pointer. */
ns_t_hinfo = 13, /* Host information. */
ns_t_minfo = 14, /* Mailbox information. */
ns_t_mx = 15, /* Mail routing information. */
ns_t_txt = 16, /* Text strings. */
ns_t_rp = 17, /* Responsible person. */
ns_t_afsdb = 18, /* AFS cell database. */
ns_t_x25 = 19, /* X_25 calling address. */
ns_t_isdn = 20, /* ISDN calling address. */
ns_t_rt = 21, /* Router. */
ns_t_nsap = 22, /* NSAP address. */
ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */
ns_t_sig = 24, /* Security signature. */
ns_t_key = 25, /* Security key. */
ns_t_px = 26, /* X.400 mail mapping. */
ns_t_gpos = 27, /* Geographical position (withdrawn). */
ns_t_aaaa = 28, /* Ip6 Address. */
ns_t_loc = 29, /* Location Information. */
ns_t_nxt = 30, /* Next domain (security). */
ns_t_eid = 31, /* Endpoint identifier. */
ns_t_nimloc = 32, /* Nimrod Locator. */
ns_t_srv = 33, /* Server Selection. */
ns_t_atma = 34, /* ATM Address */
ns_t_naptr = 35, /* Naming Authority PoinTeR */
ns_t_kx = 36, /* Key Exchange */
ns_t_cert = 37, /* Certification record */
ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */
ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */
ns_t_sink = 40, /* Kitchen sink (experimentatl) */
ns_t_opt = 41, /* EDNS0 option (meta-RR) */
ns_t_apl = 42, /* Address prefix list (RFC3123) */
ns_t_ds = 43, /* Delegation Signer (RFC4034) */
ns_t_sshfp = 44, /* SSH Key Fingerprint (RFC4255) */
ns_t_rrsig = 46, /* Resource Record Signature (RFC4034) */
ns_t_nsec = 47, /* Next Secure (RFC4034) */
ns_t_dnskey = 48, /* DNS Public Key (RFC4034) */
ns_t_tkey = 249, /* Transaction key */
ns_t_tsig = 250, /* Transaction signature. */
ns_t_ixfr = 251, /* Incremental zone transfer. */
ns_t_axfr = 252, /* Transfer zone of authority. */
ns_t_mailb = 253, /* Transfer mailbox records. */
ns_t_maila = 254, /* Transfer mail agent records. */
ns_t_any = 255, /* Wildcard match. */
ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
ns_t_caa = 257, /* Certification Authority Authorization. */
ns_t_max = 65536
} ns_type;
typedef enum __ns_opcode {
ns_o_query = 0, /* Standard query. */
ns_o_iquery = 1, /* Inverse query (deprecated/unsupported). */
ns_o_status = 2, /* Name server status query (unsupported). */
/* Opcode 3 is undefined/reserved. */
ns_o_notify = 4, /* Zone change notification. */
ns_o_update = 5, /* Zone update message. */
ns_o_max = 6
} ns_opcode;
typedef enum __ns_rcode {
ns_r_noerror = 0, /* No error occurred. */
ns_r_formerr = 1, /* Format error. */
ns_r_servfail = 2, /* Server failure. */
ns_r_nxdomain = 3, /* Name error. */
ns_r_notimpl = 4, /* Unimplemented. */
ns_r_refused = 5, /* Operation refused. */
/* these are for BIND_UPDATE */
ns_r_yxdomain = 6, /* Name exists */
ns_r_yxrrset = 7, /* RRset exists */
ns_r_nxrrset = 8, /* RRset does not exist */
ns_r_notauth = 9, /* Not authoritative for zone */
ns_r_notzone = 10, /* Zone of record different from zone section */
ns_r_max = 11,
/* The following are TSIG extended errors */
ns_r_badsig = 16,
ns_r_badkey = 17,
ns_r_badtime = 18
} ns_rcode;
#endif /* HAVE_ARPA_NAMESER_H */
/* ============================================================================
* arpa/nameser_compat.h typically sets these. However on some systems
* arpa/nameser.h does, but may not set all of them. Lets conditionally
* define each
* ============================================================================
*/
#ifndef PACKETSZ
# define PACKETSZ NS_PACKETSZ
#endif
#ifndef MAXDNAME
# define MAXDNAME NS_MAXDNAME
#endif
#ifndef MAXCDNAME
# define MAXCDNAME NS_MAXCDNAME
#endif
#ifndef MAXLABEL
# define MAXLABEL NS_MAXLABEL
#endif
#ifndef HFIXEDSZ
# define HFIXEDSZ NS_HFIXEDSZ
#endif
#ifndef QFIXEDSZ
# define QFIXEDSZ NS_QFIXEDSZ
#endif
#ifndef RRFIXEDSZ
# define RRFIXEDSZ NS_RRFIXEDSZ
#endif
#ifndef INDIR_MASK
# define INDIR_MASK NS_CMPRSFLGS
#endif
#ifndef NAMESERVER_PORT
# define NAMESERVER_PORT NS_DEFAULTPORT
#endif
#ifndef QUERY
# define QUERY ns_o_query
#endif
#ifndef SERVFAIL
# define SERVFAIL ns_r_servfail
#endif
#ifndef NOTIMP
# define NOTIMP ns_r_notimpl
#endif
#ifndef REFUSED
# define REFUSED ns_r_refused
#endif
#if defined(_WIN32) && !defined(HAVE_ARPA_NAMESER_COMPAT_H) && defined(NOERROR)
# undef NOERROR /* it seems this is already defined in winerror.h */
#endif
#ifndef NOERROR
# define NOERROR ns_r_noerror
#endif
#ifndef FORMERR
# define FORMERR ns_r_formerr
#endif
#ifndef NXDOMAIN
# define NXDOMAIN ns_r_nxdomain
#endif
#ifndef C_IN
# define C_IN ns_c_in
#endif
#ifndef C_CHAOS
# define C_CHAOS ns_c_chaos
#endif
#ifndef C_HS
# define C_HS ns_c_hs
#endif
#ifndef C_NONE
# define C_NONE ns_c_none
#endif
#ifndef C_ANY
# define C_ANY ns_c_any
#endif
#ifndef T_A
# define T_A 1 /* ns_t_a */
#endif
#ifndef T_NS
# define T_NS 2 /* ns_t_ns */
#endif
#ifndef T_MD
# define T_MD 3 /* ns_t_md */
#endif
#ifndef T_MF
# define T_MF 4 /* ns_t_mf */
#endif
#ifndef T_CNAME
# define T_CNAME 5 /* ns_t_cname */
#endif
#ifndef T_SOA
# define T_SOA 6 /* ns_t_soa */
#endif
#ifndef T_MB
# define T_MB 7 /* ns_t_mb */
#endif
#ifndef T_MG
# define T_MG 8 /* ns_t_mg */
#endif
#ifndef T_MR
# define T_MR 9 /* ns_t_mr */
#endif
#ifndef T_NULL
# define T_NULL 10 /* ns_t_null */
#endif
#ifndef T_WKS
# define T_WKS 11 /* ns_t_wks */
#endif
#ifndef T_PTR
# define T_PTR 12 /* ns_t_ptr */
#endif
#ifndef T_HINFO
# define T_HINFO 13 /* ns_t_hinfo */
#endif
#ifndef T_MINFO
# define T_MINFO 14 /* ns_t_minfo */
#endif
#ifndef T_MX
# define T_MX 15 /* ns_t_mx */
#endif
#ifndef T_TXT
# define T_TXT 16 /* ns_t_txt */
#endif
#ifndef T_RP
# define T_RP 17 /* ns_t_rp */
#endif
#ifndef T_AFSDB
# define T_AFSDB 18 /* ns_t_afsdb */
#endif
#ifndef T_X25
# define T_X25 19 /* ns_t_x25 */
#endif
#ifndef T_ISDN
# define T_ISDN 20 /* ns_t_isdn */
#endif
#ifndef T_RT
# define T_RT 21 /* ns_t_rt */
#endif
#ifndef T_NSAP
# define T_NSAP 22 /* ns_t_nsap */
#endif
#ifndef T_NSAP_PTR
# define T_NSAP_PTR 23 /* ns_t_nsap_ptr */
#endif
#ifndef T_SIG
# define T_SIG 24 /* ns_t_sig */
#endif
#ifndef T_KEY
# define T_KEY 25 /* ns_t_key */
#endif
#ifndef T_PX
# define T_PX 26 /* ns_t_px */
#endif
#ifndef T_GPOS
# define T_GPOS 27 /* ns_t_gpos */
#endif
#ifndef T_AAAA
# define T_AAAA 28 /* ns_t_aaaa */
#endif
#ifndef T_LOC
# define T_LOC 29 /* ns_t_loc */
#endif
#ifndef T_NXT
# define T_NXT 30 /* ns_t_nxt */
#endif
#ifndef T_EID
# define T_EID 31 /* ns_t_eid */
#endif
#ifndef T_NIMLOC
# define T_NIMLOC 32 /* ns_t_nimloc */
#endif
#ifndef T_SRV
# define T_SRV 33 /* ns_t_srv */
#endif
#ifndef T_ATMA
# define T_ATMA 34 /* ns_t_atma */
#endif
#ifndef T_NAPTR
# define T_NAPTR 35 /* ns_t_naptr */
#endif
#ifndef T_KX
# define T_KX 36 /* ns_t_kx */
#endif
#ifndef T_CERT
# define T_CERT 37 /* ns_t_cert */
#endif
#ifndef T_A6
# define T_A6 38 /* ns_t_a6 */
#endif
#ifndef T_DNAME
# define T_DNAME 39 /* ns_t_dname */
#endif
#ifndef T_SINK
# define T_SINK 40 /* ns_t_sink */
#endif
#ifndef T_OPT
# define T_OPT 41 /* ns_t_opt */
#endif
#ifndef T_APL
# define T_APL 42 /* ns_t_apl */
#endif
#ifndef T_DS
# define T_DS 43 /* ns_t_ds */
#endif
#ifndef T_SSHFP
# define T_SSHFP 44 /* ns_t_sshfp */
#endif
#ifndef T_RRSIG
# define T_RRSIG 46 /* ns_t_rrsig */
#endif
#ifndef T_NSEC
# define T_NSEC 47 /* ns_t_nsec */
#endif
#ifndef T_DNSKEY
# define T_DNSKEY 48 /* ns_t_dnskey */
#endif
#ifndef T_TKEY
# define T_TKEY 249 /* ns_t_tkey */
#endif
#ifndef T_TSIG
# define T_TSIG 250 /* ns_t_tsig */
#endif
#ifndef T_IXFR
# define T_IXFR 251 /* ns_t_ixfr */
#endif
#ifndef T_AXFR
# define T_AXFR 252 /* ns_t_axfr */
#endif
#ifndef T_MAILB
# define T_MAILB 253 /* ns_t_mailb */
#endif
#ifndef T_MAILA
# define T_MAILA 254 /* ns_t_maila */
#endif
#ifndef T_ANY
# define T_ANY 255 /* ns_t_any */
#endif
#ifndef T_ZXFR
# define T_ZXFR 256 /* ns_t_zxfr */
#endif
#ifndef T_CAA
# define T_CAA 257 /* ns_t_caa */
#endif
#ifndef T_MAX
# define T_MAX 65536 /* ns_t_max */
#endif
#endif /* ARES_NAMESER_H */

@ -26,14 +26,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -27,14 +27,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -25,14 +25,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>
@ -43,10 +37,6 @@
#include "ares_data.h"
#include "ares_private.h"
#ifndef T_CAA
# define T_CAA 257 /* Certification Authority Authorization */
#endif
int
ares_parse_caa_reply (const unsigned char *abuf, int alen,
struct ares_caa_reply **caa_out)

@ -26,14 +26,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"

@ -26,25 +26,14 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"
#include "ares_data.h"
#include "ares_private.h"
/* AIX portability check */
#ifndef T_NAPTR
#define T_NAPTR 35 /* naming authority pointer */
#endif
int
ares_parse_naptr_reply (const unsigned char *abuf, int alen,
struct ares_naptr_reply **naptr_out)

@ -29,14 +29,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"

@ -22,14 +22,8 @@
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -26,14 +26,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"
@ -62,7 +56,7 @@ ares_parse_soa_reply(const unsigned char *abuf, int alen,
return ARES_EBADRESP;
if (ancount == 0)
return ARES_EBADRESP;
aptr = abuf + HFIXEDSZ;
/* query name */
@ -164,9 +158,9 @@ ares_parse_soa_reply(const unsigned char *abuf, int alen,
return ARES_SUCCESS;
}
aptr += rr_len;
ares_free(rr_name);
if (aptr > abuf + alen)
goto failed_stat;
}

@ -26,25 +26,14 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"
#include "ares_data.h"
#include "ares_private.h"
/* AIX portability check */
#ifndef T_SRV
# define T_SRV 33 /* server selection */
#endif
int
ares_parse_srv_reply (const unsigned char *abuf, int alen,
struct ares_srv_reply **srv_out)

@ -26,14 +26,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -32,14 +32,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "nameser.h"
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>

@ -19,14 +19,8 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"

@ -19,14 +19,8 @@
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_dns.h"

@ -24,14 +24,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_ipv6.h"

@ -23,14 +23,8 @@
#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#include "ares.h"
#include "ares_ipv6.h"

@ -1,218 +0,0 @@
#ifndef ARES_NAMESER_H
#define ARES_NAMESER_H
/* header file provided by liren@vivisimo.com */
#ifndef HAVE_ARPA_NAMESER_H
#define NS_PACKETSZ 512 /* maximum packet size */
#define NS_MAXDNAME 256 /* maximum domain name */
#define NS_MAXCDNAME 255 /* maximum compressed domain name */
#define NS_MAXLABEL 63
#define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */
#define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */
#define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
#define NS_INT16SZ 2
#define NS_INADDRSZ 4
#define NS_IN6ADDRSZ 16
#define NS_CMPRSFLGS 0xc0 /* Flag bits indicating name compression. */
#define NS_DEFAULTPORT 53 /* For both TCP and UDP. */
typedef enum __ns_class {
ns_c_invalid = 0, /* Cookie. */
ns_c_in = 1, /* Internet. */
ns_c_2 = 2, /* unallocated/unsupported. */
ns_c_chaos = 3, /* MIT Chaos-net. */
ns_c_hs = 4, /* MIT Hesiod. */
/* Query class values which do not appear in resource records */
ns_c_none = 254, /* for prereq. sections in update requests */
ns_c_any = 255, /* Wildcard match. */
ns_c_max = 65536
} ns_class;
typedef enum __ns_type {
ns_t_invalid = 0, /* Cookie. */
ns_t_a = 1, /* Host address. */
ns_t_ns = 2, /* Authoritative server. */
ns_t_md = 3, /* Mail destination. */
ns_t_mf = 4, /* Mail forwarder. */
ns_t_cname = 5, /* Canonical name. */
ns_t_soa = 6, /* Start of authority zone. */
ns_t_mb = 7, /* Mailbox domain name. */
ns_t_mg = 8, /* Mail group member. */
ns_t_mr = 9, /* Mail rename name. */
ns_t_null = 10, /* Null resource record. */
ns_t_wks = 11, /* Well known service. */
ns_t_ptr = 12, /* Domain name pointer. */
ns_t_hinfo = 13, /* Host information. */
ns_t_minfo = 14, /* Mailbox information. */
ns_t_mx = 15, /* Mail routing information. */
ns_t_txt = 16, /* Text strings. */
ns_t_rp = 17, /* Responsible person. */
ns_t_afsdb = 18, /* AFS cell database. */
ns_t_x25 = 19, /* X_25 calling address. */
ns_t_isdn = 20, /* ISDN calling address. */
ns_t_rt = 21, /* Router. */
ns_t_nsap = 22, /* NSAP address. */
ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */
ns_t_sig = 24, /* Security signature. */
ns_t_key = 25, /* Security key. */
ns_t_px = 26, /* X.400 mail mapping. */
ns_t_gpos = 27, /* Geographical position (withdrawn). */
ns_t_aaaa = 28, /* Ip6 Address. */
ns_t_loc = 29, /* Location Information. */
ns_t_nxt = 30, /* Next domain (security). */
ns_t_eid = 31, /* Endpoint identifier. */
ns_t_nimloc = 32, /* Nimrod Locator. */
ns_t_srv = 33, /* Server Selection. */
ns_t_atma = 34, /* ATM Address */
ns_t_naptr = 35, /* Naming Authority PoinTeR */
ns_t_kx = 36, /* Key Exchange */
ns_t_cert = 37, /* Certification record */
ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */
ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */
ns_t_sink = 40, /* Kitchen sink (experimentatl) */
ns_t_opt = 41, /* EDNS0 option (meta-RR) */
ns_t_apl = 42, /* Address prefix list (RFC3123) */
ns_t_ds = 43, /* Delegation Signer (RFC4034) */
ns_t_sshfp = 44, /* SSH Key Fingerprint (RFC4255) */
ns_t_rrsig = 46, /* Resource Record Signature (RFC4034) */
ns_t_nsec = 47, /* Next Secure (RFC4034) */
ns_t_dnskey = 48, /* DNS Public Key (RFC4034) */
ns_t_tkey = 249, /* Transaction key */
ns_t_tsig = 250, /* Transaction signature. */
ns_t_ixfr = 251, /* Incremental zone transfer. */
ns_t_axfr = 252, /* Transfer zone of authority. */
ns_t_mailb = 253, /* Transfer mailbox records. */
ns_t_maila = 254, /* Transfer mail agent records. */
ns_t_any = 255, /* Wildcard match. */
ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
ns_t_caa = 257, /* Certification Authority Authorization. */
ns_t_max = 65536
} ns_type;
typedef enum __ns_opcode {
ns_o_query = 0, /* Standard query. */
ns_o_iquery = 1, /* Inverse query (deprecated/unsupported). */
ns_o_status = 2, /* Name server status query (unsupported). */
/* Opcode 3 is undefined/reserved. */
ns_o_notify = 4, /* Zone change notification. */
ns_o_update = 5, /* Zone update message. */
ns_o_max = 6
} ns_opcode;
typedef enum __ns_rcode {
ns_r_noerror = 0, /* No error occurred. */
ns_r_formerr = 1, /* Format error. */
ns_r_servfail = 2, /* Server failure. */
ns_r_nxdomain = 3, /* Name error. */
ns_r_notimpl = 4, /* Unimplemented. */
ns_r_refused = 5, /* Operation refused. */
/* these are for BIND_UPDATE */
ns_r_yxdomain = 6, /* Name exists */
ns_r_yxrrset = 7, /* RRset exists */
ns_r_nxrrset = 8, /* RRset does not exist */
ns_r_notauth = 9, /* Not authoritative for zone */
ns_r_notzone = 10, /* Zone of record different from zone section */
ns_r_max = 11,
/* The following are TSIG extended errors */
ns_r_badsig = 16,
ns_r_badkey = 17,
ns_r_badtime = 18
} ns_rcode;
#endif /* HAVE_ARPA_NAMESER_H */
#ifndef HAVE_ARPA_NAMESER_COMPAT_H
#define PACKETSZ NS_PACKETSZ
#define MAXDNAME NS_MAXDNAME
#define MAXCDNAME NS_MAXCDNAME
#define MAXLABEL NS_MAXLABEL
#define HFIXEDSZ NS_HFIXEDSZ
#define QFIXEDSZ NS_QFIXEDSZ
#define RRFIXEDSZ NS_RRFIXEDSZ
#define INDIR_MASK NS_CMPRSFLGS
#define NAMESERVER_PORT NS_DEFAULTPORT
#define QUERY ns_o_query
#define SERVFAIL ns_r_servfail
#define NOTIMP ns_r_notimpl
#define REFUSED ns_r_refused
#undef NOERROR /* it seems this is already defined in winerror.h */
#define NOERROR ns_r_noerror
#define FORMERR ns_r_formerr
#define NXDOMAIN ns_r_nxdomain
#define C_IN ns_c_in
#define C_CHAOS ns_c_chaos
#define C_HS ns_c_hs
#define C_NONE ns_c_none
#define C_ANY ns_c_any
#define T_A ns_t_a
#define T_NS ns_t_ns
#define T_MD ns_t_md
#define T_MF ns_t_mf
#define T_CNAME ns_t_cname
#define T_SOA ns_t_soa
#define T_MB ns_t_mb
#define T_MG ns_t_mg
#define T_MR ns_t_mr
#define T_NULL ns_t_null
#define T_WKS ns_t_wks
#define T_PTR ns_t_ptr
#define T_HINFO ns_t_hinfo
#define T_MINFO ns_t_minfo
#define T_MX ns_t_mx
#define T_TXT ns_t_txt
#define T_RP ns_t_rp
#define T_AFSDB ns_t_afsdb
#define T_X25 ns_t_x25
#define T_ISDN ns_t_isdn
#define T_RT ns_t_rt
#define T_NSAP ns_t_nsap
#define T_NSAP_PTR ns_t_nsap_ptr
#define T_SIG ns_t_sig
#define T_KEY ns_t_key
#define T_PX ns_t_px
#define T_GPOS ns_t_gpos
#define T_AAAA ns_t_aaaa
#define T_LOC ns_t_loc
#define T_NXT ns_t_nxt
#define T_EID ns_t_eid
#define T_NIMLOC ns_t_nimloc
#define T_SRV ns_t_srv
#define T_ATMA ns_t_atma
#define T_NAPTR ns_t_naptr
#define T_KX ns_t_kx
#define T_CERT ns_t_cert
#define T_A6 ns_t_a6
#define T_DNAME ns_t_dname
#define T_SINK ns_t_sink
#define T_OPT ns_t_opt
#define T_APL ns_t_apl
#define T_DS ns_t_ds
#define T_SSHFP ns_t_sshfp
#define T_RRSIG ns_t_rrsig
#define T_NSEC ns_t_nsec
#define T_DNSKEY ns_t_dnskey
#define T_TKEY ns_t_tkey
#define T_TSIG ns_t_tsig
#define T_IXFR ns_t_ixfr
#define T_AXFR ns_t_axfr
#define T_MAILB ns_t_mailb
#define T_MAILA ns_t_maila
#define T_CAA ns_t_caa
#define T_ANY ns_t_any
#endif /* HAVE_ARPA_NAMESER_COMPAT_H */
/* Android's bionic arpa/nameser_compat.h, nor glibc versions prior to 2.25 have T_OPT defined */
#ifndef T_OPT
# define T_OPT ns_t_opt
#endif
#endif /* ARES_NAMESER_H */

@ -25,14 +25,8 @@
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
# include <arpa/nameser.h>
#else
# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
# include <arpa/nameser_compat.h>
#endif
#include "ares_nameser.h"
#ifdef HAVE_STRINGS_H
# include <strings.h>
@ -62,30 +56,6 @@
#undef WIN32 /* Redefined in MingW headers */
#endif
#ifndef T_SRV
# define T_SRV 33 /* Server selection */
#endif
#ifndef T_NAPTR
# define T_NAPTR 35 /* Naming authority pointer */
#endif
#ifndef T_DS
# define T_DS 43 /* Delegation Signer (RFC4034) */
#endif
#ifndef T_SSHFP
# define T_SSHFP 44 /* SSH Key Fingerprint (RFC4255) */
#endif
#ifndef T_RRSIG
# define T_RRSIG 46 /* Resource Record Signature (RFC4034) */
#endif
#ifndef T_NSEC
# define T_NSEC 47 /* Next Secure (RFC4034) */
#endif
#ifndef T_DNSKEY
# define T_DNSKEY 48 /* DNS Public Key (RFC4034) */
#endif
#ifndef T_CAA
# define T_CAA 257 /* Certification Authority Authorization */
#endif
struct nv {
const char *name;
@ -335,7 +305,7 @@ int main(int argc, char **argv)
options.udp_port = (unsigned short)strtol(optarg, NULL, 0);
optmask |= ARES_OPT_UDP_PORT;
break;
case 'x':
use_ptr_helper++;
break;
@ -703,7 +673,7 @@ static const unsigned char *display_rr(const unsigned char *aptr,
p += len;
}
break;
case T_CAA:
p = aptr;

@ -2,13 +2,13 @@
#ifndef ARES_TEST_H
#define ARES_TEST_H
#include "dns-proto.h"
// Include ares internal file for DNS protocol constants
#include "nameser.h"
#include "ares_setup.h"
#include "ares.h"
#include "dns-proto.h"
// Include ares internal file for DNS protocol constants
#include "ares_nameser.h"
#include "gtest/gtest.h"
#include "gmock/gmock.h"

@ -1,9 +1,9 @@
#include "dns-proto.h"
// Include ares internal file for DNS protocol details
#include "ares_setup.h"
#include "ares.h"
#include "ares_dns.h"
#include "dns-proto.h"
#include <stdio.h>
#include <stdlib.h>
@ -83,62 +83,62 @@ std::string RcodeToString(int rcode) {
std::string RRTypeToString(int rrtype) {
switch (rrtype) {
case ns_t_a: return "A";
case ns_t_ns: return "NS";
case ns_t_md: return "MD";
case ns_t_mf: return "MF";
case ns_t_cname: return "CNAME";
case ns_t_soa: return "SOA";
case ns_t_mb: return "MB";
case ns_t_mg: return "MG";
case ns_t_mr: return "MR";
case ns_t_null: return "NULL";
case ns_t_wks: return "WKS";
case ns_t_ptr: return "PTR";
case ns_t_hinfo: return "HINFO";
case ns_t_minfo: return "MINFO";
case ns_t_mx: return "MX";
case ns_t_txt: return "TXT";
case ns_t_rp: return "RP";
case ns_t_afsdb: return "AFSDB";
case ns_t_x25: return "X25";
case ns_t_isdn: return "ISDN";
case ns_t_rt: return "RT";
case ns_t_nsap: return "NSAP";
case ns_t_nsap_ptr: return "NSAP_PTR";
case ns_t_sig: return "SIG";
case ns_t_key: return "KEY";
case ns_t_px: return "PX";
case ns_t_gpos: return "GPOS";
case ns_t_aaaa: return "AAAA";
case ns_t_loc: return "LOC";
case ns_t_nxt: return "NXT";
case ns_t_eid: return "EID";
case ns_t_nimloc: return "NIMLOC";
case ns_t_srv: return "SRV";
case ns_t_atma: return "ATMA";
case ns_t_naptr: return "NAPTR";
case ns_t_kx: return "KX";
case ns_t_cert: return "CERT";
case ns_t_a6: return "A6";
case ns_t_dname: return "DNAME";
case ns_t_sink: return "SINK";
case ns_t_opt: return "OPT";
case ns_t_apl: return "APL";
case ns_t_ds: return "DS";
case ns_t_sshfp: return "SSHFP";
case ns_t_rrsig: return "RRSIG";
case ns_t_nsec: return "NSEC";
case ns_t_dnskey: return "DNSKEY";
case ns_t_tkey: return "TKEY";
case ns_t_tsig: return "TSIG";
case ns_t_ixfr: return "IXFR";
case ns_t_axfr: return "AXFR";
case ns_t_mailb: return "MAILB";
case ns_t_maila: return "MAILA";
case ns_t_any: return "ANY";
case ns_t_zxfr: return "ZXFR";
case ns_t_max: return "MAX";
case T_A: return "A";
case T_NS: return "NS";
case T_MD: return "MD";
case T_MF: return "MF";
case T_CNAME: return "CNAME";
case T_SOA: return "SOA";
case T_MB: return "MB";
case T_MG: return "MG";
case T_MR: return "MR";
case T_NULL: return "NULL";
case T_WKS: return "WKS";
case T_PTR: return "PTR";
case T_HINFO: return "HINFO";
case T_MINFO: return "MINFO";
case T_MX: return "MX";
case T_TXT: return "TXT";
case T_RP: return "RP";
case T_AFSDB: return "AFSDB";
case T_X25: return "X25";
case T_ISDN: return "ISDN";
case T_RT: return "RT";
case T_NSAP: return "NSAP";
case T_NSAP_PTR: return "NSAP_PTR";
case T_SIG: return "SIG";
case T_KEY: return "KEY";
case T_PX: return "PX";
case T_GPOS: return "GPOS";
case T_AAAA: return "AAAA";
case T_LOC: return "LOC";
case T_NXT: return "NXT";
case T_EID: return "EID";
case T_NIMLOC: return "NIMLOC";
case T_SRV: return "SRV";
case T_ATMA: return "ATMA";
case T_NAPTR: return "NAPTR";
case T_KX: return "KX";
case T_CERT: return "CERT";
case T_A6: return "A6";
case T_DNAME: return "DNAME";
case T_SINK: return "SINK";
case T_OPT: return "OPT";
case T_APL: return "APL";
case T_DS: return "DS";
case T_SSHFP: return "SSHFP";
case T_RRSIG: return "RRSIG";
case T_NSEC: return "NSEC";
case T_DNSKEY: return "DNSKEY";
case T_TKEY: return "TKEY";
case T_TSIG: return "TSIG";
case T_IXFR: return "IXFR";
case T_AXFR: return "AXFR";
case T_MAILB: return "MAILB";
case T_MAILA: return "MAILA";
case T_ANY: return "ANY";
case T_ZXFR: return "ZXFR";
case T_MAX: return "MAX";
default: return "UNKNOWN";
}
}

@ -4,7 +4,7 @@
// Utilities for processing DNS packet contents
// Include ares internal file for DNS protocol constants
#include "nameser.h"
#include "ares_nameser.h"
#include <memory>
#include <string>

Loading…
Cancel
Save