SCCS id got lost along the way

[unix-history] / usr / src / lib / libc / net / res_comp.c

diff --git a/usr/src/lib/libc/net/res_comp.c b/usr/src/lib/libc/net/res_comp.c
index 1084210..f1b2826 100644 (file)
--- a/usr/src/lib/libc/net/res_comp.c
+++ b/usr/src/lib/libc/net/res_comp.c
@@ -1,29 +1,42 @@
-#ifndef lint
-static char sccsid[] = "@(#)res_comp.c 4.1 (Berkeley) %G%";
-#endif
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */

 
 

-#include <sys/types.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)res_comp.c 6.22 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/param.h>
+#include <arpa/nameser.h>
+#include <netinet/in.h>
+#include <resolv.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <ctype.h>
-#include <nameser.h>

 
 

+static dn_find();

 
 /*
 
 /*

- * Expand compressed domain name format to full domain name.
+ * Expand compressed domain name 'comp_dn' to full domain name.
+ * 'msg' is a pointer to the begining of the message,
+ * 'eomorig' points to the first location after the message,
+ * 'exp_dn' is a pointer to a buffer of size 'length' for the result.

  * Return size of compressed name or -1 if there was an error.
  */
  * Return size of compressed name or -1 if there was an error.
  */

-dn_expand(msg, comp_dn, exp_dn, length)
-       char *msg, *comp_dn, *exp_dn;
+dn_expand(msg, eomorig, comp_dn, exp_dn, length)
+       const u_char *msg, *eomorig, *comp_dn;
+       u_char *exp_dn;

        int length;
 {
        int length;
 {

-       register char *cp, *dn;
+       register u_char *cp, *dn;

        register int n, c;
        register int n, c;

-       char *eom;
-       int len = 0;
+       u_char *eom;
+       int len = -1, checked = 0;

 
        dn = exp_dn;
 
        dn = exp_dn;

-       cp = comp_dn;
-       eom = exp_dn + length - 1;
+       cp = (u_char *)comp_dn;
+       eom = exp_dn + length;

        /*
         * fetch next label in domain name
         */
        /*
         * fetch next label in domain name
         */


@@ -33,21 +46,40 @@ dn_expand(msg, comp_dn, exp_dn, length)
                 */
                switch (n & INDIR_MASK) {
                case 0:
                 */
                switch (n & INDIR_MASK) {
                case 0:

-                       if (dn != exp_dn)
+                       if (dn != exp_dn) {
+                               if (dn >= eom)
+                                       return (-1);

                                *dn++ = '.';
                                *dn++ = '.';

+                       }

                        if (dn+n >= eom)
                                return (-1);
                        if (dn+n >= eom)
                                return (-1);

-                       while (--n >= 0)
-                               if (islower(c = *cp++))
-                                       *dn++ = toupper(c);
-                               else
-                                       *dn++ = c;
+                       checked += n + 1;
+                       while (--n >= 0) {
+                               if ((c = *cp++) == '.') {
+                                       if (dn + n + 2 >= eom)
+                                               return (-1);
+                                       *dn++ = '\\';
+                               }
+                               *dn++ = c;
+                               if (cp >= eomorig)      /* out of range */
+                                       return(-1);
+                       }

                        break;
 
                case INDIR_MASK:
                        break;
 
                case INDIR_MASK:

-                       if (len == 0)
+                       if (len < 0)

                                len = cp - comp_dn + 1;
                                len = cp - comp_dn + 1;

-                       cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
+                       cp = (u_char *)msg + (((n & 0x3f) << 8) | (*cp & 0xff));
+                       if (cp < msg || cp >= eomorig)  /* out of range */
+                               return(-1);
+                       checked += 2;
+                       /*
+                        * Check for loops in the compressed name;
+                        * if we've looked at the whole message,
+                        * there must be a loop.
+                        */
+                       if (checked >= eomorig - msg)
+                               return (-1);

                        break;
 
                default:
                        break;
 
                default:


@@ -55,29 +87,36 @@ dn_expand(msg, comp_dn, exp_dn, length)
                }
        }
        *dn = '\0';
                }
        }
        *dn = '\0';

