BSD 4_3_Net_2 release

[unix-history] / usr / src / contrib / usr.x25 / lib / ccitt_addr.c

diff --git a/usr/src/contrib/usr.x25/lib/ccitt_addr.c b/usr/src/contrib/usr.x25/lib/ccitt_addr.c
index 417d6e3..1309b6a 100644 (file)
--- a/usr/src/contrib/usr.x25/lib/ccitt_addr.c
+++ b/usr/src/contrib/usr.x25/lib/ccitt_addr.c
@@ -1,3 +1,37 @@
+/*
+ * Copyright (c) 1990 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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
+ *    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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)ccitt_addr.c        5.3 (Berkeley) 7/1/91
+ */

 /*
  * parse CCITT addresses
  *
 /*
  * parse CCITT addresses
  *


@@ -26,11 +60,11 @@ char *addr;
 register struct sockaddr_x25 *xp;
 {
        register char *p, *ap, *limit;
 register struct sockaddr_x25 *xp;
 {
        register char *p, *ap, *limit;

-       register int havenet = 0;
+       int havenet = 0;

 
        bzero ((char *)xp, sizeof (*xp));
        xp->x25_family = AF_CCITT;
 
        bzero ((char *)xp, sizeof (*xp));
        xp->x25_family = AF_CCITT;

-       xp->x25_udlen = 4;
+       xp->x25_len = sizeof(*xp);

        p = addr;
 
        /*
        p = addr;
 
        /*


@@ -86,6 +120,7 @@ register struct sockaddr_x25 *xp;
        p++;
        ap = xp->x25_udata + 4;         /* first four bytes are protocol id */
        limit = ap + sizeof (xp->x25_udata) - 4;
        p++;
        ap = xp->x25_udata + 4;         /* first four bytes are protocol id */
        limit = ap + sizeof (xp->x25_udata) - 4;

+       xp->x25_udlen = 4;

        while (*p) {
                if (*p == ',')
                        break;
        while (*p) {
                if (*p == ',')
                        break;


@@ -94,12 +129,14 @@ register struct sockaddr_x25 *xp;
                p = copychar (p, ap++);
                xp->x25_udlen++;
        }
                p = copychar (p, ap++);
                xp->x25_udlen++;
        }

+       if (xp->x25_udlen == 4)
+               xp->x25_udlen = 0;

        if (*p == '\0')
                return (1);
 
        p++;
        ap = xp->x25_udata;             /* protocol id */
        if (*p == '\0')
                return (1);
 
        p++;
        ap = xp->x25_udata;             /* protocol id */

-       limit = ap + 4;
+       limit = ap + (xp->x25_udlen ? 4 : sizeof(xp->x25_udata));

        while (*p) {
                if (*p == ',')
                        return (0);
        while (*p) {
                if (*p == ',')
                        return (0);


@@ -107,6 +144,8 @@ register struct sockaddr_x25 *xp;
                        return (0);
                p = copychar (p, ap++);
        }
                        return (0);
                p = copychar (p, ap++);
        }

+       if (xp->x25_udlen == 0)
+               xp->x25_udlen = ap - xp->x25_udata;

        return (1);
 }
 
        return (1);
 }