generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Sync up nameser with upstream(2014.03.05)"

Browse Source
This commit is contained in:
Calin Juravle 2014-03-07 11:45:58 +00:00 committed by Gerrit Code Review
commit d9ba757ef4
9 changed files with 869 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/Android.mk
View File

@ -514,7 +514,8 @@ LOCAL_CFLAGS := \
-DINET6 \ -DINET6 \
-I$(LOCAL_PATH)/dns/include \ -I$(LOCAL_PATH)/dns/include \
-I$(LOCAL_PATH)/private \ -I$(LOCAL_PATH)/private \
-I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include # for NetBSD private headers -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \
-include upstream-netbsd/netbsd-compat.h
LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_C_INCLUDES := $(libc_common_c_includes)

280
libc/dns/nameser/ns_name.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $ */ /* $NetBSD: ns_name.c,v 1.9 2012/03/13 21:13:39 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_name.c,v 1.3.2.4.4.2 2004/05/04 03:27:47 marka Exp"; static const char rcsid[] = "Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp";
#else #else
__RCSID("$NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $"); __RCSID("$NetBSD: ns_name.c,v 1.9 2012/03/13 21:13:39 christos Exp $");
#endif #endif
#endif #endif
@ -31,6 +31,7 @@ __RCSID("$NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $");
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <assert.h>
#include <errno.h> #include <errno.h>
#ifdef ANDROID_CHANGES #ifdef ANDROID_CHANGES
#include "resolv_private.h" #include "resolv_private.h"
@ -43,9 +44,9 @@ __RCSID("$NetBSD: ns_name.c,v 1.3 2004/11/07 02:19:49 christos Exp $");
#include <limits.h> #include <limits.h>
#ifdef SPRINTF_CHAR #ifdef SPRINTF_CHAR
# define SPRINTF(x) strlen(sprintf/**/x) # define SPRINTF(x) ((int)strlen(sprintf/**/x))
#else #else
# define SPRINTF(x) ((size_t)sprintf x) # define SPRINTF(x) (sprintf x)
#endif #endif
#define NS_TYPE_ELT 0x40 /* EDNS0 extended label type */ #define NS_TYPE_ELT 0x40 /* EDNS0 extended label type */
@ -91,10 +92,10 @@ static int decode_bitstring(const unsigned char **,
/* Public. */ /* Public. */
/* /*
* ns_name_ntop(src, dst, dstsiz)
* Convert an encoded domain name to printable ascii as per RFC1035. * Convert an encoded domain name to printable ascii as per RFC1035.
* return: * return:
* Number of bytes written to buffer, or -1 (with errno set) * Number of bytes written to buffer, or -1 (with errno set)
*
* notes: * notes:
* The root is returned as "." * The root is returned as "."
* All other domains are returned in non absolute form * All other domains are returned in non absolute form
@ -188,23 +189,42 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
return (-1); return (-1);
} }
*dn++ = '\0'; *dn++ = '\0';
return (dn - dst); _DIAGASSERT(__type_fit(int, dn - dst));
return (int)(dn - dst);
} }
/* /*
* ns_name_pton(src, dst, dstsiz) * Convert a ascii string into an encoded domain name as per RFC1035.
*
* return:
*
* -1 if it fails
* 1 if string was fully qualified
* 0 is string was not fully qualified
*
* notes:
* Enforces label and domain length limits.
*/
int
ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
return (ns_name_pton2(src, dst, dstsiz, NULL));
}
/*
* ns_name_pton2(src, dst, dstsiz, *dstlen)
* Convert a ascii string into an encoded domain name as per RFC1035. * Convert a ascii string into an encoded domain name as per RFC1035.
* return: * return:
* -1 if it fails * -1 if it fails
* 1 if string was fully qualified * 1 if string was fully qualified
* 0 is string was not fully qualified * 0 is string was not fully qualified
* side effects:
* fills in *dstlen (if non-NULL)
* notes: * notes:
* Enforces label and domain length limits. * Enforces label and domain length limits.
*/ */
int int
ns_name_pton(const char *src, u_char *dst, size_t dstsiz) ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
{
u_char *label, *bp, *eom; u_char *label, *bp, *eom;
int c, n, escaped, e = 0; int c, n, escaped, e = 0;
char *cp; char *cp;
@ -238,19 +258,19 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
continue; continue;
} }
else if ((cp = strchr(digits, c)) != NULL) { else if ((cp = strchr(digits, c)) != NULL) {
n = (cp - digits) * 100; n = (int)(cp - digits) * 100;
if ((c = *src++) == 0 || if ((c = *src++) == 0 ||
(cp = strchr(digits, c)) == NULL) { (cp = strchr(digits, c)) == NULL) {
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
n += (cp - digits) * 10; n += (int)(cp - digits) * 10;
if ((c = *src++) == 0 || if ((c = *src++) == 0 ||
(cp = strchr(digits, c)) == NULL) { (cp = strchr(digits, c)) == NULL) {
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
n += (cp - digits); n += (int)(cp - digits);
if (n > 255) { if (n > 255) {
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
@ -262,7 +282,7 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
escaped = 1; escaped = 1;
continue; continue;
} else if (c == '.') { } else if (c == '.') {
c = (bp - label - 1); c = (int)(bp - label - 1);
if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
@ -285,6 +305,8 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
if (dstlen != NULL)
*dstlen = (bp - dst);
return (1); return (1);
} }
if (c == 0 || *src == '.') { if (c == 0 || *src == '.') {
@ -300,7 +322,7 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
} }
*bp++ = (u_char)c; *bp++ = (u_char)c;
} }
c = (bp - label - 1); c = (int)(bp - label - 1);
if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */ if ((c & NS_CMPRSFLGS) != 0) { /* Label too big. */
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
@ -322,14 +344,17 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
if (dstlen != NULL)
*dstlen = (bp - dst);
return (0); return (0);
} }
/* /*
* ns_name_ntol(src, dst, dstsiz)
* Convert a network strings labels into all lowercase. * Convert a network strings labels into all lowercase.
*
* return: * return:
* Number of bytes written to buffer, or -1 (with errno set) * Number of bytes written to buffer, or -1 (with errno set)
*
* notes: * notes:
* Enforces label and domain length limits. * Enforces label and domain length limits.
*/ */
@ -368,25 +393,41 @@ ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
} }
for (; l > 0; l--) { for (; l > 0; l--) {
c = *cp++; c = *cp++;
if (isupper(c)) if (isascii(c) && isupper(c))
*dn++ = tolower(c); *dn++ = tolower(c);
else else
*dn++ = c; *dn++ = c;
} }
} }
*dn++ = '\0'; *dn++ = '\0';
return (dn - dst); _DIAGASSERT(__type_fit(int, dn - dst));
return (int)(dn - dst);
} }
/* /*
* ns_name_unpack(msg, eom, src, dst, dstsiz)
* Unpack a domain name from a message, source may be compressed. * Unpack a domain name from a message, source may be compressed.
*
* return: * return:
* -1 if it fails, or consumed octets if it succeeds. * -1 if it fails, or consumed octets if it succeeds.
*/ */
int int
ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src, ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
u_char *dst, size_t dstsiz) u_char *dst, size_t dstsiz)
{
return (ns_name_unpack2(msg, eom, src, dst, dstsiz, NULL));
}
/*
* ns_name_unpack2(msg, eom, src, dst, dstsiz, *dstlen)
* Unpack a domain name from a message, source may be compressed.
* return:
* -1 if it fails, or consumed octets if it succeeds.
* side effect:
* fills in *dstlen (if non-NULL).
*/
int
ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
u_char *dst, size_t dstsiz, size_t *dstlen)
{ {
const u_char *srcp, *dstlim; const u_char *srcp, *dstlim;
u_char *dstp; u_char *dstp;
@ -428,8 +469,10 @@ ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
if (len < 0) if (len < 0) {
len = srcp - src + 1; _DIAGASSERT(__type_fit(int, srcp - src + 1));
len = (int)(srcp - src + 1);
}
srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff)); srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
if (srcp < msg || srcp >= eom) { /* Out of range. */ if (srcp < msg || srcp >= eom) { /* Out of range. */
errno = EMSGSIZE; errno = EMSGSIZE;
@ -452,23 +495,29 @@ ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
return (-1); /* flag error */ return (-1); /* flag error */
} }
} }
*dstp = '\0'; *dstp++ = 0;
if (len < 0) if (dstlen != NULL)
len = srcp - src; *dstlen = dstp - dst;
return (len); if (len < 0) {
_DIAGASSERT(__type_fit(int, srcp - src));
len = (int)(srcp - src);
}
return len;
} }
/* /*
* ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
* Pack domain name 'domain' into 'comp_dn'. * Pack domain name 'domain' into 'comp_dn'.
*
* return: * return:
* Size of the compressed name, or -1. * Size of the compressed name, or -1.
*
* notes: * notes:
* 'dnptrs' is an array of pointers to previous compressed names. * 'dnptrs' is an array of pointers to previous compressed names.
* dnptrs[0] is a pointer to the beginning of the message. The array * dnptrs[0] is a pointer to the beginning of the message. The array
* ends with NULL. * ends with NULL.
* 'lastdnptr' is a pointer to the end of the array pointed to * 'lastdnptr' is a pointer to the end of the array pointed to
* by 'dnptrs'. * by 'dnptrs'.
*
* Side effects: * Side effects:
* The list of pointers in dnptrs is updated for labels inserted into * The list of pointers in dnptrs is updated for labels inserted into
* the message as we compress the name. If 'dnptr' is NULL, we don't * the message as we compress the name. If 'dnptr' is NULL, we don't
@ -491,7 +540,7 @@ ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
if (dnptrs != NULL) { if (dnptrs != NULL) {
if ((msg = *dnptrs++) != NULL) { if ((msg = *dnptrs++) != NULL) {
for (cpp = dnptrs; *cpp != NULL; cpp++) for (cpp = dnptrs; *cpp != NULL; cpp++)
; continue;
lpp = cpp; /* end of list to search */ lpp = cpp; /* end of list to search */
} }
} else } else
@ -533,7 +582,8 @@ ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
} }
*dstp++ = ((u_int32_t)l >> 8) | NS_CMPRSFLGS; *dstp++ = ((u_int32_t)l >> 8) | NS_CMPRSFLGS;
*dstp++ = l % 256; *dstp++ = l % 256;
return (dstp - dst); _DIAGASSERT(__type_fit(int, dstp - dst));
return (int)(dstp - dst);
} }
/* Not found, save it. */ /* Not found, save it. */
if (lastdnptr != NULL && cpp < lastdnptr - 1 && if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
@ -564,14 +614,16 @@ cleanup:
errno = EMSGSIZE; errno = EMSGSIZE;
return (-1); return (-1);
} }
return (dstp - dst); _DIAGASSERT(__type_fit(int, dstp - dst));
return (int)(dstp - dst);
} }
/* /*
* ns_name_uncompress(msg, eom, src, dst, dstsiz)
* Expand compressed domain name to presentation format. * Expand compressed domain name to presentation format.
*
* return: * return:
* Number of bytes read out of `src', or -1 (with errno set). * Number of bytes read out of `src', or -1 (with errno set).
*
* note: * note:
* Root domain returns as "." not "". * Root domain returns as "." not "".
*/ */
@ -590,10 +642,11 @@ ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
} }
/* /*
* ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
* Compress a domain name into wire format, using compression pointers. * Compress a domain name into wire format, using compression pointers.
*
* return: * return:
* Number of bytes consumed in `dst' or -1 (with errno set). * Number of bytes consumed in `dst' or -1 (with errno set).
*
* notes: * notes:
* 'dnptrs' is an array of pointers to previous compressed names. * 'dnptrs' is an array of pointers to previous compressed names.
* dnptrs[0] is a pointer to the beginning of the message. * dnptrs[0] is a pointer to the beginning of the message.
@ -632,8 +685,8 @@ ns_name_rollback(const u_char *src, const u_char **dnptrs,
} }
/* /*
* ns_name_skip(ptrptr, eom)
* Advance *ptrptr to skip over the compressed name it points at. * Advance *ptrptr to skip over the compressed name it points at.
*
* return: * return:
* 0 on success, -1 (with errno set) on failure. * 0 on success, -1 (with errno set) on failure.
*/ */
@ -675,12 +728,156 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom)
return (0); return (0);
} }
/* Find the number of octets an nname takes up, including the root label.
* (This is basically ns_name_skip() without compression-pointer support.)
* ((NOTE: can only return zero if passed-in namesiz argument is zero.))
*/
ssize_t
ns_name_length(ns_nname_ct nname, size_t namesiz) {
ns_nname_ct orig = nname;
u_int n;
while (namesiz-- > 0 && (n = *nname++) != 0) {
if ((n & NS_CMPRSFLGS) != 0) {
errno = EISDIR;
return (-1);
}
if (n > namesiz) {
errno = EMSGSIZE;
return (-1);
}
nname += n;
namesiz -= n;
}
return (nname - orig);
}
/* Compare two nname's for equality. Return -1 on error (setting errno).
*/
int
ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
ns_nname_ct ae = a + as, be = b + bs;
int ac, bc;
while (ac = *a, bc = *b, ac != 0 && bc != 0) {
if ((ac & NS_CMPRSFLGS) != 0 || (bc & NS_CMPRSFLGS) != 0) {
errno = EISDIR;
return (-1);
}
if (a + ac >= ae || b + bc >= be) {
errno = EMSGSIZE;
return (-1);
}
if (ac != bc || strncasecmp((const char *) ++a,
(const char *) ++b,
(size_t)ac) != 0)
return (0);
a += ac, b += bc;
}
return (ac == 0 && bc == 0);
}
/* Is domain "A" owned by (at or below) domain "B"?
*/
int
ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
/* If A is shorter, it cannot be owned by B. */
if (an < bn)
return (0);
/* If they are unequal before the length of the shorter, A cannot... */
while (bn > 0) {
if (a->len != b->len ||
strncasecmp((const char *) a->base,
(const char *) b->base, (size_t)a->len) != 0)
return (0);
a++, an--;
b++, bn--;
}
/* A might be longer or not, but either way, B owns it. */
return (1);
}
/* Build an array of <base,len> tuples from an nname, top-down order.
* Return the number of tuples (labels) thus discovered.
*/
int
ns_name_map(ns_nname_ct nname, size_t namelen, ns_namemap_t map, int mapsize) {
u_int n;
int l;
n = *nname++;
namelen--;
/* Root zone? */
if (n == 0) {
/* Extra data follows name? */
if (namelen > 0) {
errno = EMSGSIZE;
return (-1);
}
return (0);
}
/* Compression pointer? */
if ((n & NS_CMPRSFLGS) != 0) {
errno = EISDIR;
return (-1);
}
/* Label too long? */
if (n > namelen) {
errno = EMSGSIZE;
return (-1);
}
/* Recurse to get rest of name done first. */
l = ns_name_map(nname + n, namelen - n, map, mapsize);
if (l < 0)
return (-1);
/* Too many labels? */
if (l >= mapsize) {
errno = ENAMETOOLONG;
return (-1);
}
/* We're on our way back up-stack, store current map data. */
map[l].base = nname;
map[l].len = n;
return (l + 1);
}
/* Count the labels in a domain name. Root counts, so COM. has two. This
* is to make the result comparable to the result of ns_name_map().
*/
int
ns_name_labels(ns_nname_ct nname, size_t namesiz) {
int ret = 0;
u_int n;
while (namesiz-- > 0 && (n = *nname++) != 0) {
if ((n & NS_CMPRSFLGS) != 0) {
errno = EISDIR;
return (-1);
}
if (n > namesiz) {
errno = EMSGSIZE;
return (-1);
}
nname += n;
namesiz -= n;
ret++;
}
return (ret + 1);
}
/* Private. */ /* Private. */
/* /*
* special(ch)
* Thinking in noninternationalized USASCII (per the DNS spec), * Thinking in noninternationalized USASCII (per the DNS spec),
* is this characted special ("in need of quoting") ? * is this characted special ("in need of quoting") ?
*
* return: * return:
* boolean. * boolean.
*/ */
@ -703,9 +900,9 @@ special(int ch) {
} }
/* /*
* printable(ch)
* Thinking in noninternationalized USASCII (per the DNS spec), * Thinking in noninternationalized USASCII (per the DNS spec),
* is this character visible and not a space when printed ? * is this character visible and not a space when printed ?
*
* return: * return:
* boolean. * boolean.
*/ */
@ -726,10 +923,11 @@ mklower(int ch) {
} }
/* /*
* dn_find(domain, msg, dnptrs, lastdnptr)
* Search for the counted-label name in an array of compressed names. * Search for the counted-label name in an array of compressed names.
*
* return: * return:
* offset from msg if found, or -1. * offset from msg if found, or -1.
*
* notes: * notes:
* dnptrs is the pointer to the first name on the list, * dnptrs is the pointer to the first name on the list,
* not the pointer to the start of the message. * not the pointer to the start of the message.
@ -771,8 +969,11 @@ dn_find(const u_char *domain, const u_char *msg,
mklower(*cp++)) mklower(*cp++))
goto next; goto next;
/* Is next root for both ? */ /* Is next root for both ? */
if (*dn == '\0' && *cp == '\0') if (*dn == '\0' && *cp == '\0') {
return (sp - msg); _DIAGASSERT(__type_fit(int,
sp - msg));
return (int)(sp - msg);
}
if (*dn) if (*dn)
continue; continue;
goto next; goto next;
@ -803,7 +1004,7 @@ decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
if ((blen = (*cp & 0xff)) == 0) if ((blen = (*cp & 0xff)) == 0)
blen = 256; blen = 256;
plen = (blen + 3) / 4; plen = (blen + 3) / 4;
plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1); plen += (int)sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
if (dn + plen >= eom) if (dn + plen >= eom)
return(-1); return(-1);
@ -838,7 +1039,8 @@ decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
dn += i; dn += i;
*cpp = cp; *cpp = cp;
return(dn - beg); _DIAGASSERT(__type_fit(int, dn - beg));
return (int)(dn - beg);
} }
static int static int

