inner loop in sosend limited to "space" bytes to fix

[unix-history] / usr / src / sys / net / raw_usrreq.c

diff --git a/usr/src/sys/net/raw_usrreq.c b/usr/src/sys/net/raw_usrreq.c
index 37bf18d..0670f0f 100644 (file)
--- a/usr/src/sys/net/raw_usrreq.c
+++ b/usr/src/sys/net/raw_usrreq.c
@@ -1,18 +1,18 @@
-/*     raw_usrreq.c    4.14    82/04/11        */
+/*     raw_usrreq.c    6.1     83/07/29        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../h/mtpr.h"
-#include "../net/in.h"
-#include "../net/in_systm.h"
+#include "../h/errno.h"
+

 #include "../net/if.h"
 #include "../net/if.h"

+#include "../net/route.h"
+#include "../net/netisr.h"

 #include "../net/raw_cb.h"
 #include "../net/raw_cb.h"

-#include <errno.h>

 
 

-int    rawqmaxlen = IFQ_MAXLEN;
+#include "../vax/mtpr.h"

 
 /*
  * Initialize raw connection block q.
 
 /*
  * Initialize raw connection block q.


@@ -20,7 +20,6 @@ int   rawqmaxlen = IFQ_MAXLEN;
 raw_init()
 {
 
 raw_init()
 {
 

-COUNT(RAW_INIT);

        rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }
        rawcb.rcb_next = rawcb.rcb_prev = &rawcb;
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }


@@ -37,17 +36,15 @@ raw_input(m0, proto, src, dst)
        struct raw_header *rh;
        int s;
 
        struct raw_header *rh;
        int s;
 

-COUNT(RAW_INPUT);

        /*
         * Rip off an mbuf for a generic header.
         */
        /*
         * Rip off an mbuf for a generic header.
         */

-       m = m_get(M_DONTWAIT);
+       m = m_get(M_DONTWAIT, MT_HEADER);

        if (m == 0) {
                m_freem(m0);
                return;
        }
        m->m_next = m0;
        if (m == 0) {
                m_freem(m0);
                return;
        }
        m->m_next = m0;

-       m->m_off = MMINOFF;

        m->m_len = sizeof(struct raw_header);
        rh = mtod(m, struct raw_header *);
        rh->raw_dst = *dst;
        m->m_len = sizeof(struct raw_header);
        rh = mtod(m, struct raw_header *);
        rh->raw_dst = *dst;


@@ -84,7 +81,6 @@ rawintr()
        register struct raw_header *rh;
        struct socket *last;
 
        register struct raw_header *rh;
        struct socket *last;
 

-COUNT(RAWINTR);

 next:
        s = splimp();
        IF_DEQUEUE(&rawintrq, m);
 next:
        s = splimp();
        IF_DEQUEUE(&rawintrq, m);


@@ -115,9 +111,10 @@ next:
                        continue;
                if (last) {
                        struct mbuf *n;
                        continue;
                if (last) {
                        struct mbuf *n;

-                       if (n = m_copy(m->m_next, 0, (int)M_COPYALL))
+                       if ((n = m_copy(m->m_next, 0, (int)M_COPYALL)) == 0)

                                goto nospace;
                                goto nospace;

-                       if (sbappendaddr(&last->so_rcv, &rh->raw_src, n)==0) {
+                       if (sbappendaddr(&last->so_rcv, &rh->raw_src,
+                           n, (struct mbuf *)0) == 0) {

                                /* should notify about lost packet */
                                m_freem(n);
                                goto nospace;
                                /* should notify about lost packet */
                                m_freem(n);
                                goto nospace;


@@ -127,32 +124,47 @@ next:
 nospace:
                last = rp->rcb_socket;
        }
 nospace:
                last = rp->rcb_socket;
        }

-       if (last == 0)
-               goto drop;
-       m = m_free(m);          /* header */
-       if (sbappendaddr(&last->so_rcv, &rh->raw_src, m) == 0)
-               goto drop;
-       sorwakeup(last);
-       goto next;
+       if (last) {
+               m = m_free(m);          /* header */
+               if (sbappendaddr(&last->so_rcv, &rh->raw_src,
+                   m, (struct mbuf *)0) == 0)
+                       goto drop;
+               sorwakeup(last);
+               goto next;
+       }

 drop:
        m_freem(m);
        goto next;
 }
 
 /*ARGSUSED*/
 drop:
        m_freem(m);
        goto next;
 }
 
 /*ARGSUSED*/

