fix spelling mistake

[unix-history] / usr / src / sys / deprecated / netpup / raw_pup.c

diff --git a/usr/src/sys/deprecated/netpup/raw_pup.c b/usr/src/sys/deprecated/netpup/raw_pup.c
index 1892ab2..56d2a4a 100644 (file)
--- a/usr/src/sys/deprecated/netpup/raw_pup.c
+++ b/usr/src/sys/deprecated/netpup/raw_pup.c
@@ -1,4 +1,4 @@
-/*     raw_pup.c       4.2     82/02/02        */
+/*     raw_pup.c       4.7     82/03/10        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"


@@ -9,46 +9,26 @@
 #include "../net/in_systm.h"
 #include "../net/pup.h"
 #include "../net/raw_cb.h"
 #include "../net/in_systm.h"
 #include "../net/pup.h"
 #include "../net/raw_cb.h"

-#include "/usr/include/errno.h"
+#include "../net/if.h"
+#include "../errno.h"

 
 /*
  * Raw PUP protocol interface.
  */
 
 
 /*
  * Raw PUP protocol interface.
  */
 

-static struct sockaddr_pup pupsrc = { AF_PUP };
-static struct sockaddr_pup pupdst = { AF_PUP };
-static struct sockproto pupproto = { PF_PUP };
-
-/*
- * Setup generic address and protocol structures
- * for raw_input routine, then pass them along with
- * mbuf chain.
- */
-rawpup_input(m)
-       struct mbuf *m;
-{
-       register struct pup_header *pup = mtod(m, struct pup_header *);
-
-COUNT(RAWPUP_INPUT);
-       pupproto.sp_protocol = pup->pup_type;
-       pupdst.spup_addr = pup->pup_daddr;
-       pupsrc.spup_addr = pup->pup_saddr;
-       raw_input(m, &pupproto, &pupdst, &pupsrc);
-}
-

 /*ARGSUSED*/
 /*ARGSUSED*/

-rawpup_ctlinput(m)
+rpup_ctlinput(m)

        struct mbuf *m;
 {
        struct mbuf *m;
 {

-COUNT(RAWPUP_CTLINPUT);
+COUNT(RPUP_CTLINPUT);

 }
 
 /*
  * Encapsulate packet in PUP header which is supplied by the
  * user.  This is done to allow user to specify PUP identifier.
  */
 }
 
 /*
  * Encapsulate packet in PUP header which is supplied by the
  * user.  This is done to allow user to specify PUP identifier.
  */

-rawpup_output(m0, so)
-       struct mbuf *m0;
+rpup_output(m, so)
+       register struct mbuf *m;

        struct socket *so;
 {
        register struct rawcb *rp = sotorawcb(so);
        struct socket *so;
 {
        register struct rawcb *rp = sotorawcb(so);


@@ -56,14 +36,15 @@ rawpup_output(m0, so)
        int len;
        struct mbuf *n;
        struct sockaddr_pup *spup;
        int len;
        struct mbuf *n;
        struct sockaddr_pup *spup;

+       struct ifnet *ifp;

 
 

-COUNT(RAWPUP_OUTPUT);
+COUNT(RPUP_OUTPUT);

        /*
         * Verify user has supplied necessary space
         * for the header and check parameters in it.
         */
        if ((m->m_off > MMAXOFF || m->m_len < sizeof(struct pup_header)) &&
        /*
         * Verify user has supplied necessary space
         * for the header and check parameters in it.
         */
        if ((m->m_off > MMAXOFF || m->m_len < sizeof(struct pup_header)) &&

-           (m = m_pullup(m, sizeof(struct pup_header)) == 0) {
+           (m = m_pullup(m, sizeof(struct pup_header))) == 0)

                goto bad;
        pup = mtod(m, struct pup_header *);
        if (pup->pup_type == 0)
                goto bad;
        pup = mtod(m, struct pup_header *);
        if (pup->pup_type == 0)


@@ -79,64 +60,19 @@ COUNT(RAWPUP_OUTPUT);
        /*
         * Insure proper source address is included.
         */
        /*
         * Insure proper source address is included.
         */

-       spup = (struct sockadrr_pup *)rp->rcb_socket->so_addr;
+       spup = (struct sockaddr_pup *)&(rp->rcb_socket->so_addr);

        pup->pup_sport = spup->spup_addr;
        /* for now, assume user generates PUP checksum. */
 
        pup->pup_sport = spup->spup_addr;
        /* for now, assume user generates PUP checksum. */
 

-       if (rp->rcb_pcb == 0)                   /* XXX */
-               panic("rawpup_output");
+       ifp = if_ifonnetof(&rp->rcb_addr);
+       if (ifp == 0) {
+               ifp = if_gatewayfor(&rp->rcb_addr);
+               if (ifp == 0)
+                       goto bad;
+       }

        return (enoutput((struct ifnet *)rp->rcb_pcb, m, PF_PUP));
 
 bad:
        m_freem(m);
        return (0);
 }
        return (enoutput((struct ifnet *)rp->rcb_pcb, m, PF_PUP));
 
 bad:
        m_freem(m);
        return (0);
 }

-
-/*
- * Intercept connects and sends to verify interface
- * exists for destination address.  Disconnects are
- * also looked at to insure pointer is invalidated.
- */
-rawpup_usrreq(so, req, m, addr)
-       struct socket *so;
-       int req;
-       struct mbuf *m;
-       caddr_t addr;
-{
-       register struct rawcb *rp = sotorawcb(so);
-
-COUNT(RAWPUP_USRREQ);
-       if (rp == 0 && req != PRU_ATTACH)
-               return (EINVAL);
-
-       switch (req) {
-
-       /*
-        * Verify address has an interface to go with it
-        * and record information for use in output routine.
-        */
-       case PRU_SEND:
-       case PRU_CONNECT: {
-               register struct sockaddr_pup *spup;
-               register struct ifnet *ifp;
-
-               spup = (struct sockaddr_pup *)addr;
-               ifp = if_ifonnetof(spup->spup_addr);
-               if (ifp == 0) {
-                       ifp = if_gatewayfor(spup->spup_addr);
-                       if (ifp == 0)
-                               return (EADDRNOTAVAIL); /* XXX */
-               }
-               rp->rcb_pcb = (caddr_t)ifp;
-               break;
-               }
-
-       case PRU_DISCONNECT:
-               rp->rcb_pcb = 0;
-               break;
-       
-       case PRU_CONTROL:
-               return (EOPNOTSUPP);
-       }
-       return (raw_usrreq(so, req, m, addr));
-}