22
libc/dns/nameser/ns_netint.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $ */ /* $NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_netint.c,v 1.1.206.1 2004/03/09 08:33:44 marka Exp"; static const char rcsid[] = "Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp";
#else #else
__RCSID("$NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $"); __RCSID("$NetBSD: ns_netint.c,v 1.7 2012/03/13 21:13:39 christos Exp $");
#endif #endif
#endif #endif
@ -32,28 +32,28 @@ __RCSID("$NetBSD: ns_netint.c,v 1.2 2004/05/20 20:19:00 christos Exp $");
/* Public. */ /* Public. */
u_int16_t uint16_t
ns_get16(const u_char *src) { ns_get16(const u_char *src) {
u_int dst; uint16_t dst;
NS_GET16(dst, src); NS_GET16(dst, src);
return (dst); return dst;
} }
u_int32_t uint32_t
ns_get32(const u_char *src) { ns_get32(const u_char *src) {
u_long dst; u_int32_t dst;
NS_GET32(dst, src); NS_GET32(dst, src);
return (dst); return dst;
} }
void void
ns_put16(u_int16_t src, u_char *dst) { ns_put16(uint16_t src, u_char *dst) {
NS_PUT16(src, dst); NS_PUT16(src, dst);
} }
void void
ns_put32(u_int32_t src, u_char *dst) { ns_put32(uint32_t src, u_char *dst) {
NS_PUT32(src, dst); NS_PUT32(src, dst);
} }