-raw_usrreq(so, req, m, addr)
+raw_ctlinput(cmd, arg)
+       int cmd;
+       caddr_t arg;
+{
+
+       if (cmd < 0 || cmd > PRC_NCMDS)
+               return;
+       /* INCOMPLETE */
+}
+
+/*ARGSUSED*/
+raw_usrreq(so, req, m, nam, rights)

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

-       struct mbuf *m;
-       caddr_t addr;
+       struct mbuf *m, *nam, *rights;

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

-       int error = 0;
-
-COUNT(RAW_USRREQ);
-       if (rp == 0 && req != PRU_ATTACH)
-               return (EINVAL);
+       register int error = 0;

 
 

+       if (rights && rights->m_len) {
+               error = EOPNOTSUPP;
+               goto release;
+       }
+       if (rp == 0 && req != PRU_ATTACH) {
+               error = EINVAL;
+               goto release;
+       }

        switch (req) {
 
        /*
        switch (req) {
 
        /*


@@ -161,11 +173,15 @@ COUNT(RAW_USRREQ);
         * the appropriate raw interface routine.
         */
        case PRU_ATTACH:
         * the appropriate raw interface routine.
         */
        case PRU_ATTACH:

-               if ((so->so_state & SS_PRIV) == 0)
-                       return (EPERM);
-               if (rp)
-                       return (EINVAL);
-               error = raw_attach(so, (struct sockaddr *)addr);
+               if ((so->so_state & SS_PRIV) == 0) {
+                       error = EACCES;
+                       break;
+               }
+               if (rp) {
+                       error = EINVAL;
+                       break;
+               }
+               error = raw_attach(so);

                break;
 
        /*
                break;
 
        /*


@@ -173,8 +189,10 @@ COUNT(RAW_USRREQ);
         * Flush data or not depending on the options.
         */
        case PRU_DETACH:
         * Flush data or not depending on the options.
         */
        case PRU_DETACH:

-               if (rp == 0)
-                       return (ENOTCONN);
+               if (rp == 0) {
+                       error = ENOTCONN;
+                       break;
+               }

                raw_detach(rp);
                break;
 
                raw_detach(rp);
                break;
 


@@ -185,15 +203,33 @@ COUNT(RAW_USRREQ);
         * nothing else around it should go to). 
         */
        case PRU_CONNECT:
         * nothing else around it should go to). 
         */
        case PRU_CONNECT:

-               if (rp->rcb_flags & RAW_FADDR)
-                       return (EISCONN);
-               raw_connaddr(rp, (struct sockaddr *)addr);
+               if (rp->rcb_flags & RAW_FADDR) {
+                       error = EISCONN;
+                       break;
+               }
+               raw_connaddr(rp, nam);

                soisconnected(so);
                break;
 
                soisconnected(so);
                break;
 

+       case PRU_CONNECT2:
+               error = EOPNOTSUPP;
+               goto release;
+
+       case PRU_BIND:
+               if (rp->rcb_flags & RAW_LADDR) {
+                       error = EINVAL;                 /* XXX */
+                       break;
+               }
+               error = raw_bind(so, nam);
+               break;
+

        case PRU_DISCONNECT:
        case PRU_DISCONNECT:

-               if ((rp->rcb_flags & RAW_FADDR) == 0)
-                       return (ENOTCONN);
+               if ((rp->rcb_flags & RAW_FADDR) == 0) {
+                       error = ENOTCONN;
+                       break;
+               }
+               if (rp->rcb_route.ro_rt)
+                       rtfree(rp->rcb_route.ro_rt);

                raw_disconnect(rp);
                soisdisconnected(so);
                break;
                raw_disconnect(rp);
                soisdisconnected(so);
                break;


@@ -210,14 +246,33 @@ COUNT(RAW_USRREQ);
         * routine handles any massaging necessary.
         */
        case PRU_SEND:
         * routine handles any massaging necessary.
         */
        case PRU_SEND:

-               if (addr) {
-                       if (rp->rcb_flags & RAW_FADDR)
-                               return (EISCONN);
-                       raw_connaddr(rp, (struct sockaddr *)addr);
-               } else if ((rp->rcb_flags & RAW_FADDR) == 0)
-                       return (ENOTCONN);
+               if (nam) {
+                       if (rp->rcb_flags & RAW_FADDR) {
+                               error = EISCONN;
+                               break;
+                       }
+                       raw_connaddr(rp, nam);
+               } else if ((rp->rcb_flags & RAW_FADDR) == 0) {
+                       error = ENOTCONN;
+                       break;
+               }
+               /*
+                * Check for routing.  If new foreign address, or
+                * no route presently in use, try to allocate new
+                * route.  On failure, just hand packet to output
+                * routine anyway in case it can handle it.
+                */
+               if ((rp->rcb_flags & RAW_DONTROUTE) == 0)
+                       if (!equal(rp->rcb_faddr, rp->rcb_route.ro_dst) ||
+                           rp->rcb_route.ro_rt == 0) {
+                               if (rp->rcb_route.ro_rt)
+                                       rtfree(rp->rcb_route.ro_rt);
+                               rp->rcb_route.ro_dst = rp->rcb_faddr;
+                               rtalloc(&rp->rcb_route);
+                       }

                error = (*so->so_proto->pr_output)(m, so);
                error = (*so->so_proto->pr_output)(m, so);

-               if (addr)
+               m = NULL;
+               if (nam)

                        rp->rcb_flags &= ~RAW_FADDR;
                break;
 
                        rp->rcb_flags &= ~RAW_FADDR;
                break;
 


@@ -227,12 +282,16 @@ COUNT(RAW_USRREQ);
                soisdisconnected(so);
                break;
 
                soisdisconnected(so);
                break;
 

+       case PRU_CONTROL:
+               m = NULL;
+               error = EOPNOTSUPP;
+               break;
+

        /*
         * Not supported.
         */
        case PRU_ACCEPT:
        case PRU_RCVD:
        /*
         * Not supported.
         */
        case PRU_ACCEPT:
        case PRU_RCVD:

-       case PRU_CONTROL:

        case PRU_SENSE:
        case PRU_RCVOOB:
        case PRU_SENDOOB:
        case PRU_SENSE:
        case PRU_RCVOOB:
        case PRU_SENDOOB:


@@ -240,11 +299,22 @@ COUNT(RAW_USRREQ);
                break;
 
        case PRU_SOCKADDR:
                break;
 
        case PRU_SOCKADDR:

-               bcopy(addr, (caddr_t)&rp->rcb_laddr, sizeof (struct sockaddr));
+               bcopy((caddr_t)&rp->rcb_laddr, mtod(nam, caddr_t),
+                   sizeof (struct sockaddr));
+               nam->m_len = sizeof (struct sockaddr);
+               break;
+
+       case PRU_PEERADDR:
+               bcopy((caddr_t)&rp->rcb_faddr, mtod(nam, caddr_t),
+                   sizeof (struct sockaddr));
+               nam->m_len = sizeof (struct sockaddr);

                break;
 
        default:
                panic("raw_usrreq");
        }
                break;
 
        default:
                panic("raw_usrreq");
        }

+release:
+       if (m != NULL)
+               m_freem(m);

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