Part of bind-4.9.3-rel.. This is for my convenience and reference.

This import to the vendor branch changes no files...

1 files changed, 78 insertions, 59 deletions

diff --git a/lib/libc/net/res_mkquery.c b/lib/libc/net/res_mkquery.c
index a284562..76786db 100644
--- a/lib/libc/net/res_mkquery.c
+++ b/lib/libc/net/res_mkquery.c
@@ -1,7 +1,9 @@
-/*-
+/*
+ * ++Copyright++ 1985, 1993
+ * -
  * Copyright (c) 1985, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
+ *    The Regents of the University of California.  All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -12,12 +14,12 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
+ * 	This product includes software developed by the University of
+ * 	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- *
+ * 
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -53,36 +55,53 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: res_mkquery.c,v 4.9.1.2 1993/05/17 10:00:01 vixie Exp $";
+static char rcsid[] = "$Id: res_mkquery.c,v 8.3 1995/06/29 09:26:28 vixie Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>
+
 #include <stdio.h>
-#include <string.h>
+#include <netdb.h>
+#include <resolv.h>
+#if defined(BSD) && (BSD >= 199103)
+# include <string.h>
+#else
+# include "../conf/portability.h"
+#endif
+
+#if defined(USE_OPTIONS_H)
+# include <../conf/options.h>
+#endif
 
 /*
  * Form all types of queries.
  * Returns the size of the result or -1.
  */
+int
 res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 	int op;			/* opcode of query */
-	const char *dname;		/* domain name */
+	const char *dname;	/* domain name */
 	int class, type;	/* class and type of query */
-	const char *data;		/* resource record data */
+	const u_char *data;	/* resource record data */
 	int datalen;		/* length of data */