78
libc/dns/nameser/ns_parse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_parse.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ /* $NetBSD: ns_parse.c,v 1.9 2012/03/13 21:13:39 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_parse.c,v 1.3.2.1.4.1 2004/03/09 08:33:44 marka Exp"; static const char rcsid[] = "Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp";
#else #else
__RCSID("$NetBSD: ns_parse.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); __RCSID("$NetBSD: ns_parse.c,v 1.9 2012/03/13 21:13:39 christos Exp $");
#endif #endif
#endif #endif
@ -33,6 +33,7 @@ __RCSID("$NetBSD: ns_parse.c,v 1.2 2004/05/20 20:35:05 christos Exp $");
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <assert.h>
#include <errno.h> #include <errno.h>
#ifdef ANDROID_CHANGES #ifdef ANDROID_CHANGES
#include "resolv_private.h" #include "resolv_private.h"
@ -96,7 +97,8 @@ ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
} }
if (ptr > eom) if (ptr > eom)
RETERR(EMSGSIZE); RETERR(EMSGSIZE);
return (ptr - optr); _DIAGASSERT(__type_fit(int, ptr - optr));
return (int)(ptr - optr);
} }
int int
@ -104,7 +106,6 @@ ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
const u_char *eom = msg + msglen; const u_char *eom = msg + msglen;
int i; int i;
memset(handle, 0x5e, sizeof *handle);
handle->_msg = msg; handle->_msg = msg;
handle->_eom = eom; handle->_eom = eom;
if (msg + NS_INT16SZ > eom) if (msg + NS_INT16SZ > eom)
@ -139,9 +140,11 @@ ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
int int
ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
int b; int b;
int tmp;
/* Make section right. */ /* Make section right. */
if ((unsigned)section >= (unsigned)ns_s_max) tmp = section;
if (tmp < 0 || section >= ns_s_max)
RETERR(ENODEV); RETERR(ENODEV);
if (section != handle->_sect) if (section != handle->_sect)
setsection(handle, section); setsection(handle, section);
@ -194,6 +197,69 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
return (0); return (0);
} }
/*
* This is identical to the above but uses network-format (uncompressed) names.
*/
int
ns_parserr2(ns_msg *handle, ns_sect section, int rrnum, ns_rr2 *rr) {
int b;
int tmp;
/* Make section right. */
tmp = section;
if (tmp < 0 || section >= ns_s_max)
RETERR(ENODEV);
if (section != handle->_sect)
setsection(handle, section);
/* Make rrnum right. */
if (rrnum == -1)
rrnum = handle->_rrnum;
if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
RETERR(ENODEV);
if (rrnum < handle->_rrnum)
setsection(handle, section);
if (rrnum > handle->_rrnum) {
b = ns_skiprr(handle->_msg_ptr, handle->_eom, section,
rrnum - handle->_rrnum);
if (b < 0)
return (-1);
handle->_msg_ptr += b;
handle->_rrnum = rrnum;
}
/* Do the parse. */
b = ns_name_unpack2(handle->_msg, handle->_eom, handle->_msg_ptr,
rr->nname, NS_MAXNNAME, &rr->nnamel);
if (b < 0)
return (-1);
handle->_msg_ptr += b;
if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom)
RETERR(EMSGSIZE);
NS_GET16(rr->type, handle->_msg_ptr);
NS_GET16(rr->rr_class, handle->_msg_ptr);
if (section == ns_s_qd) {
rr->ttl = 0;
rr->rdlength = 0;
rr->rdata = NULL;
} else {
if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom)
RETERR(EMSGSIZE);
NS_GET32(rr->ttl, handle->_msg_ptr);
NS_GET16(rr->rdlength, handle->_msg_ptr);
if (handle->_msg_ptr + rr->rdlength > handle->_eom)
RETERR(EMSGSIZE);
rr->rdata = handle->_msg_ptr;
handle->_msg_ptr += rr->rdlength;
}
if (++handle->_rrnum > handle->_counts[(int)section])
setsection(handle, (ns_sect)((int)section + 1));
/* All done. */
return (0);
}
/* Private. */ /* Private. */
static void static void

