prefix structure names to avoid ambiguity and possible collisions when

the API gets public.

ok deraadt@

8 files changed, 94 insertions, 94 deletions

diff --git a/lib/libc/asr/asr_debug.c b/lib/libc/asr/asr_debug.c
index 620d674f508..fff192edcea 100644
--- a/lib/libc/asr/asr_debug.c
+++ b/lib/libc/asr/asr_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_debug.c,v 1.14 2013/07/12 14:36:21 eric Exp $	*/
+/*	$OpenBSD: asr_debug.c,v 1.15 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -28,9 +28,9 @@
 
 static const char *rcodetostr(uint16_t);
 static const char *print_dname(const char *, char *, size_t);
-static const char *print_header(const struct header *, char *, size_t);
-static const char *print_query(const struct query *, char *, size_t);
-static const char *print_rr(const struct rr *, char *, size_t);
+static const char *print_header(const struct asr_dns_header *, char *, size_t);
+static const char *print_query(const struct asr_dns_query *, char *, size_t);
+static const char *print_rr(const struct asr_dns_rr *, char *, size_t);
 
 FILE *asr_debug = NULL;
 
@@ -58,7 +58,7 @@ print_dname(const char *_dname, char *buf, size_t max)
 }
 
 static const char *
-print_rr(const struct rr *rr, char *buf, size_t max)
+print_rr(const struct asr_dns_rr *rr, char *buf, size_t max)
 {
 	char	*res;
 	char	 tmp[256];
@@ -130,7 +130,7 @@ print_rr(const struct rr *rr, char *buf, size_t max)
 }
 
 static const char *
-print_query(const struct query *q, char *buf, size_t max)
+print_query(const struct asr_dns_query *q, char *buf, size_t max)
 {
 	char b[256];
 
@@ -142,7 +142,7 @@ print_query(const struct query *q, char *buf, size_t max)
 }
 
 static const char *
-print_header(const struct header *h, char *buf, size_t max)
+print_header(const struct asr_dns_header *h, char *buf, size_t max)
 {
 	snprintf(buf, max,
 	"id:0x%04x %s op:%i %s %s %s %s z:%i r:%s qd:%i an:%i ns:%i ar:%i",
@@ -163,12 +163,12 @@ print_header(const struct header *h, char *buf, size_t max)
 void
 asr_dump_packet(FILE *f, const void *data, size_t len)
 {
-	char		buf[1024];
-	struct unpack	p;
-	struct header	h;
-	struct query	q;
-	struct rr	rr;
-	int		i, an, ns, ar, n;
+	char			buf[1024];
+	struct asr_unpack	p;
+	struct asr_dns_header	h;
+	struct asr_dns_query	q;
+	struct asr_dns_rr	rr;
+	int			i, an, ns, ar, n;
 
 	if (f == NULL)
 		return;
diff --git a/lib/libc/asr/asr_private.h b/lib/libc/asr/asr_private.h
index 821f513fafc..c8cd3456f0c 100644
--- a/lib/libc/asr/asr_private.h
+++ b/lib/libc/asr/asr_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_private.h,v 1.23 2013/07/12 14:36:21 eric Exp $	*/
+/*	$OpenBSD: asr_private.h,v 1.24 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -34,21 +34,21 @@
 #define RCODE(v)	((v) & RCODE_MASK)
 
 
-struct pack {
+struct asr_pack {
 	char		*buf;
 	size_t		 len;
 	size_t		 offset;
 	const char	*err;
 };
 
-struct unpack {
+struct asr_unpack {
 	const char	*buf;
 	size_t		 len;
 	size_t		 offset;
 	const char	*err;
 };
 
-struct header {
+struct asr_dns_header {
 	uint16_t	id;
 	uint16_t	flags;
 	uint16_t	qdcount;
@@ -57,13 +57,13 @@ struct header {
 	uint16_t	arcount;
 };
 
-struct query {
+struct asr_dns_query {
 	char		q_dname[MAXDNAME];
 	uint16_t	q_type;
 	uint16_t	q_class;
 };
 
-struct rr {
+struct asr_dns_rr {
 	char		rr_dname[MAXDNAME];
 	uint16_t	rr_type;
 	uint16_t	rr_class;
@@ -299,14 +299,14 @@ enum asr_state {
 
 
 /* asr_utils.c */