-       if (len == 0)
+       if (len < 0)

                len = cp - comp_dn;
        return (len);
 }
 
 /*
                len = cp - comp_dn;
        return (len);
 }
 
 /*

- * Compress domain name. Return the size of the compressed name or -1.
- * Dnptrs is a list of pointers to previous compressed names. dnptrs[0]
+ * Compress domain name 'exp_dn' into 'comp_dn'.
+ * Return the size of the compressed name or -1.
+ * 'length' is the size of the array pointed to by 'comp_dn'.
+ * 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0]

  * is a pointer to the beginning of the message. The list ends with NULL.
  * is a pointer to the beginning of the message. The list ends with NULL.

+ * 'lastdnptr' is a pointer to the end of the arrary pointed to
+ * by 'dnptrs'. Side effect is to update the list of pointers for
+ * labels inserted into the message as we compress the name.
+ * If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
+ * is NULL, we don't update the list.

  */
 dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
  */
 dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)

-       char *exp_dn, *comp_dn;
+       const u_char *exp_dn;
+       u_char *comp_dn, **dnptrs, **lastdnptr;

        int length;
        int length;

-       char **dnptrs, **lastdnptr;

 {
 {

-       register char *cp, *dn;
+       register u_char *cp, *dn;

        register int c, l;
        register int c, l;

-       char **cpp, **lpp, *sp, *eob;
-       char *msg;
+       u_char **cpp, **lpp, *sp, *eob;
+       u_char *msg;

 
 

-       dn = exp_dn;
+       dn = (u_char *)exp_dn;

        cp = comp_dn;
        cp = comp_dn;

-       eob = comp_dn + length;
+       eob = cp + length;

        if (dnptrs != NULL) {
                if ((msg = *dnptrs++) != NULL) {
                        for (cpp = dnptrs; *cpp != NULL; cpp++)
        if (dnptrs != NULL) {
                if ((msg = *dnptrs++) != NULL) {
                        for (cpp = dnptrs; *cpp != NULL; cpp++)


@@ -93,7 +132,7 @@ dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
                                if (cp+1 >= eob)
                                        return (-1);
                                *cp++ = (l >> 8) | INDIR_MASK;
                                if (cp+1 >= eob)
                                        return (-1);
                                *cp++ = (l >> 8) | INDIR_MASK;

-                               *cp++ = l;
+                               *cp++ = l % 256;

                                return (cp - comp_dn);
                        }
                        /* not found, save it */
                                return (cp - comp_dn);
                        }
                        /* not found, save it */


@@ -108,31 +147,49 @@ dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
                                c = *dn++;
                                break;
                        }
                                c = *dn++;
                                break;
                        }

-                       if (cp >= eob)
+                       if (c == '\\') {
+                               if ((c = *dn++) == '\0')
+                                       break;
+                       }
+                       if (cp >= eob) {
+                               if (msg != NULL)
+                                       *lpp = NULL;

                                return (-1);
                                return (-1);

+                       }

                        *cp++ = c;
                } while ((c = *dn++) != '\0');
                        *cp++ = c;
                } while ((c = *dn++) != '\0');

-               if ((l = cp - sp - 1) <= 0 || l > MAXLABEL)
+               /* catch trailing '.'s but not '..' */
+               if ((l = cp - sp - 1) == 0 && c == '\0') {
+                       cp--;
+                       break;
+               }
+               if (l <= 0 || l > MAXLABEL) {
+                       if (msg != NULL)
+                               *lpp = NULL;

                        return (-1);
                        return (-1);

+               }

                *sp = l;
        }
                *sp = l;
        }

-       if (cp >= eob)
+       if (cp >= eob) {
+               if (msg != NULL)
+                       *lpp = NULL;

                return (-1);
                return (-1);

+       }

        *cp++ = '\0';
        return (cp - comp_dn);
 }
 
 /*
        *cp++ = '\0';
        return (cp - comp_dn);
 }
 
 /*

- * Skip over a compressed domain name. Return the size.
+ * Skip over a compressed domain name. Return the size or -1.

  */
  */

