BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / netns / idp_usrreq.c

diff --git a/usr/src/sys/netns/idp_usrreq.c b/usr/src/sys/netns/idp_usrreq.c
index ce186ce..22d6c9d 100644 (file)
--- a/usr/src/sys/netns/idp_usrreq.c
+++ b/usr/src/sys/netns/idp_usrreq.c
@@ -1,14 +1,40 @@
 /*
 /*

- * Copyright (c) 1984, 1985, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1984, 1985, 1986, 1987 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *      @(#)idp_usrreq.c       7.1 (Berkeley) 6/5/86
+ * 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.
+ *
+ *     @(#)idp_usrreq.c        7.11 (Berkeley) 6/27/91

  */
 
 #include "param.h"
  */
 
 #include "param.h"

-#include "dir.h"
-#include "user.h"
+#include "malloc.h"

 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"


@@ -30,17 +56,17 @@
  * IDP protocol implementation.
  */
 
  * IDP protocol implementation.
  */
 

-struct sockaddr_ns idp_ns = { AF_NS };
+struct sockaddr_ns idp_ns = { sizeof(idp_ns), AF_NS };

 
 /*
  *  This may also be called for raw listeners.
  */
 
 /*
  *  This may also be called for raw listeners.
  */

-idp_input(m, nsp, ifp)
+idp_input(m, nsp)

        struct mbuf *m;
        register struct nspcb *nsp;
        struct mbuf *m;
        register struct nspcb *nsp;

-       struct ifnet *ifp;

 {
        register struct idp *idp = mtod(m, struct idp *);
 {
        register struct idp *idp = mtod(m, struct idp *);

+       struct ifnet *ifp = m->m_pkthdr.rcvif;

 
        if (nsp==0)
                panic("No nspcb");
 
        if (nsp==0)
                panic("No nspcb");


@@ -50,12 +76,12 @@ idp_input(m, nsp, ifp)
         */
        idp_ns.sns_addr = idp->idp_sna;
        if (ns_neteqnn(idp->idp_sna.x_net, ns_zeronet) && ifp) {
         */
        idp_ns.sns_addr = idp->idp_sna;
        if (ns_neteqnn(idp->idp_sna.x_net, ns_zeronet) && ifp) {

-               register struct ifaddr *ia;
+               register struct ifaddr *ifa;

 
 

-               for (ia = ifp->if_addrlist; ia; ia = ia->ifa_next) {
-                       if (ia->ifa_addr.sa_family == AF_NS) {
+               for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
+                       if (ifa->ifa_addr->sa_family == AF_NS) {

                                idp_ns.sns_addr.x_net =
                                idp_ns.sns_addr.x_net =

-                                       IA_SNS(ia)->sns_addr.x_net;
+                                       IA_SNS(ifa)->sns_addr.x_net;

                                break;
                        }
                }
                                break;
                        }
                }


@@ -63,7 +89,8 @@ idp_input(m, nsp, ifp)
        nsp->nsp_rpt = idp->idp_pt;
        if ( ! (nsp->nsp_flags & NSP_RAWIN) ) {
                m->m_len -= sizeof (struct idp);
        nsp->nsp_rpt = idp->idp_pt;
        if ( ! (nsp->nsp_flags & NSP_RAWIN) ) {
                m->m_len -= sizeof (struct idp);

-               m->m_off += sizeof (struct idp);
+               m->m_pkthdr.len -= sizeof (struct idp);
+               m->m_data += sizeof (struct idp);

        }
        if (sbappendaddr(&nsp->nsp_socket->so_rcv, (struct sockaddr *)&idp_ns,
            m, (struct mbuf *)0) == 0)
        }
        if (sbappendaddr(&nsp->nsp_socket->so_rcv, (struct sockaddr *)&idp_ns,
            m, (struct mbuf *)0) == 0)


@@ -133,7 +160,8 @@ idp_output(nsp, m0)
        
        if (len & 1) {
                m = mprev;
        
        if (len & 1) {
                m = mprev;

-               if (m->m_len + m->m_off < MMAXOFF) {
+               if ((m->m_flags & M_EXT) == 0 &&
+                       (m->m_len + m->m_data < &m->m_dat[MLEN])) {

                        m->m_len++;
                } else {
                        struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);
                        m->m_len++;
                } else {
                        struct mbuf *m1 = m_get(M_DONTWAIT, MT_DATA);


@@ -143,30 +171,23 @@ idp_output(nsp, m0)
                                return (ENOBUFS);
                        }
                        m1->m_len = 1;
                                return (ENOBUFS);
                        }
                        m1->m_len = 1;

-                       m1->m_off = MMAXOFF - 1;

                        * mtod(m1, char *) = 0;
                        m->m_next = m1;
                }
                        * mtod(m1, char *) = 0;
                        m->m_next = m1;
                }

+               m0->m_pkthdr.len++;

        }
 
        /*
         * Fill in mbuf with extended IDP header
         * and addresses and length put into network format.
         */
        }
 
        /*
         * Fill in mbuf with extended IDP header
         * and addresses and length put into network format.
         */