-void	asr_pack_init(struct pack *, char *, size_t);
-int	asr_pack_header(struct pack *, const struct header *);
-int	asr_pack_query(struct pack *, uint16_t, uint16_t, const char *);
-void	asr_unpack_init(struct unpack *, const char *, size_t);
-int	asr_unpack_header(struct unpack *, struct header *);
-int	asr_unpack_query(struct unpack *, struct query *);
-int	asr_unpack_rr(struct unpack *, struct rr *);
-int	asr_sockaddr_from_str(struct sockaddr *, int, const char *);
+void asr_pack_init(struct asr_pack *, char *, size_t);
+int asr_pack_header(struct asr_pack *, const struct asr_dns_header *);
+int asr_pack_query(struct asr_pack *, uint16_t, uint16_t, const char *);
+void asr_unpack_init(struct asr_unpack *, const char *, size_t);
+int asr_unpack_header(struct asr_unpack *, struct asr_dns_header *);
+int asr_unpack_query(struct asr_unpack *, struct asr_dns_query *);
+int asr_unpack_rr(struct asr_unpack *, struct asr_dns_rr *);
+int asr_sockaddr_from_str(struct sockaddr *, int, const char *);
 ssize_t asr_dname_from_fqdn(const char *, char *, size_t);
 ssize_t asr_addr_as_fqdn(const char *, int, char *, size_t);
 
@@ -321,7 +321,7 @@ int asr_iter_db(struct async *);
 int asr_parse_namedb_line(FILE *, char **, int);
 char *asr_hostalias(struct asr_ctx *, const char *, char *, size_t);
 