410
libc/dns/nameser/ns_print.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_print.c,v 1.5 2004/11/07 02:19:49 christos Exp $ */ /* $NetBSD: ns_print.c,v 1.11 2012/03/13 21:13:39 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_print.c,v 1.3.2.1.4.5 2004/07/28 20:16:45 marka Exp"; static const char rcsid[] = "Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp";
#else #else
__RCSID("$NetBSD: ns_print.c,v 1.5 2004/11/07 02:19:49 christos Exp $"); __RCSID("$NetBSD: ns_print.c,v 1.11 2012/03/13 21:13:39 christos Exp $");
#endif #endif
#endif #endif
@ -37,20 +37,21 @@ __RCSID("$NetBSD: ns_print.c,v 1.5 2004/11/07 02:19:49 christos Exp $");
#include <isc/assertions.h> #include <isc/assertions.h>
#include <isc/dst.h> #include <isc/dst.h>
#include <assert.h>
#include <errno.h> #include <errno.h>
#ifdef ANDROID_CHANGES #ifdef ANDROID_CHANGES
#include "resolv_private.h" #include "resolv_private.h"
#else #else
#include <resolv.h> #include <resolv.h>
#endif #endif
#include <stddef.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <assert.h>
#ifdef SPRINTF_CHAR #ifdef SPRINTF_CHAR
# define SPRINTF(x) strlen(sprintf/**/x) # define SPRINTF(x) ((int)strlen(sprintf/**/x))
#else #else
# define SPRINTF(x) ((size_t)sprintf x) # define SPRINTF(x) (sprintf x)
#endif #endif
#ifndef MIN #ifndef MIN
@ -79,12 +80,13 @@ static int addtab(size_t len, size_t target, int spaced,
return (-1); \ return (-1); \
} while (/*CONSTCOND*/0) } while (/*CONSTCOND*/0)
static const char base32hex[] =
"0123456789ABCDEFGHIJKLMNOPQRSTUV=0123456789abcdefghijklmnopqrstuv";
/* Public. */ /* Public. */
/* /*
* int
* ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
* Convert an RR to presentation format. * Convert an RR to presentation format.
*
* return: * return:
* Number of characters written to buf, or -1 (check errno). * Number of characters written to buf, or -1 (check errno).
*/ */
@ -103,10 +105,8 @@ ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
} }
/* /*
* int
* ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
* name_ctx, origin, buf, buflen)
* Convert the fields of an RR into presentation format. * Convert the fields of an RR into presentation format.
*
* return: * return:
* Number of characters written to buf, or -1 (check errno). * Number of characters written to buf, or -1 (check errno).
*/ */
@ -131,7 +131,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) { if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) {
T(addstr("\t\t\t", (size_t)3, &buf, &buflen)); T(addstr("\t\t\t", (size_t)3, &buf, &buflen));
} else { } else {
len = prune_origin(name, origin); len = (int)prune_origin(name, origin);
if (*name == '\0') { if (*name == '\0') {
goto root; goto root;
} else if (len == 0) { } else if (len == 0) {
@ -166,7 +166,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
case ns_t_a: case ns_t_a:
if (rdlen != (size_t)NS_INADDRSZ) if (rdlen != (size_t)NS_INADDRSZ)
goto formerr; goto formerr;
(void) inet_ntop(AF_INET, rdata, buf, buflen); (void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen); addlen(strlen(buf), &buf, &buflen);
break; break;
@ -265,7 +265,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
case ns_t_mx: case ns_t_mx:
case ns_t_afsdb: case ns_t_afsdb:
case ns_t_rt: { case ns_t_rt:
case ns_t_kx: {
u_int t; u_int t;
if (rdlen < (size_t)NS_INT16SZ) if (rdlen < (size_t)NS_INT16SZ)
@ -313,6 +314,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
break; break;
case ns_t_txt: case ns_t_txt:
case ns_t_spf:
while (rdata < edata) { while (rdata < edata) {
T(len = charstr(rdata, edata, &buf, &buflen)); T(len = charstr(rdata, edata, &buf, &buflen));
if (len == 0) if (len == 0)
@ -334,7 +336,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
case ns_t_aaaa: case ns_t_aaaa:
if (rdlen != (size_t)NS_IN6ADDRSZ) if (rdlen != (size_t)NS_IN6ADDRSZ)
goto formerr; goto formerr;
(void) inet_ntop(AF_INET6, rdata, buf, buflen); (void) inet_ntop(AF_INET6, rdata, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen); addlen(strlen(buf), &buf, &buflen);
break; break;
@ -425,7 +427,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
goto formerr; goto formerr;
/* Address. */ /* Address. */
(void) inet_ntop(AF_INET, rdata, buf, buflen); (void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen); addlen(strlen(buf), &buf, &buflen);
rdata += NS_INADDRSZ; rdata += NS_INADDRSZ;
@ -459,7 +461,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
break; break;
} }
case ns_t_key: { case ns_t_key:
case ns_t_dnskey: {
char base64_key[NS_MD5RSA_MAX_BASE64]; char base64_key[NS_MD5RSA_MAX_BASE64];
u_int keyflags, protocol, algorithm, key_id; u_int keyflags, protocol, algorithm, key_id;
const char *leader; const char *leader;
@ -505,7 +508,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
break; break;
} }
case ns_t_sig: { case ns_t_sig:
case ns_t_rrsig: {
char base64_key[NS_MD5RSA_MAX_BASE64]; char base64_key[NS_MD5RSA_MAX_BASE64];
u_int typ, algorithm, labels, footprint; u_int typ, algorithm, labels, footprint;
const char *leader; const char *leader;
@ -566,7 +570,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
} }
case ns_t_nxt: { case ns_t_nxt: {
int n, c; ptrdiff_t n, c;
/* Next domain name. */ /* Next domain name. */
T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
@ -575,7 +579,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
n = edata - rdata; n = edata - rdata;
for (c = 0; c < n*8; c++) for (c = 0; c < n*8; c++)
if (NS_NXT_BIT_ISSET(c, rdata)) { if (NS_NXT_BIT_ISSET(c, rdata)) {
len = SPRINTF((tmp, " %s", p_type(c))); len = SPRINTF((tmp, " %s", p_type((int)c)));
T(addstr(tmp, (size_t)len, &buf, &buflen)); T(addstr(tmp, (size_t)len, &buf, &buflen));
} }
break; break;
@ -584,7 +588,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
case ns_t_cert: { case ns_t_cert: {
u_int c_type, key_tag, alg; u_int c_type, key_tag, alg;
int n; int n;
unsigned int siz; size_t siz;
char base64_cert[8192], tmp1[40]; char base64_cert[8192], tmp1[40];
const char *leader; const char *leader;
@ -690,7 +694,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
if (rdata + pbyte >= edata) goto formerr; if (rdata + pbyte >= edata) goto formerr;
memset(&a, 0, sizeof(a)); memset(&a, 0, sizeof(a));
memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte); memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte);
(void) inet_ntop(AF_INET6, &a, buf, buflen); (void) inet_ntop(AF_INET6, &a, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen); addlen(strlen(buf), &buf, &buflen);
rdata += sizeof(a) - pbyte; rdata += sizeof(a) - pbyte;
} }
@ -711,25 +715,368 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
break; break;
} }
case ns_t_ds:
case ns_t_dlv:
case ns_t_sshfp: {
u_int t;
if (type == ns_t_ds || type == ns_t_dlv) {
if (rdlen < 4U) goto formerr;
t = ns_get16(rdata);
rdata += NS_INT16SZ;
len = SPRINTF((tmp, "%u ", t));
T(addstr(tmp, (size_t)len, &buf, &buflen));
} else
if (rdlen < 2U) goto formerr;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
while (rdata < edata) {
len = SPRINTF((tmp, "%02X", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
break;
}
case ns_t_nsec3:
case ns_t_nsec3param: {
u_int t, w, l, j, k, c;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
t = ns_get16(rdata);
rdata += NS_INT16SZ;
len = SPRINTF((tmp, "%u ", t));
T(addstr(tmp, (size_t)len, &buf, &buflen));
t = *rdata++;
if (t == 0) {
T(addstr("-", 1, &buf, &buflen));
} else {
while (t-- > 0) {
len = SPRINTF((tmp, "%02X", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
}
if (type == ns_t_nsec3param)
break;
T(addstr(" ", 1, &buf, &buflen));
t = *rdata++;
while (t > 0) {
switch (t) {
case 1:
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)];
tmp[2] = tmp[3] = tmp[4] = '=';
tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 2:
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)];
tmp[4] = tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 3:
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)];
tmp[5] = tmp[6] = tmp[7] = '=';
break;
case 4:
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
(((uint32_t)rdata[3]>>7)&0x01)];
tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[((uint32_t)rdata[3]<<3)&0x18];
tmp[7] = '=';
break;
default:
tmp[0] = base32hex[(((uint32_t)rdata[0]>>3)&0x1f)];
tmp[1] = base32hex[(((uint32_t)rdata[0]<<2)&0x1c)|
(((uint32_t)rdata[1]>>6)&0x03)];
tmp[2] = base32hex[(((uint32_t)rdata[1]>>1)&0x1f)];
tmp[3] = base32hex[(((uint32_t)rdata[1]<<4)&0x10)|
(((uint32_t)rdata[2]>>4)&0x0f)];
tmp[4] = base32hex[(((uint32_t)rdata[2]<<1)&0x1e)|
(((uint32_t)rdata[3]>>7)&0x01)];
tmp[5] = base32hex[(((uint32_t)rdata[3]>>2)&0x1f)];
tmp[6] = base32hex[(((uint32_t)rdata[3]<<3)&0x18)|
(((uint32_t)rdata[4]>>5)&0x07)];
tmp[7] = base32hex[(rdata[4]&0x1f)];
break;
}
T(addstr(tmp, 8, &buf, &buflen));
if (t >= 5) {
rdata += 5;
t -= 5;
} else {
rdata += t;
t -= t;
}
}
while (rdata < edata) {
w = *rdata++;
l = *rdata++;
for (j = 0; j < l; j++) {
if (rdata[j] == 0)
continue;
for (k = 0; k < 8; k++) {
if ((rdata[j] & (0x80 >> k)) == 0)
continue;
c = w * 256 + j * 8 + k;
len = SPRINTF((tmp, " %s", p_type((ns_type)c)));
T(addstr(tmp, (size_t)len, &buf, &buflen));
}
}
rdata += l;
}
break;
}
case ns_t_nsec: {
u_int w, l, j, k, c;
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
while (rdata < edata) {
w = *rdata++;
l = *rdata++;
for (j = 0; j < l; j++) {
if (rdata[j] == 0)
continue;
for (k = 0; k < 8; k++) {
if ((rdata[j] & (0x80 >> k)) == 0)
continue;
c = w * 256 + j * 8 + k;
len = SPRINTF((tmp, " %s", p_type((ns_type)c)));
T(addstr(tmp, (size_t)len, &buf, &buflen));
}
}
rdata += l;
}
break;
}
case ns_t_dhcid: {
int n;
unsigned int siz;
char base64_dhcid[8192];
const char *leader;
siz = (int)(edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
if (siz > sizeof(base64_dhcid) * 3/4) {
const char *str = "record too long to print";
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = b64_ntop(rdata, (size_t)(edata-rdata),
base64_dhcid, siz);
if (len < 0)
goto formerr;
else if (len > 15) {
T(addstr(" (", 2, &buf, &buflen));
leader = "\n\t\t";
spaced = 0;
}
else
leader = " ";
for (n = 0; n < len; n += 48) {
T(addstr(leader, strlen(leader),
&buf, &buflen));
T(addstr(base64_dhcid + n,
(size_t)MIN(len - n, 48), &buf, &buflen));
}
if (len > 15)
T(addstr(" )", 2, &buf, &buflen));
}
break;
}
case ns_t_ipseckey: {
int n;
unsigned int siz;
char base64_key[8192];
const char *leader;
if (rdlen < 2)
goto formerr;
switch (rdata[1]) {
case 0:
case 3:
if (rdlen < 3)
goto formerr;
break;
case 1:
if (rdlen < 7)
goto formerr;
break;
case 2:
if (rdlen < 19)
goto formerr;
break;
default:
comment = "unknown IPSECKEY gateway type";
goto hexify;
}
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
len = SPRINTF((tmp, "%u ", *rdata));
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
switch (rdata[-2]) {
case 0:
T(addstr(".", 1, &buf, &buflen));
break;
case 1:
(void) inet_ntop(AF_INET, rdata, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen);
rdata += 4;
break;
case 2:
(void) inet_ntop(AF_INET6, rdata, buf, (socklen_t)buflen);
addlen(strlen(buf), &buf, &buflen);
rdata += 16;
break;
case 3:
T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
break;
}
if (rdata >= edata)
break;
siz = (int)(edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
if (siz > sizeof(base64_key) * 3/4) {
const char *str = "record too long to print";
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = b64_ntop(rdata, (size_t)(edata-rdata),
base64_key, siz);
if (len < 0)
goto formerr;
else if (len > 15) {
T(addstr(" (", 2, &buf, &buflen));
leader = "\n\t\t";
spaced = 0;
}
else
leader = " ";
for (n = 0; n < len; n += 48) {
T(addstr(leader, strlen(leader),
&buf, &buflen));
T(addstr(base64_key + n,
(size_t)MIN(len - n, 48), &buf, &buflen));
}
if (len > 15)
T(addstr(" )", 2, &buf, &buflen));
}
break;
}
case ns_t_hip: {
unsigned int i, hip_len, algorithm, key_len;
char base64_key[NS_MD5RSA_MAX_BASE64];
unsigned int siz;
const char *leader = "\n\t\t\t\t\t";
hip_len = *rdata++;
algorithm = *rdata++;
key_len = ns_get16(rdata);
rdata += NS_INT16SZ;
siz = key_len*4/3 + 4; /* "+4" accounts for trailing \0 */
if (siz > sizeof(base64_key) * 3/4) {
const char *str = "record too long to print";
T(addstr(str, strlen(str), &buf, &buflen));
} else {
len = sprintf(tmp, "( %u ", algorithm);
T(addstr(tmp, (size_t)len, &buf, &buflen));
for (i = 0; i < hip_len; i++) {
len = sprintf(tmp, "%02X", *rdata);
T(addstr(tmp, (size_t)len, &buf, &buflen));
rdata++;
}
T(addstr(leader, strlen(leader), &buf, &buflen));
len = b64_ntop(rdata, key_len, base64_key, siz);
if (len < 0)
goto formerr;
T(addstr(base64_key, (size_t)len, &buf, &buflen));
rdata += key_len;
while (rdata < edata) {
T(addstr(leader, strlen(leader), &buf, &buflen));
T(addname(msg, msglen, &rdata, origin,
&buf, &buflen));
}
T(addstr(" )", 2, &buf, &buflen));
}
break;
}
default: default:
comment = "unknown RR type"; comment = "unknown RR type";
goto hexify; goto hexify;
} }
return (buf - obuf); _DIAGASSERT(__type_fit(int, buf - obuf));
return (int)(buf - obuf);
formerr: formerr:
comment = "RR format error"; comment = "RR format error";
hexify: { hexify: {
int n, m; int n, m;
char *p; char *p;
len = SPRINTF((tmp, "\\# %tu%s\t; %s", edata - rdata, len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
rdlen != 0 ? " (" : "", comment)); rdlen != 0U ? " (" : "", comment));
T(addstr(tmp, (size_t)len, &buf, &buflen)); T(addstr(tmp, (size_t)len, &buf, &buflen));
while (rdata < edata) { while (rdata < edata) {
p = tmp; p = tmp;
p += SPRINTF((p, "\n\t")); p += SPRINTF((p, "\n\t"));
spaced = 0; spaced = 0;
n = MIN(16, edata - rdata); n = MIN(16, (int)(edata - rdata));
for (m = 0; m < n; m++) for (m = 0; m < n; m++)
p += SPRINTF((p, "%02x ", rdata[m])); p += SPRINTF((p, "%02x ", rdata[m]));
T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen)); T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen));
@ -746,7 +1093,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen)); T(addstr(tmp, (size_t)(p - tmp), &buf, &buflen));
rdata += n; rdata += n;
} }
return (buf - obuf); _DIAGASSERT(__type_fit(int, buf - obuf));
return (int)(buf - obuf);
} }
} }
@ -822,7 +1170,8 @@ charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
} }
if (addstr("\"", (size_t)1, buf, buflen) < 0) if (addstr("\"", (size_t)1, buf, buflen) < 0)
goto enospc; goto enospc;
return (rdata - odata); _DIAGASSERT(__type_fit(int, rdata - odata));
return (int)(rdata - odata);
enospc: enospc:
errno = ENOSPC; errno = ENOSPC;
*buf = save_buf; *buf = save_buf;
@ -866,7 +1215,8 @@ addname(const u_char *msg, size_t msglen,
*pp += n; *pp += n;
addlen(newlen, buf, buflen); addlen(newlen, buf, buflen);
**buf = '\0'; **buf = '\0';
return (newlen); _DIAGASSERT(__type_fit(int, newlen));
return (int)newlen;
enospc: enospc:
errno = ENOSPC; errno = ENOSPC;
*buf = save_buf; *buf = save_buf;
@ -897,7 +1247,7 @@ static int
addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) { addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
size_t save_buflen = *buflen; size_t save_buflen = *buflen;
char *save_buf = *buf; char *save_buf = *buf;
int t; ptrdiff_t t;
if (spaced || len >= target - 1) { if (spaced || len >= target - 1) {
T(addstr(" ", (size_t)2, buf, buflen)); T(addstr(" ", (size_t)2, buf, buflen));

41
libc/dns/nameser/ns_samedomain.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ /* $NetBSD: ns_samedomain.c,v 1.8 2012/11/22 20:22:31 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_samedomain.c,v 1.1.2.2.4.2 2004/03/16 12:34:17 marka Exp"; static const char rcsid[] = "Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp";
#else #else
__RCSID("$NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); __RCSID("$NetBSD: ns_samedomain.c,v 1.8 2012/11/22 20:22:31 christos Exp $");
#endif #endif
#endif #endif
@ -31,16 +31,17 @@ __RCSID("$NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $");
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#ifndef _LIBC #ifdef _LIBRESOLV
/* /*
* int
* ns_samedomain(a, b)
* Check whether a name belongs to a domain. * Check whether a name belongs to a domain.
*
* Inputs: * Inputs:
* a - the domain whose ancestory is being verified * a - the domain whose ancestory is being verified
* b - the potential ancestor we're checking against * b - the potential ancestor we're checking against
*
* Return: * Return:
* boolean - is a at or below b? * boolean - is a at or below b?
*
* Notes: * Notes:
* Trailing dots are first removed from name and domain. * Trailing dots are first removed from name and domain.
* Always compare complete subdomains, not only whether the * Always compare complete subdomains, not only whether the
@ -52,8 +53,8 @@ __RCSID("$NetBSD: ns_samedomain.c,v 1.2 2004/05/20 20:35:05 christos Exp $");
int int
ns_samedomain(const char *a, const char *b) { ns_samedomain(const char *a, const char *b) {
size_t la, lb; size_t la, lb, i;
int diff, i, escaped; int diff, escaped;
const char *cp; const char *cp;
la = strlen(a); la = strlen(a);
@ -63,8 +64,8 @@ ns_samedomain(const char *a, const char *b) {
if (la != 0U && a[la - 1] == '.') { if (la != 0U && a[la - 1] == '.') {
escaped = 0; escaped = 0;
/* Note this loop doesn't get executed if la==1. */ /* Note this loop doesn't get executed if la==1. */
for (i = la - 2; i >= 0; i--) for (i = la - 1; i > 0; i--)
if (a[i] == '\\') { if (a[i - 1] == '\\') {
if (escaped) if (escaped)
escaped = 0; escaped = 0;
else else
@ -79,8 +80,8 @@ ns_samedomain(const char *a, const char *b) {
if (lb != 0U && b[lb - 1] == '.') { if (lb != 0U && b[lb - 1] == '.') {
escaped = 0; escaped = 0;
/* note this loop doesn't get executed if lb==1 */ /* note this loop doesn't get executed if lb==1 */
for (i = lb - 2; i >= 0; i--) for (i = lb - 1; i > 0; i--)
if (b[i] == '\\') { if (b[i - 1] == '\\') {
if (escaped) if (escaped)
escaped = 0; escaped = 0;
else else
@ -105,7 +106,7 @@ ns_samedomain(const char *a, const char *b) {
/* Ok, we know la > lb. */ /* Ok, we know la > lb. */
diff = la - lb; diff = (int)(la - lb);
/* /*
* If 'a' is only 1 character longer than 'b', then it can't be * If 'a' is only 1 character longer than 'b', then it can't be
@ -128,8 +129,8 @@ ns_samedomain(const char *a, const char *b) {
* and thus not a really a label separator. * and thus not a really a label separator.
*/ */
escaped = 0; escaped = 0;
for (i = diff - 2; i >= 0; i--) for (i = diff - 1; i > 0; i--)
if (a[i] == '\\') { if (a[i - 1] == '\\') {
if (escaped) if (escaped)
escaped = 0; escaped = 0;
else else
@ -145,8 +146,6 @@ ns_samedomain(const char *a, const char *b) {
} }
/* /*
* int
* ns_subdomain(a, b)
* is "a" a subdomain of "b"? * is "a" a subdomain of "b"?
*/ */
int int
@ -155,10 +154,10 @@ ns_subdomain(const char *a, const char *b) {
} }
#endif #endif
#ifdef _LIBC
/* /*
* int
* ns_makecanon(src, dst, dstsize)
* make a canonical copy of domain name "src" * make a canonical copy of domain name "src"
*
* notes: * notes:
* foo -> foo. * foo -> foo.
* foo. -> foo. * foo. -> foo.
@ -188,9 +187,8 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) {
} }
/* /*
* int
* ns_samename(a, b)
* determine whether domain name "a" is the same as domain name "b" * determine whether domain name "a" is the same as domain name "b"
*
* return: * return:
* -1 on error * -1 on error
* 0 if names differ * 0 if names differ
@ -209,3 +207,4 @@ ns_samename(const char *a, const char *b) {
else else
return (0); return (0);
} }
#endif

23
libc/dns/nameser/ns_ttl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_ttl.c,v 1.2 2004/05/20 20:35:05 christos Exp $ */ /* $NetBSD: ns_ttl.c,v 1.8 2012/03/13 21:13:39 christos Exp $ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -20,9 +20,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#ifdef notdef #ifdef notdef
static const char rcsid[] = "Id: ns_ttl.c,v 1.1.206.1 2004/03/09 08:33:45 marka Exp"; static const char rcsid[] = "Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp";
#else #else
__RCSID("$NetBSD: ns_ttl.c,v 1.2 2004/05/20 20:35:05 christos Exp $"); __RCSID("$NetBSD: ns_ttl.c,v 1.8 2012/03/13 21:13:39 christos Exp $");
#endif #endif
#endif #endif
@ -30,6 +30,7 @@ __RCSID("$NetBSD: ns_ttl.c,v 1.2 2004/05/20 20:35:05 christos Exp $");
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
@ -57,11 +58,11 @@ ns_format_ttl(u_long src, char *dst, size_t dstlen) {
int secs, mins, hours, days, weeks, x; int secs, mins, hours, days, weeks, x;
char *p; char *p;
secs = src % 60; src /= 60; secs = (int)(src % 60); src /= 60;
mins = src % 60; src /= 60; mins = (int)(src % 60); src /= 60;
hours = src % 24; src /= 24; hours = (int)(src % 24); src /= 24;
days = src % 7; src /= 7; days = (int)(src % 7); src /= 7;
weeks = src; src = 0; weeks = (int)src; src = 0;
x = 0; x = 0;
if (weeks) { if (weeks) {
@ -93,7 +94,8 @@ ns_format_ttl(u_long src, char *dst, size_t dstlen) {
*p = tolower(ch); *p = tolower(ch);
} }
return (dst - odst); _DIAGASSERT(__type_fit(int, dst - odst));
return (int)(dst - odst);
} }
#ifndef _LIBC #ifndef _LIBC
@ -137,7 +139,8 @@ ns_parse_ttl(const char *src, u_long *dst) {
goto einval; goto einval;
else else
ttl += tmp; ttl += tmp;
} } else if (!dirty)
goto einval;
*dst = ttl; *dst = ttl;
return (0); return (0);

158
libc/include/arpa/nameser.h
View File

@ -1,4 +1,21 @@
/* $NetBSD: nameser.h,v 1.19 2005/12/26 19:01:47 perry Exp $ */ /* $NetBSD: nameser.h,v 1.25 2009/04/12 17:07:34 christos Exp $ */
/*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC")
* Portions Copyright (C) 1996-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* /*
* Copyright (c) 1983, 1989, 1993 * Copyright (c) 1983, 1989, 1993
@ -30,24 +47,7 @@
*/ */
/* /*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Id: nameser.h,v 1.16 2009/03/03 01:52:48 each Exp
* Copyright (c) 1996-1999 by Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* Id: nameser.h,v 1.2.2.4.4.1 2004/03/09 08:33:30 marka Exp
*/ */
#ifndef _ARPA_NAMESER_H_ #ifndef _ARPA_NAMESER_H_
@ -66,16 +66,19 @@
* contains a new enough lib/nameser/ to support the feature you need. * contains a new enough lib/nameser/ to support the feature you need.
*/ */
#define __NAMESER 19991006 /* New interface version stamp. */ #define __NAMESER 20090302 /*%< New interface version stamp. */
/* /*
* Define constants based on RFC 883, RFC 1034, RFC 1035 * Define constants based on RFC0883, RFC1034, RFC 1035
*/ */
#define NS_PACKETSZ 512 /* default UDP packet size */ #define NS_PACKETSZ 512 /* default UDP packet size */
#define NS_MAXDNAME 1025 /* maximum domain name */ #define NS_MAXDNAME 1025 /* maximum domain name (presentation format)*/
#define NS_MAXMSG 65535 /* maximum message size */ #define NS_MAXMSG 65535 /* maximum message size */
#define NS_MAXCDNAME 255 /* maximum compressed domain name */ #define NS_MAXCDNAME 255 /* maximum compressed domain name */
#define NS_MAXLABEL 63 /* maximum length of domain label */ #define NS_MAXLABEL 63 /* maximum length of domain label */
#define NS_MAXLABELS 128 /* theoretical max #/labels per domain name */
#define NS_MAXNNAME 256 /* maximum uncompressed (binary) domain name*/
#define NS_MAXPADDR (sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
#define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */ #define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */
#define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */ #define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */
#define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */ #define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
@ -102,6 +105,18 @@ typedef enum __ns_sect {
ns_s_max = 4 ns_s_max = 4
} ns_sect; } ns_sect;
/*
* Network name (compressed or not) type. Equivilent to a pointer when used
* in a function prototype. Can be const'd.
*/
typedef u_char ns_nname[NS_MAXNNAME];
typedef const u_char *ns_nname_ct;
typedef u_char *ns_nname_t;
struct ns_namemap { ns_nname_ct base; int len; };
typedef struct ns_namemap *ns_namemap_t;
typedef const struct ns_namemap *ns_namemap_ct;
/* /*
* This is a message handle. It is caller allocated and has no dynamic data. * This is a message handle. It is caller allocated and has no dynamic data.
* This structure is intended to be opaque to all but ns_parse.c, thus the * This structure is intended to be opaque to all but ns_parse.c, thus the
@ -115,6 +130,16 @@ typedef struct __ns_msg {
int _rrnum; int _rrnum;
const u_char *_msg_ptr; const u_char *_msg_ptr;
} ns_msg; } ns_msg;
/*
* This is a newmsg handle, used when constructing new messages with
* ns_newmsg_init, et al.
*/
struct ns_newmsg {
ns_msg msg;
const u_char *dnptrs[25];
const u_char **lastdnptr;
};
typedef struct ns_newmsg ns_newmsg;
/* Private data structure - do not use from outside library. */ /* Private data structure - do not use from outside library. */
struct _ns_flagdata { int mask, shift; }; struct _ns_flagdata { int mask, shift; };
@ -140,8 +165,22 @@ typedef struct __ns_rr {
const u_char * rdata; const u_char * rdata;
} ns_rr; } ns_rr;
/*
* Same thing, but using uncompressed network binary names, and real C types.
*/
typedef struct __ns_rr2 {
ns_nname nname;
size_t nnamel;
int type;
int rr_class;
u_int ttl;
int rdlength;
const u_char * rdata;
} ns_rr2;
/* Accessor macros - this is part of the public interface. */ /* Accessor macros - this is part of the public interface. */
#define ns_rr_name(rr) (((rr).name[0] != '\0') ? (rr).name : ".") #define ns_rr_name(rr) (((rr).name[0] != '\0') ? (rr).name : ".")
#define ns_rr_nname(rr) ((const ns_nname_t)(rr).nname)
#define ns_rr_nnamel(rr) ((rr).nnamel + 0)
#define ns_rr_type(rr) ((ns_type)((rr).type + 0)) #define ns_rr_type(rr) ((ns_type)((rr).type + 0))
#define ns_rr_class(rr) ((ns_class)((rr).rr_class + 0)) #define ns_rr_class(rr) ((ns_class)((rr).rr_class + 0))
#define ns_rr_ttl(rr) ((u_long)(rr).ttl + 0) #define ns_rr_ttl(rr) ((u_long)(rr).ttl + 0)
@ -274,7 +313,7 @@ typedef enum __ns_type {
ns_t_key = 25, /* Security key. */ ns_t_key = 25, /* Security key. */
ns_t_px = 26, /* X.400 mail mapping. */ ns_t_px = 26, /* X.400 mail mapping. */
ns_t_gpos = 27, /* Geographical position (withdrawn). */ ns_t_gpos = 27, /* Geographical position (withdrawn). */
ns_t_aaaa = 28, /* Ip6 Address. */ ns_t_aaaa = 28, /* IPv6 Address. */
ns_t_loc = 29, /* Location Information. */ ns_t_loc = 29, /* Location Information. */
ns_t_nxt = 30, /* Next domain (security). */ ns_t_nxt = 30, /* Next domain (security). */
ns_t_eid = 31, /* Endpoint identifier. */ ns_t_eid = 31, /* Endpoint identifier. */
@ -284,11 +323,22 @@ typedef enum __ns_type {
ns_t_naptr = 35, /* Naming Authority PoinTeR */ ns_t_naptr = 35, /* Naming Authority PoinTeR */
ns_t_kx = 36, /* Key Exchange */ ns_t_kx = 36, /* Key Exchange */
ns_t_cert = 37, /* Certification record */ ns_t_cert = 37, /* Certification record */
ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ ns_t_a6 = 38, /* IPv6 address (experimental) */
ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ ns_t_dname = 39, /* Non-terminal DNAME */
ns_t_sink = 40, /* Kitchen sink (experimentatl) */ ns_t_sink = 40, /* Kitchen sink (experimentatl) */
ns_t_opt = 41, /* EDNS0 option (meta-RR) */ ns_t_opt = 41, /* EDNS0 option (meta-RR) */
ns_t_apl = 42, /* Address prefix list (RFC 3123) */ ns_t_apl = 42, /* Address prefix list (RFC 3123) */
ns_t_ds = 43, /* Delegation Signer */
ns_t_sshfp = 44, /* SSH Fingerprint */
ns_t_ipseckey = 45, /* IPSEC Key */
ns_t_rrsig = 46, /* RRset Signature */
ns_t_nsec = 47, /* Negative security */
ns_t_dnskey = 48, /* DNS Key */
ns_t_dhcid = 49, /* Dynamic host configuratin identifier */
ns_t_nsec3 = 50, /* Negative security type 3 */
ns_t_nsec3param = 51, /* Negative security type 3 parameters */
ns_t_hip = 55, /* Host Identity Protocol */
ns_t_spf = 99, /* Sender Policy Framework */
ns_t_tkey = 249, /* Transaction key */ ns_t_tkey = 249, /* Transaction key */
ns_t_tsig = 250, /* Transaction signature. */ ns_t_tsig = 250, /* Transaction signature. */
ns_t_ixfr = 251, /* Incremental zone transfer. */ ns_t_ixfr = 251, /* Incremental zone transfer. */
@ -297,6 +347,7 @@ typedef enum __ns_type {
ns_t_maila = 254, /* Transfer mail agent records. */ ns_t_maila = 254, /* Transfer mail agent records. */
ns_t_any = 255, /* Wildcard match. */ ns_t_any = 255, /* Wildcard match. */
ns_t_zxfr = 256, /* BIND-specific, nonstandard. */ ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
ns_t_dlv = 32769, /* DNSSEC look-aside validatation. */
ns_t_max = 65536 ns_t_max = 65536
} ns_type; } ns_type;
@ -423,9 +474,10 @@ typedef enum __ns_cert_types {
#define NS_NXT_MAX 127 #define NS_NXT_MAX 127
/* /*
* EDNS0 extended flags, host order. * EDNS0 extended flags and option codes, host order.
*/ */
#define NS_OPT_DNSSEC_OK 0x8000U #define NS_OPT_DNSSEC_OK 0x8000U
#define NS_OPT_NSID 3
/* /*
* Inline versions of get/put short/long. Pointer is advanced. * Inline versions of get/put short/long. Pointer is advanced.
@ -477,6 +529,7 @@ typedef enum __ns_cert_types {
#define ns_initparse __ns_initparse #define ns_initparse __ns_initparse
#define ns_skiprr __ns_skiprr #define ns_skiprr __ns_skiprr
#define ns_parserr __ns_parserr #define ns_parserr __ns_parserr
#define ns_parserr2 __ns_parserr2
#define ns_sprintrr __ns_sprintrr #define ns_sprintrr __ns_sprintrr
#define ns_sprintrrf __ns_sprintrrf #define ns_sprintrrf __ns_sprintrrf
#define ns_format_ttl __ns_format_ttl #define ns_format_ttl __ns_format_ttl
@ -485,12 +538,19 @@ typedef enum __ns_cert_types {
#define ns_name_ntol __ns_name_ntol #define ns_name_ntol __ns_name_ntol
#define ns_name_ntop __ns_name_ntop #define ns_name_ntop __ns_name_ntop
#define ns_name_pton __ns_name_pton #define ns_name_pton __ns_name_pton
#define ns_name_pton2 __ns_name_pton2
#define ns_name_unpack __ns_name_unpack #define ns_name_unpack __ns_name_unpack
#define ns_name_unpack2 __ns_name_unpack2
#define ns_name_pack __ns_name_pack #define ns_name_pack __ns_name_pack
#define ns_name_compress __ns_name_compress #define ns_name_compress __ns_name_compress
#define ns_name_uncompress __ns_name_uncompress #define ns_name_uncompress __ns_name_uncompress
#define ns_name_skip __ns_name_skip #define ns_name_skip __ns_name_skip
#define ns_name_rollback __ns_name_rollback #define ns_name_rollback __ns_name_rollback
#define ns_name_length __ns_name_length
#define ns_name_eq __ns_name_eq
#define ns_name_owned __ns_name_owned
#define ns_name_map __ns_name_map
#define ns_name_labels __ns_name_labels
#define ns_sign __ns_sign #define ns_sign __ns_sign
#define ns_sign2 __ns_sign2 #define ns_sign2 __ns_sign2
#define ns_sign_tcp __ns_sign_tcp #define ns_sign_tcp __ns_sign_tcp
@ -504,6 +564,16 @@ typedef enum __ns_cert_types {
#define ns_subdomain __ns_subdomain #define ns_subdomain __ns_subdomain
#define ns_makecanon __ns_makecanon #define ns_makecanon __ns_makecanon
#define ns_samename __ns_samename #define ns_samename __ns_samename
#define ns_newmsg_init __ns_newmsg_init
#define ns_newmsg_copy __ns_newmsg_copy
#define ns_newmsg_id __ns_newmsg_id
#define ns_newmsg_flag __ns_newmsg_flag
#define ns_newmsg_q __ns_newmsg_q
#define ns_newmsg_rr __ns_newmsg_rr
#define ns_newmsg_done __ns_newmsg_done
#define ns_rdata_unpack __ns_rdata_unpack
#define ns_rdata_equal __ns_rdata_equal
#define ns_rdata_refers __ns_rdata_refers
__BEGIN_DECLS __BEGIN_DECLS
int ns_msg_getflag(ns_msg, int); int ns_msg_getflag(ns_msg, int);
@ -514,6 +584,7 @@ void ns_put32(uint32_t, u_char *);
int ns_initparse(const u_char *, int, ns_msg *); int ns_initparse(const u_char *, int, ns_msg *);
int ns_skiprr(const u_char *, const u_char *, ns_sect, int); int ns_skiprr(const u_char *, const u_char *, ns_sect, int);
int ns_parserr(ns_msg *, ns_sect, int, ns_rr *); int ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
int ns_parserr2(ns_msg *, ns_sect, int, ns_rr2 *);
int ns_sprintrr(const ns_msg *, const ns_rr *, int ns_sprintrr(const ns_msg *, const ns_rr *,
const char *, const char *, char *, size_t); const char *, const char *, char *, size_t);
int ns_sprintrrf(const u_char *, size_t, const char *, int ns_sprintrrf(const u_char *, size_t, const char *,
@ -526,8 +597,12 @@ uint32_t ns_datetosecs(const char *cp, int *errp);
int ns_name_ntol(const u_char *, u_char *, size_t); int ns_name_ntol(const u_char *, u_char *, size_t);
int ns_name_ntop(const u_char *, char *, size_t); int ns_name_ntop(const u_char *, char *, size_t);
int ns_name_pton(const char *, u_char *, size_t); int ns_name_pton(const char *, u_char *, size_t);
int ns_name_pton2(const char *, u_char *, size_t, size_t *);
int ns_name_unpack(const u_char *, const u_char *, int ns_name_unpack(const u_char *, const u_char *,
const u_char *, u_char *, size_t); const u_char *, u_char *, size_t);
int ns_name_unpack2(const u_char *, const u_char *,
const u_char *, u_char *, size_t,
size_t *);
int ns_name_pack(const u_char *, u_char *, int, int ns_name_pack(const u_char *, u_char *, int,
const u_char **, const u_char **); const u_char **, const u_char **);
int ns_name_uncompress(const u_char *, const u_char *, int ns_name_uncompress(const u_char *, const u_char *,
@ -542,6 +617,11 @@ int ns_sign(u_char *, int *, int, int, void *,
int ns_sign2(u_char *, int *, int, int, void *, int ns_sign2(u_char *, int *, int, int, void *,
const u_char *, int, u_char *, int *, time_t, const u_char *, int, u_char *, int *, time_t,
u_char **, u_char **); u_char **, u_char **);
ssize_t ns_name_length(ns_nname_ct, size_t);
int ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
int ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
int ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
int ns_name_labels(ns_nname_ct, size_t);
int ns_sign_tcp(u_char *, int *, int, int, int ns_sign_tcp(u_char *, int *, int, int,
ns_tcp_tsig_state *, int); ns_tcp_tsig_state *, int);
int ns_sign_tcp2(u_char *, int *, int, int, int ns_sign_tcp2(u_char *, int *, int, int,
@ -560,17 +640,29 @@ int ns_samedomain(const char *, const char *);
int ns_subdomain(const char *, const char *); int ns_subdomain(const char *, const char *);
int ns_makecanon(const char *, char *, size_t); int ns_makecanon(const char *, char *, size_t);
int ns_samename(const char *, const char *); int ns_samename(const char *, const char *);
int ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *);
int ns_newmsg_copy(ns_newmsg *, ns_msg *);
void ns_newmsg_id(ns_newmsg *handle, uint16_t id);
void ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value);
int ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname,
ns_type qtype, ns_class qclass);
int ns_newmsg_rr(ns_newmsg *handle, ns_sect sect,
ns_nname_ct name, ns_type type,
ns_class rr_class, uint32_t ttl,
uint16_t rdlen, const u_char *rdata);
size_t ns_newmsg_done(ns_newmsg *handle);
ssize_t ns_rdata_unpack(const u_char *, const u_char *, ns_type,
const u_char *, size_t, u_char *, size_t);
int ns_rdata_equal(ns_type,
const u_char *, size_t,
const u_char *, size_t);
int ns_rdata_refers(ns_type,
const u_char *, size_t,
const u_char *);
__END_DECLS __END_DECLS
#ifdef BIND_4_COMPAT #ifdef BIND_4_COMPAT
#include <arpa/nameser_compat.h> #include <arpa/nameser_compat.h>
#endif #endif
#if 0
# include "private/libc_logging.h"
# define XLOG(...) __libc_format_log(ANDROID_LOG_DEBUG,"libc",__VA_ARGS__)
#else
#define XLOG(...) do {} while (0)
#endif
#endif /* !_ARPA_NAMESER_H_ */ #endif /* !_ARPA_NAMESER_H_ */

8
libc/include/arpa/nameser_compat.h
View File

@ -34,7 +34,7 @@
/* /*
* from nameser.h 8.1 (Berkeley) 6/2/93 * from nameser.h 8.1 (Berkeley) 6/2/93
* Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp * Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp
*/ */
#ifndef _ARPA_NAMESER_COMPAT_ #ifndef _ARPA_NAMESER_COMPAT_
@ -48,7 +48,7 @@
#if (BSD >= 199103) #if (BSD >= 199103)
# include <machine/endian.h> # include <machine/endian.h>
#else #else
#ifdef __linux #ifdef __linux__
# include <endian.h> # include <endian.h>
#else #else
#define LITTLE_ENDIAN 1234 /* least-significant byte first (vax, pc) */ #define LITTLE_ENDIAN 1234 /* least-significant byte first (vax, pc) */
@ -57,7 +57,9 @@
#if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \ #if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \ defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
defined(__alpha__) || defined(__alpha) || \ defined(__i386__) || defined(__i386) || defined(__amd64__) || \
defined(__x86_64__) || defined(MIPSEL) || defined(_MIPSEL) || \
defined(BIT_ZERO_ON_RIGHT) || defined(__alpha__) || defined(__alpha) || \
(defined(__Lynx__) && defined(__x86__)) (defined(__Lynx__) && defined(__x86__))
#define BYTE_ORDER LITTLE_ENDIAN #define BYTE_ORDER LITTLE_ENDIAN
#endif #endif