-	const char *newrr_in;	/* new rr for modify or append */
-	char *buf;		/* buffer to put query */
+	const u_char *newrr_in;	/* new rr for modify or append */
+	u_char *buf;		/* buffer to put query */
 	int buflen;		/* size of buffer */
 {
 	register HEADER *hp;
-	register char *cp;
+	register u_char *cp;
 	register int n;
+#ifdef ALLOW_UPDATES
 	struct rrec *newrr = (struct rrec *) newrr_in;
-	char *dnptrs[10], **dpp, **lastdnptr;
+#endif
+	u_char *dnptrs[20], **dpp, **lastdnptr;
 
+	if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
+		h_errno = NETDB_INTERNAL;
+		return (-1);
+	}
 #ifdef DEBUG
 	if (_res.options & RES_DEBUG)
 		printf(";; res_mkquery(%d, %s, %d, %d)\n",
@@ -91,37 +110,36 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 	/*
 	 * Initialize header fields.
 	 */
-	if ((buf == NULL) || (buflen < sizeof(HEADER)))
-		return(-1);
-	bzero(buf, sizeof(HEADER));
+	if ((buf == NULL) || (buflen < HFIXEDSZ))
+		return (-1);
+	bzero(buf, HFIXEDSZ);
 	hp = (HEADER *) buf;
 	hp->id = htons(++_res.id);
 	hp->opcode = op;
-	hp->pr = (_res.options & RES_PRIMARY) != 0;
 	hp->rd = (_res.options & RES_RECURSE) != 0;
 	hp->rcode = NOERROR;
-	cp = buf + sizeof(HEADER);
-	buflen -= sizeof(HEADER);
+	cp = buf + HFIXEDSZ;
+	buflen -= HFIXEDSZ;
 	dpp = dnptrs;
 	*dpp++ = buf;
 	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof(dnptrs)/sizeof(dnptrs[0]);
+	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
 	/*
 	 * perform opcode specific processing
 	 */
 	switch (op) {
-	case QUERY:
+	case QUERY:	/*FALLTHROUGH*/
+	case NS_NOTIFY_OP:
 		if ((buflen -= QFIXEDSZ) < 0)
-			return(-1);
-		if ((n = dn_comp((u_char *)dname, (u_char *)cp, buflen,
-		    (u_char **)dnptrs, (u_char **)lastdnptr)) < 0)
+			return (-1);
+		if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
 			return (-1);
 		cp += n;
 		buflen -= n;
-		__putshort(type, (u_char *)cp);
-		cp += sizeof(u_int16_t);
-		__putshort(class, (u_char *)cp);
-		cp += sizeof(u_int16_t);
+		__putshort(type, cp);
+		cp += INT16SZ;
+		__putshort(class, cp);
+		cp += INT16SZ;
 		hp->qdcount = htons(1);
 		if (op == QUERY || data == NULL)
 			break;
@@ -129,19 +147,19 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 		 * Make an additional record for completion domain.
 		 */
 		buflen -= RRFIXEDSZ;
-		if ((n = dn_comp((u_char *)data, (u_char *)cp, buflen,
-		    (u_char **)dnptrs, (u_char **)lastdnptr)) < 0)
+		n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
+		if (n < 0)
 			return (-1);
 		cp += n;
 		buflen -= n;
-		__putshort(T_NULL, (u_char *)cp);
-		cp += sizeof(u_int16_t);
-		__putshort(class, (u_char *)cp);
-		cp += sizeof(u_int16_t);
-		__putlong(0, (u_char *)cp);
-		cp += sizeof(u_int32_t);
-		__putshort(0, (u_char *)cp);
-		cp += sizeof(u_int16_t);
+		__putshort(T_NULL, cp);
+		cp += INT16SZ;
+		__putshort(class, cp);
+		cp += INT16SZ;
+		__putlong(0, cp);
+		cp += INT32SZ;
+		__putshort(0, cp);
+		cp += INT16SZ;
 		hp->arcount = htons(1);
 		break;
 
@@ -152,14 +170,14 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 		if (buflen < 1 + RRFIXEDSZ + datalen)
 			return (-1);
 		*cp++ = '\0';	/* no domain name */
-		__putshort(type, (u_char *)cp);
-		cp += sizeof(u_int16_t);
-		__putshort(class, (u_char *)cp);
-		cp += sizeof(u_int16_t);
-		__putlong(0, (u_char *)cp);
-		cp += sizeof(u_int32_t);
-		__putshort(datalen, (u_char *)cp);
-		cp += sizeof(u_int16_t);
+		__putshort(type, cp);
+		cp += INT16SZ;
+		__putshort(class, cp);
+		cp += INT16SZ;
+		__putlong(0, cp);
+		cp += INT32SZ;
+		__putshort(datalen, cp);
+		cp += INT16SZ;
 		if (datalen) {
 			bcopy(data, cp, datalen);
 			cp += datalen;
@@ -187,13 +205,13 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 			return (-1);
 		cp += n;
 		__putshort(type, cp);
-                cp += sizeof(u_int16_t);
-                __putshort(class, cp);
-                cp += sizeof(u_int16_t);
+		cp += INT16SZ;
+		__putshort(class, cp);
+		cp += INT16SZ;
 		__putlong(0, cp);
-		cp += sizeof(u_int32_t);
+		cp += INT32SZ;
 		__putshort(datalen, cp);
-                cp += sizeof(u_int16_t);
+		cp += INT16SZ;
 		if (datalen) {
 			bcopy(data, cp, datalen);
 			cp += datalen;
@@ -210,21 +228,22 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
 			return (-1);
 		cp += n;
 		__putshort(newrr->r_type, cp);
-                cp += sizeof(u_int16_t);
-                __putshort(newrr->r_class, cp);
-                cp += sizeof(u_int16_t);
+		cp += INT16SZ;
+		__putshort(newrr->r_class, cp);
+		cp += INT16SZ;
 		__putlong(0, cp);
-		cp += sizeof(u_int32_t);
+		cp += INT32SZ;
 		__putshort(newrr->r_size, cp);
-                cp += sizeof(u_int16_t);
+		cp += INT16SZ;
 		if (newrr->r_size) {
 			bcopy(newrr->r_data, cp, newrr->r_size);
 			cp += newrr->r_size;
 		}
 		hp->ancount = htons(0);
 		break;
-
 #endif /* ALLOW_UPDATES */
+	default:
+		return (-1);
 	}
 	return (cp - buf);
 }