-/* <*>_async.h */
+/* *_async.c */
 struct async *res_query_async_ctx(const char *, int, int, struct asr_ctx *);
 struct async *res_search_async_ctx(const char *, int, int, struct asr_ctx *);
 struct async *gethostbyaddr_async_ctx(const void *, socklen_t, int,
diff --git a/lib/libc/asr/asr_utils.c b/lib/libc/asr/asr_utils.c
index 8a784654498..7a9d15663f7 100644
--- a/lib/libc/asr/asr_utils.c
+++ b/lib/libc/asr/asr_utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asr_utils.c,v 1.10 2014/02/26 20:00:08 eric Exp $	*/
+/*	$OpenBSD: asr_utils.c,v 1.11 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2009-2012	Eric Faurot	<eric@faurot.net>
  *
@@ -37,16 +37,16 @@ static int dname_check_label(const char *, size_t);
 static ssize_t dname_expand(const unsigned char *, size_t, size_t, size_t *,
     char *, size_t);
 
-static int unpack_data(struct unpack *, void *, size_t);
-static int unpack_u16(struct unpack *, uint16_t *);
-static int unpack_u32(struct unpack *, uint32_t *);
-static int unpack_inaddr(struct unpack *, struct in_addr *);
-static int unpack_in6addr(struct unpack *, struct in6_addr *);
-static int unpack_dname(struct unpack *, char *, size_t);
+static int unpack_data(struct asr_unpack *, void *, size_t);
+static int unpack_u16(struct asr_unpack *, uint16_t *);
+static int unpack_u32(struct asr_unpack *, uint32_t *);
+static int unpack_inaddr(struct asr_unpack *, struct in_addr *);
+static int unpack_in6addr(struct asr_unpack *, struct in6_addr *);
+static int unpack_dname(struct asr_unpack *, char *, size_t);
 
-static int pack_data(struct pack *, const void *, size_t);
-static int pack_u16(struct pack *, uint16_t);
-static int pack_dname(struct pack *, const char *);
+static int pack_data(struct asr_pack *, const void *, size_t);
+static int pack_u16(struct asr_pack *, uint16_t);
+static int pack_dname(struct asr_pack *, const char *);
 
 static int
 dname_check_label(const char *s, size_t l)
@@ -161,7 +161,7 @@ dname_expand(const unsigned char *data, size_t len, size_t offset,
 }
 
 void
-asr_pack_init(struct pack *pack, char *buf, size_t len)
+asr_pack_init(struct asr_pack *pack, char *buf, size_t len)
 {
 	pack->buf = buf;
 	pack->len = len;
@@ -170,7 +170,7 @@ asr_pack_init(struct pack *pack, char *buf, size_t len)
 }
 
 void
-asr_unpack_init(struct unpack *unpack, const char *buf, size_t len)
+asr_unpack_init(struct asr_unpack *unpack, const char *buf, size_t len)
 {
 	unpack->buf = buf;
 	unpack->len = len;
@@ -179,7 +179,7 @@ asr_unpack_init(struct unpack *unpack, const char *buf, size_t len)
 }
 
 static int
-unpack_data(struct unpack *p, void *data, size_t len)
+unpack_data(struct asr_unpack *p, void *data, size_t len)
 {
 	if (p->err)
 		return (-1);
@@ -196,7 +196,7 @@ unpack_data(struct unpack *p, void *data, size_t len)
 }
 
 static int
-unpack_u16(struct unpack *p, uint16_t *u16)
+unpack_u16(struct asr_unpack *p, uint16_t *u16)
 {
 	if (unpack_data(p, u16, 2) == -1)
 		return (-1);
@@ -207,7 +207,7 @@ unpack_u16(struct unpack *p, uint16_t *u16)
 }
 
 static int
-unpack_u32(struct unpack *p, uint32_t *u32)
+unpack_u32(struct asr_unpack *p, uint32_t *u32)
 {
 	if (unpack_data(p, u32, 4) == -1)
 		return (-1);
@@ -218,19 +218,19 @@ unpack_u32(struct unpack *p, uint32_t *u32)
 }
 
 static int
-unpack_inaddr(struct unpack *p, struct in_addr *a)
+unpack_inaddr(struct asr_unpack *p, struct in_addr *a)
 {
 	return (unpack_data(p, a, 4));
 }
 
 static int
-unpack_in6addr(struct unpack *p, struct in6_addr *a6)
+unpack_in6addr(struct asr_unpack *p, struct in6_addr *a6)
 {
 	return (unpack_data(p, a6, 16));
 }
 
 static int
-unpack_dname(struct unpack *p, char *dst, size_t max)
+unpack_dname(struct asr_unpack *p, char *dst, size_t max)
 {
 	ssize_t e;
 
@@ -251,7 +251,7 @@ unpack_dname(struct unpack *p, char *dst, size_t max)
 }
 
 int
-asr_unpack_header(struct unpack *p, struct header *h)
+asr_unpack_header(struct asr_unpack *p, struct asr_dns_header *h)
 {
 	if (unpack_data(p, h, HFIXEDSZ) == -1)
 		return (-1);
@@ -266,7 +266,7 @@ asr_unpack_header(struct unpack *p, struct header *h)
 }
 
 int
-asr_unpack_query(struct unpack *p, struct query *q)
+asr_unpack_query(struct asr_unpack *p, struct asr_dns_query *q)
 {
 	unpack_dname(p, q->q_dname, sizeof(q->q_dname));
 	unpack_u16(p, &q->q_type);
@@ -276,7 +276,7 @@ asr_unpack_query(struct unpack *p, struct query *q)
 }
 
 int
-asr_unpack_rr(struct unpack *p, struct rr *rr)
+asr_unpack_rr(struct asr_unpack *p, struct asr_dns_rr *rr)
 {
 	uint16_t	rdlen;
 	size_t		save_offset;
@@ -355,7 +355,7 @@ asr_unpack_rr(struct unpack *p, struct rr *rr)
 }
 
 static int
-pack_data(struct pack *p, const void *data, size_t len)
+pack_data(struct asr_pack *p, const void *data, size_t len)
 {
 	if (p->err)
 		return (-1);
@@ -372,7 +372,7 @@ pack_data(struct pack *p, const void *data, size_t len)
 }
 
 static int
-pack_u16(struct pack *p, uint16_t v)
+pack_u16(struct asr_pack *p, uint16_t v)
 {
 	v = htons(v);
 
@@ -380,7 +380,7 @@ pack_u16(struct pack *p, uint16_t v)
 }
 
 static int
-pack_dname(struct pack *p, const char *dname)
+pack_dname(struct asr_pack *p, const char *dname)
 {
 	/* dname compression would be nice to have here.
 	 * need additionnal context.
@@ -389,9 +389,9 @@ pack_dname(struct pack *p, const char *dname)
 }
 
 int
-asr_pack_header(struct pack *p, const struct header *h)
+asr_pack_header(struct asr_pack *p, const struct asr_dns_header *h)
 {
-	struct header c;
+	struct asr_dns_header c;
 
 	c.id = h->id;
 	c.flags = htons(h->flags);
@@ -404,7 +404,7 @@ asr_pack_header(struct pack *p, const struct header *h)
 }
 
 int
-asr_pack_query(struct pack *p, uint16_t type, uint16_t class, const char *dname)
+asr_pack_query(struct asr_pack *p, uint16_t type, uint16_t class, const char *dname)
 {
 	pack_dname(p, dname);
 	pack_u16(p, type);
diff --git a/lib/libc/asr/getaddrinfo_async.c b/lib/libc/asr/getaddrinfo_async.c
index ac696a21e55..b730d8c87d5 100644
--- a/lib/libc/asr/getaddrinfo_async.c
+++ b/lib/libc/asr/getaddrinfo_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo_async.c,v 1.23 2014/03/03 08:37:37 eric Exp $	*/
+/*	$OpenBSD: getaddrinfo_async.c,v 1.24 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -745,11 +745,11 @@ addrinfo_from_file(struct async *as, int family, FILE *f)
 static int
 addrinfo_from_pkt(struct async *as, char *pkt, size_t pktlen)
 {
-	struct unpack	 p;
-	struct header	 h;
-	struct query	 q;
-	struct rr	 rr;
-	int		 i;
+	struct asr_unpack	 p;
+	struct asr_dns_header	 h;
+	struct asr_dns_query	 q;
+	struct asr_dns_rr	 rr;
+	int			 i;
 	union {
 		struct sockaddr		sa;
 		struct sockaddr_in	sain;
diff --git a/lib/libc/asr/gethostnamadr_async.c b/lib/libc/asr/gethostnamadr_async.c
index 40b75f33e66..dd41ccb73e8 100644
--- a/lib/libc/asr/gethostnamadr_async.c
+++ b/lib/libc/asr/gethostnamadr_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gethostnamadr_async.c,v 1.25 2014/02/26 20:00:08 eric Exp $	*/
+/*	$OpenBSD: gethostnamadr_async.c,v 1.26 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -467,12 +467,12 @@ fail:
 static struct hostent_ext *
 hostent_from_packet(int reqtype, int family, char *pkt, size_t pktlen)
 {
-	struct hostent_ext *h;
-	struct unpack	 p;
-	struct header	 hdr;
-	struct query	 q;
-	struct rr	 rr;
-	char		 dname[MAXDNAME];
+	struct hostent_ext	*h;
+	struct asr_unpack	 p;
+	struct asr_dns_header	 hdr;
+	struct asr_dns_query	 q;
+	struct asr_dns_rr	 rr;
+	char			 dname[MAXDNAME];
 
 	if ((h = hostent_alloc(family)) == NULL)
 		return (NULL);
diff --git a/lib/libc/asr/getnetnamadr_async.c b/lib/libc/asr/getnetnamadr_async.c
index 1a2378d76f7..af46c5ba89e 100644
--- a/lib/libc/asr/getnetnamadr_async.c
+++ b/lib/libc/asr/getnetnamadr_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getnetnamadr_async.c,v 1.11 2014/02/26 20:00:08 eric Exp $	*/
+/*	$OpenBSD: getnetnamadr_async.c,v 1.12 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -320,10 +320,10 @@ static struct netent_ext *
 netent_from_packet(int reqtype, char *pkt, size_t pktlen)
 {
 	struct netent_ext	*n;
-	struct unpack		 p;
-	struct header		 hdr;
-	struct query		 q;
-	struct rr		 rr;
+	struct asr_unpack	 p;
+	struct asr_dns_header	 hdr;
+	struct asr_dns_query	 q;
+	struct asr_dns_rr	 rr;
 
 	if ((n = netent_alloc(AF_INET)) == NULL)
 		return (NULL);
diff --git a/lib/libc/asr/res_mkquery.c b/lib/libc/asr/res_mkquery.c
index 8e9e2689129..9f2aa0de883 100644
--- a/lib/libc/asr/res_mkquery.c
+++ b/lib/libc/asr/res_mkquery.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_mkquery.c,v 1.6 2013/07/12 14:36:22 eric Exp $	*/
+/*	$OpenBSD: res_mkquery.c,v 1.7 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -32,11 +32,11 @@ res_mkquery(int op, const char *dname, int class, int type,
     const unsigned char *data, int datalen, const unsigned char *newrr,
     unsigned char *buf, int buflen)
 {
-	struct asr_ctx	*ac;
-	struct pack	 p;
-	struct header	 h;
-	char		 fqdn[MAXDNAME];
-	char		 dn[MAXDNAME];
+	struct asr_ctx		*ac;
+	struct asr_pack		 p;
+	struct asr_dns_header	 h;
+	char			 fqdn[MAXDNAME];
+	char			 dn[MAXDNAME];
 
 	/* we currently only support QUERY */
 	if (op != QUERY || data)
diff --git a/lib/libc/asr/res_send_async.c b/lib/libc/asr/res_send_async.c
index 07518170104..ddbae94bc03 100644
--- a/lib/libc/asr/res_send_async.c
+++ b/lib/libc/asr/res_send_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: res_send_async.c,v 1.19 2013/07/12 14:36:22 eric Exp $	*/
+/*	$OpenBSD: res_send_async.c,v 1.20 2014/03/14 11:07:33 eric Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -51,11 +51,11 @@ static int iter_ns(struct async *);
 struct async *
 res_send_async(const unsigned char *buf, int buflen, struct asr *asr)
 {
-	struct asr_ctx  *ac;
-	struct async	*as;
-	struct unpack	 p;
-	struct header	 h;
-	struct query	 q;
+	struct asr_ctx		*ac;
+	struct async		*as;
+	struct asr_unpack	 p;
+	struct asr_dns_header	 h;
+	struct asr_dns_query	 q;
 
 	DPRINT_PACKET("asr: res_send_async()", buf, buflen);
 
@@ -346,10 +346,10 @@ static int
 setup_query(struct async *as, const char *name, const char *dom,
 	int class, int type)
 {
-	struct pack	 p;
-	struct header	 h;
-	char		 fqdn[MAXDNAME];
-	char		 dname[MAXDNAME];
+	struct asr_pack		p;
+	struct asr_dns_header	h;
+	char			fqdn[MAXDNAME];
+	char			dname[MAXDNAME];
 
 	if (as->as.dns.flags & ASYNC_EXTOBUF) {
 		errno = EINVAL;
@@ -672,11 +672,11 @@ ensure_ibuf(struct async *as, size_t n)
 static int
 validate_packet(struct async *as)
 {
-	struct unpack	 p;
-	struct header	 h;
-	struct query	 q;
-	struct rr	 rr;
-	int		 r;
+	struct asr_unpack	 p;
+	struct asr_dns_header	 h;
+	struct asr_dns_query	 q;
+	struct asr_dns_rr	 rr;
+	int			 r;
 
 	asr_unpack_init(&p, as->as.dns.ibuf, as->as.dns.ibuflen);