1 files changed, 127 insertions, 131 deletions

diff --git a/src/lib/libc/net/res_mkquery.c b/src/lib/libc/net/res_mkquery.c
index 25f025e147..5c6b273abe 100644
--- a/src/lib/libc/net/res_mkquery.c
+++ b/src/lib/libc/net/res_mkquery.c
@@ -1,9 +1,11 @@
-/*      $NetBSD: res_mkquery.c,v 1.5 1995/02/25 06:20:58 cgd Exp $      */
+/*      $OpenBSD: res_mkquery.c,v 1.17 2005/08/06 20:30:04 espie Exp $  */
 
-/*-
+/*
+ * ++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,14 +14,10 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. 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,101 +51,109 @@
  * --Copyright--
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-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 ";
-#else
-static char rcsid[] = "$NetBSD: res_mkquery.c,v 1.5 1995/02/25 06:20:58 cgd Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
+#include <sys/types.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
-#include <resolv.h>
+
 #include <stdio.h>
+#include <netdb.h>
+#include <resolv.h>
 #include <string.h>
 
+#include "thread_private.h"
+
 /*
  * Form all types of queries.
  * Returns the size of the result or -1.
  */
-res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
-        int op;                 /* opcode of query */
-        const char *dname;              /* domain name */
-        int class, type;        /* class and type of query */
-        const 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 */
-        int buflen;             /* size of buffer */
+/* ARGSUSED */
+int
+res_mkquery(int op,
+    const char *dname,          /* opcode of query */
+    int class,                  /* domain name */
+    int type,                   /* class and type of query */
+    const u_char *data,         /* resource record data */
+    int datalen,                /* length of data */
+    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 int n;
-        struct rrec *newrr = (struct rrec *) newrr_in;
-        char *dnptrs[10], **dpp, **lastdnptr;
+        struct __res_state *_resp = _THREAD_PRIVATE(_res, _res, &_res);
+        HEADER *hp;
+        u_char *cp, *ep;
+        int n;
+        u_char *dnptrs[20], **dpp, **lastdnptr;
 
+        if (_res_init(0) == -1) {
+                h_errno = NETDB_INTERNAL;
+                return (-1);
+        }
 #ifdef DEBUG
-        if (_res.options & RES_DEBUG)
+        if (_resp->options & RES_DEBUG)
                 printf(";; res_mkquery(%d, %s, %d, %d)\n",
                        op, dname, class, type);
 #endif
         /*
          * Initialize header fields.
+         *
+         * A special random number generator is used to create non predictable
+         * and non repeating ids over a long period. It also avoids reuse
+         * by switching between two distinct number cycles.
          */
-        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);
+        _resp->id = res_randomid();
+        hp->id = htons(_resp->id);
         hp->opcode = op;
-        hp->pr = (_res.options & RES_PRIMARY) != 0;
-        hp->rd = (_res.options & RES_RECURSE) != 0;
+        hp->rd = (_resp->options & RES_RECURSE) != 0;
         hp->rcode = NOERROR;
-        cp = buf + sizeof(HEADER);
-        buflen -= sizeof(HEADER);
+        cp = buf + HFIXEDSZ;
+        ep = buf + buflen;
         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:
-                if ((buflen -= QFIXEDSZ) < 0)
-                        return(-1);
-                if ((n = dn_comp((u_char *)dname, (u_char *)cp, buflen,
-                    (u_char **)dnptrs, (u_char **)lastdnptr)) < 0)
+        case QUERY:     /*FALLTHROUGH*/
+        case NS_NOTIFY_OP:
+                if (ep - cp < QFIXEDSZ)
+                        return (-1);
+                if ((n = dn_comp(dname, cp, ep - cp - QFIXEDSZ, 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;
                 /*
                  * 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)
+                if (ep - cp < RRFIXEDSZ)
+                        return (-1);
+                n = dn_comp((char *)data, cp, ep - cp - RRFIXEDSZ, 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;
 
@@ -155,82 +161,72 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
                 /*
                  * Initialize answer section
                  */
-                if (buflen < 1 + RRFIXEDSZ + datalen)
+                if (ep - cp < 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);
-                if (datalen) {
-                        bcopy(data, cp, datalen);
-                        cp += datalen;
-                }
-                hp->ancount = htons(1);
-                break;
-
-#ifdef ALLOW_UPDATES
-        /*
-         * For UPDATEM/UPDATEMA, do UPDATED/UPDATEDA followed by UPDATEA
-         * (Record to be modified is followed by its replacement in msg.)
-         */
-        case UPDATEM:
-        case UPDATEMA:
-
-        case UPDATED:
-                /*
-                 * The res code for UPDATED and UPDATEDA is the same; user
-                 * calls them differently: specifies data for UPDATED; server
-                 * ignores data if specified for UPDATEDA.
-                 */
-        case UPDATEDA:
-                buflen -= RRFIXEDSZ + datalen;
-                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-                        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;
                 }
-                if ( (op == UPDATED) || (op == UPDATEDA) ) {
-                        hp->ancount = htons(0);
-                        break;
-                }
-                /* Else UPDATEM/UPDATEMA, so drop into code for UPDATEA */
-
-        case UPDATEA:   /* Add new resource record */
-                buflen -= RRFIXEDSZ + datalen;
-                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
-                        return (-1);
-                cp += n;
-                __putshort(newrr->r_type, cp);
-                cp += sizeof(u_int16_t);
-                __putshort(newrr->r_class, cp);
-                cp += sizeof(u_int16_t);
-                __putlong(0, cp);
-                cp += sizeof(u_int32_t);
-                __putshort(newrr->r_size, cp);
-                cp += sizeof(u_int16_t);
-                if (newrr->r_size) {
-                        bcopy(newrr->r_data, cp, newrr->r_size);
-                        cp += newrr->r_size;
-                }
-                hp->ancount = htons(0);
+                hp->ancount = htons(1);
                 break;
 
-#endif /* ALLOW_UPDATES */
+        default:
+                return (-1);
         }
         return (cp - buf);
 }
+
+/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
+int
+res_opt(int n0,
+        u_char *buf,            /* buffer to put query */
+        int buflen,             /* size of buffer */
+        int anslen)             /* answer buffer length */
+{
+        struct __res_state *_resp = _THREAD_PRIVATE(_res, _res, &_res);
+        HEADER *hp;
+        u_char *cp, *ep;
+
+        hp = (HEADER *) buf;
+        cp = buf + n0;
+        ep = buf + buflen;
+
+        if (ep - cp < 1 + RRFIXEDSZ)
+                return -1;
+
+        *cp++ = 0;      /* "." */
+
+        __putshort(T_OPT, cp);  /* TYPE */
+        cp += INT16SZ;
+        if (anslen > 0xffff)
+                anslen = 0xffff;                /* limit to 16bit value */
+        __putshort(anslen & 0xffff, cp);        /* CLASS = UDP payload size */
+        cp += INT16SZ;
+        *cp++ = NOERROR;        /* extended RCODE */
+        *cp++ = 0;              /* EDNS version */
+        if (_resp->options & RES_USE_DNSSEC) {
+#ifdef DEBUG
+                if (_resp->options & RES_DEBUG)
+                        printf(";; res_opt()... ENDS0 DNSSEC OK\n");
+#endif /* DEBUG */
+                __putshort(DNS_MESSAGEEXTFLAG_DO, cp);  /* EDNS Z field */
+                cp += INT16SZ;
+        } else {
+                __putshort(0, cp);      /* EDNS Z field */
+                cp += INT16SZ;
+        }
+        __putshort(0, cp);      /* RDLEN */
+        cp += INT16SZ;
+        hp->arcount = htons(ntohs(hp->arcount) + 1);
+
+        return cp - buf;
+}