Consistency about byte vs character in string.texi

[thirdparty/glibc.git] / resolv / res_mkquery.c

diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index 5b705b0e8b33bc592a8288949a36d6a76f7a26da..1635e6a0351fb5e2ead565a8c9159331d901f038 100644 (file)
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -77,19 +77,19 @@ static const char rcsid[] = "$BINDId: res_mkquery.c,v 8.12 1999/10/13 16:39:40 v
 #include <resolv.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/time.h>
 
 /* Options.  Leave them on. */
 /* #define DEBUG */
 
 #ifdef _LIBC
 # include <hp-timing.h>
+# include <stdint.h>
 # if HP_TIMING_AVAIL
 #  define RANDOM_BITS(Var) { uint64_t v64; HP_TIMING_NOW (v64); Var = v64; }
 # endif
 #endif
 
-extern const char *_res_opcodes[];
-
 /*
  * Form all types of queries.
  * Returns the size of the result or -1.
@@ -105,9 +105,9 @@ res_nmkquery(res_state statp,
             u_char *buf,               /* buffer to put query */
             int buflen)                /* size of buffer */
 {
-       register HEADER *hp;
-       register u_char *cp;
-       register int n;
+       HEADER *hp;
+       u_char *cp;
+       int n;
        u_char *dnptrs[20], **dpp, **lastdnptr;
 
 #ifdef DEBUG
@@ -126,10 +126,6 @@ res_nmkquery(res_state statp,
           incremented by one after the initial randomization which
           still predictable if the application does multiple
           requests.  */
-#if 0
-       hp->id = htons(++statp->id);
-#else
-       hp->id = htons(statp->id);
        int randombits;
        do
          {
@@ -141,9 +137,9 @@ res_nmkquery(res_state statp,
            randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
 #endif
          }
-       while (randombits == 0);
+       while ((randombits & 0xffff) == 0);
        statp->id = (statp->id + randombits) & 0xffff;
-#endif
+       hp->id = statp->id;
        hp->opcode = op;
        hp->rd = (statp->options & RES_RECURSE) != 0;
        hp->rcode = NOERROR;
@@ -157,38 +153,41 @@ res_nmkquery(res_state statp,
         * perform opcode specific processing
         */
        switch (op) {
-       case QUERY:     /*FALLTHROUGH*/
        case NS_NOTIFY_OP:
+               if ((buflen -= QFIXEDSZ + (data == NULL ? 0 : RRFIXEDSZ)) < 0)
+                       return (-1);
+               goto compose;
+
+       case QUERY:
                if ((buflen -= QFIXEDSZ) < 0)
                        return (-1);
-               if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
+       compose:
+               n = ns_name_compress(dname, cp, buflen,
+                                    (const u_char **) dnptrs,
+                                    (const u_char **) lastdnptr);
+               if (n < 0)
                        return (-1);
                cp += n;
                buflen -= n;
-               __putshort(type, cp);
-               cp += INT16SZ;
-               __putshort(class, cp);
-               cp += INT16SZ;
+               NS_PUT16 (type, cp);
+               NS_PUT16 (class, cp);
                hp->qdcount = htons(1);
                if (op == QUERY || data == NULL)
                        break;
                /*
                 * Make an additional record for completion domain.
                 */
-               buflen -= RRFIXEDSZ;
-               n = dn_comp((char *)data, cp, buflen, dnptrs, lastdnptr);
-               if (n < 0)
+               n = ns_name_compress((char *)data, cp, buflen,
+                                    (const u_char **) dnptrs,
+                                    (const u_char **) lastdnptr);
+               if (__glibc_unlikely (n < 0))
                        return (-1);
                cp += n;
                buflen -= n;
-               __putshort(T_NULL, cp);
-               cp += INT16SZ;
-               __putshort(class, cp);
-               cp += INT16SZ;
-               __putlong(0, cp);
-               cp += INT32SZ;
-               __putshort(0, cp);
-               cp += INT16SZ;
+               NS_PUT16 (T_NULL, cp);
+               NS_PUT16 (class, cp);
+               NS_PUT32 (0, cp);
+               NS_PUT16 (0, cp);
                hp->arcount = htons(1);
                break;
 
@@ -196,17 +195,13 @@ res_nmkquery(res_state statp,
                /*
                 * Initialize answer section
                 */
-               if (buflen < 1 + RRFIXEDSZ + datalen)
+               if (__glibc_unlikely (buflen < 1 + RRFIXEDSZ + datalen))
                        return (-1);
                *cp++ = '\0';   /* no domain name */
-               __putshort(type, cp);
-               cp += INT16SZ;
-               __putshort(class, cp);
-               cp += INT16SZ;
-               __putlong(0, cp);
-               cp += INT32SZ;
-               __putshort(datalen, cp);
-               cp += INT16SZ;
+               NS_PUT16 (type, cp);
+               NS_PUT16 (class, cp);
+               NS_PUT32 (0, cp);
+               NS_PUT16 (datalen, cp);
                if (datalen) {
                        memcpy(cp, data, datalen);
                        cp += datalen;
@@ -219,3 +214,54 @@ res_nmkquery(res_state statp,
        }
        return (cp - buf);
 }
+libresolv_hidden_def (res_nmkquery)
+
+
+/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
+#ifndef T_OPT
+#define T_OPT   41
+#endif
+
+int
+__res_nopt(res_state statp,
+          int n0,                /* current offset in buffer */
+          u_char *buf,           /* buffer to put query */
+          int buflen,            /* size of buffer */
+          int anslen)            /* UDP answer buffer size */
+{
+       u_int16_t flags = 0;
+
+#ifdef DEBUG
+       if ((statp->options & RES_DEBUG) != 0U)
+               printf(";; res_nopt()\n");
+#endif
+
+       HEADER *hp = (HEADER *) buf;
+       u_char *cp = buf + n0;
+       u_char *ep = buf + buflen;
+
+       if ((ep - cp) < 1 + RRFIXEDSZ)
+               return -1;
+
+       *cp++ = 0;      /* "." */
+
+       NS_PUT16(T_OPT, cp);    /* TYPE */
+       NS_PUT16(MIN(anslen, 0xffff), cp);      /* CLASS = UDP payload size */
+       *cp++ = NOERROR;        /* extended RCODE */
+       *cp++ = 0;              /* EDNS version */
+
+       if (statp->options & RES_USE_DNSSEC) {
+#ifdef DEBUG
+               if (statp->options & RES_DEBUG)
+                       printf(";; res_opt()... ENDS0 DNSSEC\n");
+#endif
+               flags |= NS_OPT_DNSSEC_OK;
+       }
+
+       NS_PUT16(flags, cp);
+       NS_PUT16(0, cp);        /* RDLEN */
+       hp->arcount = htons(ntohs(hp->arcount) + 1);
+
+       return cp - buf;
+}
+libresolv_hidden_def (__res_nopt)