-dn_skip(buf)
-       char *buf;
+__dn_skipname(comp_dn, eom)
+       const u_char *comp_dn, *eom;

 {
 {

-       register char *cp;
+       register u_char *cp;

        register int n;
 
        register int n;
 

-       cp = buf;
-       while (n = *cp++) {
+       cp = (u_char *)comp_dn;
+       while (cp < eom && (n = *cp++)) {

                /*
                 * check for indirection
                 */
                /*
                 * check for indirection
                 */


@@ -147,20 +204,23 @@ dn_skip(buf)
                }
                break;
        }
                }
                break;
        }

-       return (cp - buf);
+       return (cp - comp_dn);

 }
 
 /*
  * Search for expanded name from a list of previously compressed names.
  * Return the offset from msg if found or -1.
 }
 
 /*
  * Search for expanded name from a list of previously compressed names.
  * Return the offset from msg if found or -1.

+ * dnptrs is the pointer to the first name on the list,
+ * not the pointer to the start of the message.

  */
  */

+static

 dn_find(exp_dn, msg, dnptrs, lastdnptr)
 dn_find(exp_dn, msg, dnptrs, lastdnptr)

-       char *exp_dn, *msg;
-       char **dnptrs, **lastdnptr;
+       u_char *exp_dn, *msg;
+       u_char **dnptrs, **lastdnptr;

 {
 {

-       register char *dn, *cp, **cpp;
+       register u_char *dn, *cp, **cpp;

        register int n;
        register int n;

-       char *sp;
+       u_char *sp;

 
        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
                dn = exp_dn;
 
        for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
                dn = exp_dn;


@@ -171,9 +231,14 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr)
                         */
                        switch (n & INDIR_MASK) {
                        case 0:         /* normal case, n == len */
                         */
                        switch (n & INDIR_MASK) {
                        case 0:         /* normal case, n == len */

-                               while (--n >= 0)
+                               while (--n >= 0) {
+                                       if (*dn == '.')
+                                               goto next;
+                                       if (*dn == '\\')
+                                               dn++;

                                        if (*dn++ != *cp++)
                                                goto next;
                                        if (*dn++ != *cp++)
                                                goto next;

+                               }

                                if ((n = *dn++) == '\0' && *cp == '\0')
                                        return (sp - msg);
                                if (n == '.')
                                if ((n = *dn++) == '\0' && *cp == '\0')
                                        return (sp - msg);
                                if (n == '.')


@@ -184,7 +249,7 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr)
                                return (-1);
 
                        case INDIR_MASK:        /* indirection */
                                return (-1);
 
                        case INDIR_MASK:        /* indirection */

-                               cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
+                               cp = msg + (((n & 0x3f) << 8) | *cp);

                        }
                }
                if (*dn == '\0')
                        }
                }
                if (*dn == '\0')


@@ -193,3 +258,66 @@ dn_find(exp_dn, msg, dnptrs, lastdnptr)
        }
        return (-1);
 }
        }
        return (-1);
 }

+
+/*
+ * Routines to insert/extract short/long's. Must account for byte
+ * order and non-alignment problems. This code at least has the
+ * advantage of being portable.
+ *
+ * used by sendmail.
+ */
+
+u_short
+_getshort(msgp)
+       u_char *msgp;
+{
+       register u_char *p = (u_char *) msgp;
+#ifdef vax
+       /*
+        * vax compiler doesn't put shorts in registers
+        */
+       register u_long u;
+#else
+       register u_short u;
+#endif
+
+       u = *p++ << 8;
+       return ((u_short)(u | *p));
+}
+
+u_long
+_getlong(msgp)
+       u_char *msgp;
+{
+       register u_char *p = (u_char *) msgp;
+       register u_long u;
+
+       u = *p++; u <<= 8;
+       u |= *p++; u <<= 8;
+       u |= *p++; u <<= 8;
+       return (u | *p);
+}
+
+void
+#ifdef __STDC__
+__putshort(register u_short s, register u_char *msgp)
+#else
+__putshort(s, msgp)
+       register u_short s;
+       register u_char *msgp;
+#endif
+{
+       msgp[1] = s;
+       msgp[0] = s >> 8;
+}
+
+void
+__putlong(l, msgp)
+       register u_long l;
+       register u_char *msgp;
+{
+       msgp[3] = l;
+       msgp[2] = (l >>= 8);
+       msgp[1] = (l >>= 8);
+       msgp[0] = l >> 8;
+}