+       m = m0;

        if (nsp->nsp_flags & NSP_RAWOUT) {
        if (nsp->nsp_flags & NSP_RAWOUT) {

-               m = m0;

                idp = mtod(m, struct idp *);
        } else {
                idp = mtod(m, struct idp *);
        } else {

-               m = m_get(M_DONTWAIT, MT_HEADER);
-               if (m == 0) {
-                       m_freem(m0);
+               M_PREPEND(m, sizeof (struct idp), M_DONTWAIT);
+               if (m == 0)

                        return (ENOBUFS);
                        return (ENOBUFS);

-               }
-               m->m_off = MMAXOFF - sizeof (struct idp) - 2;
-                               /* adjust to start on longword bdry
-                                  for NSIP on gould */
-               m->m_len = sizeof (struct idp);
-               m->m_next = m0;

                idp = mtod(m, struct idp *);
                idp->idp_tc = 0;
                idp->idp_pt = nsp->nsp_dpt;
                idp = mtod(m, struct idp *);
                idp->idp_tc = 0;
                idp->idp_pt = nsp->nsp_dpt;


@@ -273,13 +294,11 @@ idp_ctloutput(req, so, level, name, value)
                        mask = NSP_RAWOUT;
                get_flags:
                        m->m_len = sizeof(short);
                        mask = NSP_RAWOUT;
                get_flags:
                        m->m_len = sizeof(short);

-                       m->m_off = MMAXOFF - sizeof(short);

                        *mtod(m, short *) = nsp->nsp_flags & mask;
                        break;
 
                case SO_DEFAULT_HEADERS:
                        m->m_len = sizeof(struct idp);
                        *mtod(m, short *) = nsp->nsp_flags & mask;
                        break;
 
                case SO_DEFAULT_HEADERS:
                        m->m_len = sizeof(struct idp);

-                       m->m_off = MMAXOFF - sizeof(struct idp);

                        {
                                register struct idp *idp = mtod(m, struct idp *);
                                idp->idp_len = 0;
                        {
                                register struct idp *idp = mtod(m, struct idp *);
                                idp->idp_len = 0;


@@ -293,7 +312,6 @@ idp_ctloutput(req, so, level, name, value)
 
                case SO_SEQNO:
                        m->m_len = sizeof(long);
 
                case SO_SEQNO:
                        m->m_len = sizeof(long);

-                       m->m_off = MMAXOFF - sizeof(long);

                        *mtod(m, long *) = ns_pexseq++;
                        break;
 
                        *mtod(m, long *) = ns_pexseq++;
                        break;
 


@@ -351,18 +369,18 @@ idp_ctloutput(req, so, level, name, value)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-idp_usrreq(so, req, m, nam, rights)
+idp_usrreq(so, req, m, nam, control)

        struct socket *so;
        int req;
        struct socket *so;
        int req;

-       struct mbuf *m, *nam, *rights;
+       struct mbuf *m, *nam, *control;

 {
        struct nspcb *nsp = sotonspcb(so);
        int error = 0;
 
        if (req == PRU_CONTROL)
                 return (ns_control(so, (int)m, (caddr_t)nam,
 {
        struct nspcb *nsp = sotonspcb(so);
        int error = 0;
 
        if (req == PRU_CONTROL)
                 return (ns_control(so, (int)m, (caddr_t)nam,

-                       (struct ifnet *)rights));
-       if (rights && rights->m_len) {
+                       (struct ifnet *)control));
+       if (control && control->m_len) {

                error = EINVAL;
                goto release;
        }
                error = EINVAL;
                goto release;
        }


@@ -380,7 +398,7 @@ idp_usrreq(so, req, m, nam, rights)
                error = ns_pcballoc(so, &nspcb);
                if (error)
                        break;
                error = ns_pcballoc(so, &nspcb);
                if (error)
                        break;

-               error = soreserve(so, 2048, 2048);
+               error = soreserve(so, (u_long) 2048, (u_long) 2048);

                if (error)
                        break;
                break;
                if (error)
                        break;
                break;


@@ -506,15 +524,17 @@ idp_usrreq(so, req, m, nam, rights)
                panic("idp_usrreq");
        }
 release:
                panic("idp_usrreq");
        }
 release:

+       if (control != NULL)
+               m_freem(control);

        if (m != NULL)
                m_freem(m);
        return (error);
 }
 /*ARGSUSED*/
        if (m != NULL)
                m_freem(m);
        return (error);
 }
 /*ARGSUSED*/

-idp_raw_usrreq(so, req, m, nam, rights)
+idp_raw_usrreq(so, req, m, nam, control)

        struct socket *so;
        int req;
        struct socket *so;
        int req;

-       struct mbuf *m, *nam, *rights;
+       struct mbuf *m, *nam, *control;

 {
        int error = 0;
        struct nspcb *nsp = sotonspcb(so);
 {
        int error = 0;
        struct nspcb *nsp = sotonspcb(so);


@@ -524,14 +544,14 @@ idp_raw_usrreq(so, req, m, nam, rights)
 
        case PRU_ATTACH:
 
 
        case PRU_ATTACH:
 

-               if (!suser() || (nsp != NULL)) {
+               if (!(so->so_state & SS_PRIV) || (nsp != NULL)) {

                        error = EINVAL;
                        break;
                }
                error = ns_pcballoc(so, &nsrawpcb);
                if (error)
                        break;
                        error = EINVAL;
                        break;
                }
                error = ns_pcballoc(so, &nsrawpcb);
                if (error)
                        break;

-               error = soreserve(so, 2048, 2048);
+               error = soreserve(so, (u_long) 2048, (u_long) 2048);

                if (error)
                        break;
                nsp = sotonspcb(so);
                if (error)
                        break;
                nsp = sotonspcb(so);


@@ -539,7 +559,7 @@ idp_raw_usrreq(so, req, m, nam, rights)
                nsp->nsp_flags = NSP_RAWIN | NSP_RAWOUT;
                break;
        default:
                nsp->nsp_flags = NSP_RAWIN | NSP_RAWOUT;
                break;
        default:

-               error = idp_usrreq(so, req, m, nam, rights);
+               error = idp_usrreq(so, req, m, nam, control);

        }
        return (error);
 }
        }
        return (error);
 }