rtmsg format changed; always include metrics; sockaddrs identified

[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 23654a4..f5afef9 100644 (file)
--- a/usr/src/sys/net/raw_usrreq.c
+++ b/usr/src/sys/net/raw_usrreq.c
@@ -1,15 +1,36 @@
-/*     raw_usrreq.c    4.21    82/10/20        */
-
-#include "../h/param.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../vax/mtpr.h"
-#include "../net/if.h"
-#include "../net/netisr.h"
-#include "../net/raw_cb.h"
-#include <errno.h>
+/*
+ * Copyright (c) 1980, 1986 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)raw_usrreq.c        7.7 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+
+#include "if.h"
+#include "route.h"
+#include "netisr.h"
+#include "raw_cb.h"
+
+#include "machine/mtpr.h"

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


@@ -21,121 +42,78 @@ raw_init()
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }
 
        rawintrq.ifq_maxlen = IFQ_MAXLEN;
 }
 

+
+/*
+ * Raw protocol input routine.  Find the socket
+ * associated with the packet(s) and move them over.  If
+ * nothing exists for this packet, drop it.
+ */

 /*
  * Raw protocol interface.
  */
 raw_input(m0, proto, src, dst)
        struct mbuf *m0;
 /*
  * Raw protocol interface.
  */
 raw_input(m0, proto, src, dst)
        struct mbuf *m0;

-       struct sockproto *proto;
+       register struct sockproto *proto;

        struct sockaddr *src, *dst;
 {
        struct sockaddr *src, *dst;
 {

-       register struct mbuf *m;
-       struct raw_header *rh;
-       int s;
-
-       /*
-        * Rip off an mbuf for a generic header.
-        */
-       m = m_get(M_DONTWAIT);
-       if (m == 0) {
-               m_freem(m0);
-               return;
-       }
-       m->m_next = m0;
-       m->m_len = sizeof(struct raw_header);
-       rh = mtod(m, struct raw_header *);
-       rh->raw_dst = *dst;
-       rh->raw_src = *src;
-       rh->raw_proto = *proto;
-
-       /*
-        * Header now contains enough info to decide
-        * which socket to place packet in (if any).
-        * Queue it up for the raw protocol process
-        * running at software interrupt level.
-        */
-       s = splimp();
-       if (IF_QFULL(&rawintrq))
-               m_freem(m);
-       else
-               IF_ENQUEUE(&rawintrq, m);
-       splx(s);
-       schednetisr(NETISR_RAW);
-}
-
-/*
- * Raw protocol input routine.  Process packets entered
- * into the queue at interrupt time.  Find the socket
- * associated with the packet(s) and move them over.  If
- * nothing exists for this packet, drop it.
- */
-rawintr()
-{
-       int s;
-       struct mbuf *m;

        register struct rawcb *rp;
        register struct rawcb *rp;

-       register struct protosw *lproto;
-       register struct raw_header *rh;
+       register struct mbuf *m = m0;
+       register int sockets = 0;

        struct socket *last;
 
        struct socket *last;
 

-next:
-       s = splimp();
-       IF_DEQUEUE(&rawintrq, m);
-       splx(s);
-       if (m == 0)
-               return;
-       rh = mtod(m, struct raw_header *);

        last = 0;
        for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next) {
        last = 0;
        for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next) {

-               lproto = rp->rcb_socket->so_proto;
-               if (lproto->pr_family != rh->raw_proto.sp_family)
+               if (rp->rcb_proto.sp_family != proto->sp_family)

                        continue;
                        continue;

-               if (lproto->pr_protocol &&
-                   lproto->pr_protocol != rh->raw_proto.sp_protocol)
+               if (rp->rcb_proto.sp_protocol  &&
+                   rp->rcb_proto.sp_protocol != proto->sp_protocol)

                        continue;
                /*
                 * We assume the lower level routines have
                 * placed the address in a canonical format
                 * suitable for a structure comparison.
                        continue;
                /*
                 * We assume the lower level routines have
                 * placed the address in a canonical format
                 * suitable for a structure comparison.

+                *
+                * Note that if the lengths are not the same
+                * the comparison will fail at the first byte.

                 */
                 */

-#define equal(a1, a2) \
-       (bcmp((caddr_t)&(a1), (caddr_t)&(a2), sizeof (struct sockaddr)) == 0)
-               if ((rp->rcb_flags & RAW_LADDR) &&
-                   !equal(rp->rcb_laddr, rh->raw_dst))
+#define        equal(a1, a2) \
+  (bcmp((caddr_t)(a1), (caddr_t)(a2), a1->sa_len) == 0)
+               if (rp->rcb_laddr && !equal(rp->rcb_laddr, dst))

                        continue;
                        continue;

-               if ((rp->rcb_flags & RAW_FADDR) &&
-                   !equal(rp->rcb_faddr, rh->raw_src))
+               if (rp->rcb_faddr && !equal(rp->rcb_faddr, src))

                        continue;
                if (last) {
                        struct mbuf *n;
                        continue;
                if (last) {
                        struct mbuf *n;

-                       if ((n = m_copy(m->m_next, 0, (int)M_COPYALL)) == 0)
-                               goto nospace;
-                       if (sbappendaddr(&last->so_rcv, &rh->raw_src, n)==0) {
-                               /* should notify about lost packet */
-                               m_freem(n);
-                               goto nospace;
+                       if (n = m_copy(m, 0, (int)M_COPYALL)) {
+                               if (sbappendaddr(&last->so_rcv, src,
+                                   n, (struct mbuf *)0) == 0)
+                                       /* should notify about lost packet */
+                                       m_freem(n);
+                               else {
+                                       sorwakeup(last);
+                                       sockets++;
+                               }

                        }
                        }

-                       sorwakeup(last);

                }
                }

-nospace:

                last = rp->rcb_socket;
        }
        if (last) {
                last = rp->rcb_socket;
        }
        if (last) {

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

 }
 
 /*ARGSUSED*/
 raw_ctlinput(cmd, arg)
        int cmd;
 }
 
 /*ARGSUSED*/
 raw_ctlinput(cmd, arg)
        int cmd;

-       caddr_t arg;
+       struct sockaddr *arg;

 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)
 {
 
        if (cmd < 0 || cmd > PRC_NCMDS)


@@ -144,18 +122,25 @@ raw_ctlinput(cmd, arg)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-raw_usrreq(so, req, m, nam, opt)
+raw_usrreq(so, req, m, nam, rights, control)

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

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

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

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

 
 

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

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


@@ -164,11 +149,11 @@ raw_usrreq(so, req, m, nam, opt)
         * the appropriate raw interface routine.
         */
        case PRU_ATTACH:
         * the appropriate raw interface routine.
         */
        case PRU_ATTACH:

-               if ((so->so_state & SS_PRIV) == 0)
-                       return (EACCES);
-               if (rp)
-                       return (EINVAL);
-               error = raw_attach(so);
+               if ((so->so_state & SS_PRIV) == 0) {
+                       error = EACCES;
+                       break;
+               }
+               error = raw_attach(so, (int)nam);

                break;
 
        /*
                break;
 
        /*


@@ -176,11 +161,14 @@ raw_usrreq(so, req, m, nam, opt)
         * 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;
 

+#ifdef notdef

        /*
         * If a socket isn't bound to a single address,
         * the raw input routine will hand it anything
        /*
         * If a socket isn't bound to a single address,
         * the raw input routine will hand it anything


@@ -188,15 +176,33 @@ raw_usrreq(so, req, m, nam, opt)
         * 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, nam);
+               if (rp->rcb_faddr) {
+                       error = EISCONN;
+                       break;
+               }
+               nam = m_copym(nam, 0, M_COPYALL, M_WAIT);
+               rp->rcb_faddr = mtod(nam, struct sockaddr *);

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

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

        case PRU_DISCONNECT:
        case PRU_DISCONNECT:

-               if ((rp->rcb_flags & RAW_FADDR) == 0)
-                       return (ENOTCONN);
+               if (rp->rcb_faddr == 0) {
+                       error = ENOTCONN;
+                       break;
+               }

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


@@ -214,14 +220,19 @@ raw_usrreq(so, req, m, nam, opt)
         */
        case PRU_SEND:
                if (nam) {
         */
        case PRU_SEND:
                if (nam) {

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

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

+               m = NULL;

                if (nam)
                if (nam)

-                       rp->rcb_flags &= ~RAW_FADDR;
+                       rp->rcb_faddr = 0;

                break;
 
        case PRU_ABORT:
                break;
 
        case PRU_ABORT:


@@ -230,26 +241,52 @@ raw_usrreq(so, req, m, nam, opt)
                soisdisconnected(so);
                break;
 
                soisdisconnected(so);
                break;
 

+       case PRU_SENSE:
+               /*
+                * stat: don't bother with a blocksize.
+                */
+               return (0);
+

        /*
         * Not supported.
         */
        /*
         * Not supported.
         */

-       case PRU_ACCEPT:
-       case PRU_RCVD:
-       case PRU_CONTROL:
-       case PRU_SENSE:

        case PRU_RCVOOB:
        case PRU_RCVOOB:

+       case PRU_RCVD:
+               return(EOPNOTSUPP);
+
+       case PRU_LISTEN:
+       case PRU_ACCEPT:

        case PRU_SENDOOB:
                error = EOPNOTSUPP;
                break;
 
        case PRU_SOCKADDR:
        case PRU_SENDOOB:
                error = EOPNOTSUPP;
                break;
 
        case PRU_SOCKADDR:

-               bcopy((caddr_t)&rp->rcb_laddr, mtod(nam, struct sockaddr *),
-                   sizeof (struct sockaddr));
-               nam->m_len = sizeof (struct sockaddr);
+               if (rp->rcb_laddr == 0) {
+                       error = EINVAL;
+                       break;
+               }
+               len = rp->rcb_laddr->sa_len;
+               bcopy((caddr_t)rp->rcb_laddr, mtod(nam, caddr_t), (unsigned)len);
+               nam->m_len = len;
+               break;
+
+       case PRU_PEERADDR:
+               if (rp->rcb_faddr == 0) {
+                       error = ENOTCONN;
+                       break;
+               }
+               len = rp->rcb_faddr->sa_len;
+               bcopy((caddr_t)rp->rcb_faddr, mtod(nam, caddr_t), (unsigned)len);
+               nam->m_len = len;

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

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

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

+
+rawintr() {} /* XXX - referenced by locore.  will soon go away */