xnu-792.24.17.tar.gz

[apple/xnu.git] / bsd / net / ndrv.c

diff --git a/bsd/net/ndrv.c b/bsd/net/ndrv.c
index 9c4595c7ae85ea341e444b33cb923477222d2f33..ed973ec4581d7993094351d8919ebde8f937e607 100644 (file)
--- a/bsd/net/ndrv.c
+++ b/bsd/net/ndrv.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -60,7 +60,6 @@
 #include <kern/queue.h>
 
 #include <net/ndrv.h>
 #include <kern/queue.h>
 
 #include <net/ndrv.h>

-#include <net/netisr.h>

 #include <net/route.h>
 #include <net/if_llc.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/if_llc.h>
 #include <net/if_dl.h>


@@ -75,14 +74,13 @@
 
 #include <machine/spl.h>
 
 
 #include <machine/spl.h>
 

-int ndrv_do_detach(struct ndrv_cb *);
-int ndrv_do_disconnect(struct ndrv_cb *);
-struct ndrv_cb *ndrv_find_tag(unsigned int);
-void ndrv_read_event(struct socket* inSo, caddr_t ref, int waitf);
-int ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt);
-int ndrv_delspec(struct ndrv_cb *);
-int ndrv_to_dlil_demux(struct ndrv_demux_desc* ndrv, struct dlil_demux_desc* dlil);
-void ndrv_handle_ifp_detach(u_long family, short unit);
+static int ndrv_do_detach(struct ndrv_cb *);
+static int ndrv_do_disconnect(struct ndrv_cb *);
+static struct ndrv_cb *ndrv_find_inbound(struct ifnet *ifp, u_long protocol_family);
+static int ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt);
+static int ndrv_delspec(struct ndrv_cb *);
+static int ndrv_to_dlil_demux(struct ndrv_demux_desc* ndrv, struct dlil_demux_desc* dlil);
+static void ndrv_handle_ifp_detach(u_long family, short unit);

 static int ndrv_do_add_multicast(struct ndrv_cb *np, struct sockopt *sopt);
 static int ndrv_do_remove_multicast(struct ndrv_cb *np, struct sockopt *sopt);
 static struct ndrv_multiaddr* ndrv_have_multicast(struct ndrv_cb *np, struct sockaddr* addr);
 static int ndrv_do_add_multicast(struct ndrv_cb *np, struct sockopt *sopt);
 static int ndrv_do_remove_multicast(struct ndrv_cb *np, struct sockopt *sopt);
 static struct ndrv_multiaddr* ndrv_have_multicast(struct ndrv_cb *np, struct sockaddr* addr);


@@ -90,62 +88,39 @@ static void ndrv_remove_all_multicast(struct ndrv_cb *np);
 
 unsigned long  ndrv_sendspace = NDRVSNDQ;
 unsigned long  ndrv_recvspace = NDRVRCVQ;
 
 unsigned long  ndrv_sendspace = NDRVSNDQ;
 unsigned long  ndrv_recvspace = NDRVRCVQ;

-struct ndrv_cb ndrvl;          /* Head of controlblock list */
+TAILQ_HEAD(, ndrv_cb)  ndrvl = TAILQ_HEAD_INITIALIZER(ndrvl);

 
 

-struct domain ndrvdomain;
-struct protosw ndrvsw;
-static struct socket* ndrv_so;
+extern struct domain ndrvdomain;
+extern struct protosw ndrvsw;
+extern lck_mtx_t *domain_proto_mtx;

 
 

+extern void kprintf(const char *, ...);

 
 /*
 
 /*

- * Protocol init function for NDRV protocol
- * Init the control block list.
+ * Verify these values match.
+ * To keep clients from including dlil.h, we define
+ * these values independently in ndrv.h. They must
+ * match or a conversion function must be written.

  */
  */

-void
-ndrv_init()
-{
-    int retval;
-    struct kev_request kev_request;
-    
-       ndrvl.nd_next = ndrvl.nd_prev = &ndrvl;
-    
-    /* Create a PF_SYSTEM socket so we can listen for events */
-    retval = socreate(PF_SYSTEM, &ndrv_so, SOCK_RAW, SYSPROTO_EVENT);
-    if (retval != 0 || ndrv_so == NULL)
-        retval = KERN_FAILURE;
-    
-    /* Install a callback function for the socket */
-    ndrv_so->so_rcv.sb_flags |= SB_NOTIFY|SB_UPCALL;
-    ndrv_so->so_upcall = ndrv_read_event;
-    ndrv_so->so_upcallarg = NULL;
-    
-    /* Configure the socket to receive the events we're interested in */
-    kev_request.vendor_code = KEV_VENDOR_APPLE;
-    kev_request.kev_class = KEV_NETWORK_CLASS;
-    kev_request.kev_subclass = KEV_DL_SUBCLASS;
-    retval = ndrv_so->so_proto->pr_usrreqs->pru_control(ndrv_so, SIOCSKEVFILT, (caddr_t)&kev_request, 0, 0);
-    if (retval != 0)
-    {
-        /*
-         * We will not get attaching or detaching events in this case.
-         * We should probably prevent any sockets from binding so we won't
-         * panic later if the interface goes away.
-         */
-        log(LOG_WARNING, "PF_NDRV: ndrv_init - failed to set event filter (%d)",
-            retval);
-    }
-}
+#if NDRV_DEMUXTYPE_ETHERTYPE != DLIL_DESC_ETYPE2
+#error NDRV_DEMUXTYPE_ETHERTYPE must match DLIL_DESC_ETYPE2
+#endif
+#if NDRV_DEMUXTYPE_SAP != DLIL_DESC_SAP
+#error NDRV_DEMUXTYPE_SAP must match DLIL_DESC_SAP
+#endif
+#if NDRV_DEMUXTYPE_SNAP != DLIL_DESC_SNAP
+#error NDRV_DEMUXTYPE_SNAP must match DLIL_DESC_SNAP
+#endif

 
 /*
  * Protocol output - Called to output a raw network packet directly
  *  to the driver.
  */
 
 /*
  * Protocol output - Called to output a raw network packet directly
  *  to the driver.
  */

-int
-ndrv_output(register struct mbuf *m, register struct socket *so)
+static int
+ndrv_output(struct mbuf *m, struct socket *so)

 {
 {

-    register struct ndrv_cb *np = sotondrvcb(so);
-       register struct ifnet *ifp = np->nd_if;
-       extern void kprintf(const char *, ...);
+    struct ndrv_cb *np = sotondrvcb(so);
+       struct ifnet *ifp = np->nd_if;

     int        result = 0;
 
 #if NDRV_DEBUG
     int        result = 0;
 
 #if NDRV_DEBUG


@@ -158,32 +133,33 @@ ndrv_output(register struct mbuf *m, register struct socket *so)
        if ((m->m_flags&M_PKTHDR) == 0)
                return(EINVAL);
 
        if ((m->m_flags&M_PKTHDR) == 0)
                return(EINVAL);
 

+       /* Unlock before calling dlil_output */
+       socket_unlock(so, 0);
+       

        /*
      * Call DLIL if we can. DLIL is much safer than calling the
      * ifp directly.
      */
        /*
      * Call DLIL if we can. DLIL is much safer than calling the
      * ifp directly.
      */

-    if (np->nd_tag != 0)
-        result = dlil_output(np->nd_tag, m, (caddr_t)NULL,
-                            (struct sockaddr*)NULL, 1);
-    else if (np->nd_send_tag != 0)
-        result = dlil_output(np->nd_send_tag, m, (caddr_t)NULL,
-                            (struct sockaddr*)NULL, 1);
-    else
-        result = ENXIO;
+       result = dlil_output(ifp, np->nd_proto_family, m, (caddr_t)NULL,
+                                               (struct sockaddr*)NULL, 1);
+       
+       socket_lock(so, 0);
+       

        return (result);
 }
 
 /* Our input routine called from DLIL */
        return (result);
 }
 
 /* Our input routine called from DLIL */

-int
+static int

 ndrv_input(struct mbuf *m,
           char *frame_header,
           struct ifnet *ifp,
 ndrv_input(struct mbuf *m,
           char *frame_header,
           struct ifnet *ifp,

-          u_long  dl_tag,
-          int sync_ok)
+          u_long  proto_family,
+          __unused int sync_ok)

 {
        struct socket *so;
        struct sockaddr_dl ndrvsrc = {sizeof (struct sockaddr_dl), AF_NDRV};
 {
        struct socket *so;
        struct sockaddr_dl ndrvsrc = {sizeof (struct sockaddr_dl), AF_NDRV};

-       register struct ndrv_cb *np;
+       struct ndrv_cb *np;
+       int error = 0;

 
 
     /* move packet from if queue to socket */
 
 
     /* move packet from if queue to socket */


@@ -194,43 +170,36 @@ ndrv_input(struct mbuf *m,
     ndrvsrc.sdl_slen = 0;
     bcopy(frame_header, &ndrvsrc.sdl_data, 6);
 
     ndrvsrc.sdl_slen = 0;
     bcopy(frame_header, &ndrvsrc.sdl_data, 6);
 

-       np = ndrv_find_tag(dl_tag);
+       np = ndrv_find_inbound(ifp, proto_family);

        if (np == NULL)
        {
                return(ENOENT);
        }
        so = np->nd_socket;
     /* prepend the frame header */
        if (np == NULL)
        {
                return(ENOENT);
        }
        so = np->nd_socket;
     /* prepend the frame header */

-    m = m_prepend(m, ifp->if_data.ifi_hdrlen, M_NOWAIT);
+    m = m_prepend(m, ifp->if_hdrlen, M_NOWAIT);

     if (m == NULL)
         return EJUSTRETURN;
     if (m == NULL)
         return EJUSTRETURN;

-    bcopy(frame_header, m->m_data, ifp->if_data.ifi_hdrlen);
+    bcopy(frame_header, m->m_data, ifp->if_hdrlen);
+
+       lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       lck_mtx_lock(so->so_proto->pr_domain->dom_mtx);

        if (sbappendaddr(&(so->so_rcv), (struct sockaddr *)&ndrvsrc,
        if (sbappendaddr(&(so->so_rcv), (struct sockaddr *)&ndrvsrc,

-                        m, (struct mbuf *)0) == 0)
-       {
-        /* yes, sbappendaddr returns zero if the sockbuff is full... */
-        /* caller will free m */
-               return(ENOMEM);
-       } else
+                                        m, (struct mbuf *)0, &error) != 0) {

                sorwakeup(so);
                sorwakeup(so);

-       return(0);
-}
-
-int
-ndrv_control(struct socket *so, u_long cmd, caddr_t data,
-                 struct ifnet *ifp, struct proc *p)
-{
-       return (0);
+       }
+       lck_mtx_unlock(so->so_proto->pr_domain->dom_mtx);
+       return 0; /* radar 4030377 - always return 0 */

 }
 
 /*
  * Allocate an ndrv control block and some buffer space for the socket
  */
 }
 
 /*
  * Allocate an ndrv control block and some buffer space for the socket
  */

-int
-ndrv_attach(struct socket *so, int proto, struct proc *p)
+static int
+ndrv_attach(struct socket *so, int proto, __unused struct proc *p)

 {
     int error;
 {
     int error;

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

 
        if ((so->so_state & SS_PRIV) == 0)
                return(EPERM);
 
        if ((so->so_state & SS_PRIV) == 0)
                return(EPERM);


@@ -256,10 +225,10 @@ ndrv_attach(struct socket *so, int proto, struct proc *p)
        np->nd_proto.sp_family = so->so_proto->pr_domain->dom_family;
        np->nd_proto.sp_protocol = proto;
     np->nd_if = NULL;
        np->nd_proto.sp_family = so->so_proto->pr_domain->dom_family;
        np->nd_proto.sp_protocol = proto;
     np->nd_if = NULL;

-    np->nd_tag = 0;
+    np->nd_proto_family = 0;

     np->nd_family = 0;
     np->nd_unit = 0;
     np->nd_family = 0;
     np->nd_unit = 0;

-       insque((queue_t)np, (queue_t)&ndrvl);
+    TAILQ_INSERT_TAIL(&ndrvl, np, nd_next);

        return(0);
 }
 
        return(0);
 }
 


@@ -268,10 +237,10 @@ ndrv_attach(struct socket *so, int proto, struct proc *p)
  * Flush data or not depending on the options.
  */
 
  * Flush data or not depending on the options.
  */
 

-int
+static int

 ndrv_detach(struct socket *so)
 {
 ndrv_detach(struct socket *so)
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

 
        if (np == 0)
                return EINVAL;
 
        if (np == 0)
                return EINVAL;


@@ -288,9 +257,10 @@ ndrv_detach(struct socket *so)
  * Don't expect this to be used.
  */
 
  * Don't expect this to be used.
  */
 

-int ndrv_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
+static int
+ndrv_connect(struct socket *so, struct sockaddr *nam, __unused struct proc *p)

 {
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

     int        result = 0;
 
        if (np == 0)
     int        result = 0;
 
        if (np == 0)


@@ -312,22 +282,34 @@ int ndrv_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
        return 0;
 }
 
        return 0;
 }
 

+static void
+ndrv_event(struct ifnet *ifp, struct kev_msg *event)
+{
+       if (event->vendor_code == KEV_VENDOR_APPLE &&
+               event->kev_class == KEV_NETWORK_CLASS &&
+               event->kev_subclass == KEV_DL_SUBCLASS &&
+               event->event_code == KEV_DL_IF_DETACHING) {
+               ndrv_handle_ifp_detach(ifp->if_family, ifp->if_unit);
+       }
+}
+
+static int name_cmp(struct ifnet *, char *);
+

 /*
  * This is the "driver open" hook - we 'bind' to the
  *  named driver.
  * Here's where we latch onto the driver.
  */
 /*
  * This is the "driver open" hook - we 'bind' to the
  *  named driver.
  * Here's where we latch onto the driver.
  */

-int
-ndrv_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
+static int
+ndrv_bind(struct socket *so, struct sockaddr *nam, __unused struct proc *p)

 {
 {

-    register struct sockaddr_ndrv *sa = (struct sockaddr_ndrv *) nam;
-       register char *dname;
-       register struct ndrv_cb *np;
-       register struct ifnet *ifp;
-       extern int name_cmp(struct ifnet *, char *);
+    struct sockaddr_ndrv *sa = (struct sockaddr_ndrv *) nam;
+       char *dname;
+       struct ndrv_cb *np;
+       struct ifnet *ifp;

     int        result;
 
     int        result;
 

-       if TAILQ_EMPTY(&ifnet)
+       if TAILQ_EMPTY(&ifnet_head)

                return(EADDRNOTAVAIL); /* Quick sanity check */
        np = sotondrvcb(so);
        if (np == 0)
                return(EADDRNOTAVAIL); /* Quick sanity check */
        np = sotondrvcb(so);
        if (np == 0)


@@ -351,46 +333,40 @@ ndrv_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
         * There's no internal call for this so we have to dup the code
         *  in if.c/ifconf()
         */
         * There's no internal call for this so we have to dup the code
         *  in if.c/ifconf()
         */

-       TAILQ_FOREACH(ifp, &ifnet, if_link) {
+       ifnet_head_lock_shared();
+       TAILQ_FOREACH(ifp, &ifnet_head, if_link) {

                if (name_cmp(ifp, dname) == 0)
                        break;
        }
                if (name_cmp(ifp, dname) == 0)
                        break;
        }

+       ifnet_head_done();

 
        if (ifp == NULL)
                return(EADDRNOTAVAIL);
 
        if (ifp == NULL)
                return(EADDRNOTAVAIL);

-    
-    /* 
-     * Loopback demuxing doesn't work with PF_NDRV.
-     * The first 4 bytes of the packet must be the
-     * protocol ptr. Can't get that from userland.
-     */
-    if (ifp->if_family == APPLE_IF_FAM_LOOPBACK)
-        return (ENOTSUP);
-    
-    if ((dlil_find_dltag(ifp->if_family, ifp->if_unit,
-                         PF_NDRV, &np->nd_send_tag) != 0) &&
-        (ifp->if_family != APPLE_IF_FAM_PPP)) {
-        /* NDRV isn't registered on this interface, lets change that */
-        struct dlil_proto_reg_str      ndrv_proto;
-        int    result = 0;
-        bzero(&ndrv_proto, sizeof(ndrv_proto));
-        TAILQ_INIT(&ndrv_proto.demux_desc_head);
-        
-        ndrv_proto.interface_family = ifp->if_family;
-        ndrv_proto.protocol_family = PF_NDRV;
-        ndrv_proto.unit_number = ifp->if_unit;
-        
-        result = dlil_attach_protocol(&ndrv_proto, &np->nd_send_tag);
-        
-        /*
-         * If the interface does not allow PF_NDRV to attach, we will
-         * respect it's wishes. Sending will be disabled. No error is
-         * returned because the client may later attach a real protocol
-         * that the interface may accept.
-         */
-        if (result != 0)
-            np->nd_send_tag = 0;
-    }
+       
+       // PPP doesn't support PF_NDRV.
+       if (ifp->if_family != APPLE_IF_FAM_PPP)
+       {
+               /* NDRV on this interface */
+               struct dlil_proto_reg_str       ndrv_proto;
+               result = 0;
+               bzero(&ndrv_proto, sizeof(ndrv_proto));
+               TAILQ_INIT(&ndrv_proto.demux_desc_head);
+               
+               ndrv_proto.interface_family = ifp->if_family;
+               ndrv_proto.protocol_family = PF_NDRV;
+               ndrv_proto.unit_number = ifp->if_unit;
+               ndrv_proto.event = ndrv_event;
+               
+               /* We aren't worried about double attaching, that should just return an error */
+               result = dlil_attach_protocol(&ndrv_proto);
+               if (result && result != EEXIST) {
+                       return result;
+               }
+               np->nd_proto_family = PF_NDRV;
+       }
+       else {
+               np->nd_proto_family = 0;
+       }

     
        np->nd_if = ifp;
     np->nd_family = ifp->if_family;
     
        np->nd_if = ifp;
     np->nd_family = ifp->if_family;


@@ -399,10 +375,10 @@ ndrv_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
        return(0);
 }
 
        return(0);
 }
 

-int
+static int

 ndrv_disconnect(struct socket *so)
 {
 ndrv_disconnect(struct socket *so)
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

 
        if (np == 0)
                return EINVAL;
 
        if (np == 0)
                return EINVAL;


@@ -414,41 +390,13 @@ ndrv_disconnect(struct socket *so)
        return 0;
 }
 
        return 0;
 }
 

-/*
- * Accessor function
- */
-struct ifnet*
-ndrv_get_ifp(caddr_t ndrv_pcb)
-{
-    struct ndrv_cb*    np = (struct ndrv_cb*)ndrv_pcb;
-    
-#if DEBUG
-    {
-        struct ndrv_cb* temp = ndrvl.nd_next;
-        /* Verify existence of pcb */
-        for (temp = ndrvl.nd_next; temp != &ndrvl; temp = temp->nd_next)
-        {
-            if (temp == np)
-                break;
-        }
-        
-        if (temp != np)
-        {
-            log(LOG_WARNING, "PF_NDRV: ndrv_get_ifp called with invalid ndrv_cb!");
-            return NULL;
-        }
-    }
-#endif
-    
-    return np->nd_if;
-}
-

 /*
  * Mark the connection as being incapable of further input.
  */
 /*
  * Mark the connection as being incapable of further input.
  */

-int
+static int

 ndrv_shutdown(struct socket *so)
 {
 ndrv_shutdown(struct socket *so)
 {

+       lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);

        socantsendmore(so);
        return 0;
 }
        socantsendmore(so);
        return 0;
 }


@@ -458,10 +406,10 @@ ndrv_shutdown(struct socket *so)
  *  to the appropriate driver.  The really tricky part
  *  is the destination address...
  */
  *  to the appropriate driver.  The really tricky part
  *  is the destination address...
  */

-int
-ndrv_send(struct socket *so, int flags, struct mbuf *m,
-         struct sockaddr *addr, struct mbuf *control,
-         struct proc *p)
+static int
+ndrv_send(struct socket *so, __unused int flags, struct mbuf *m,
+         __unused struct sockaddr *addr, struct mbuf *control,
+         __unused struct proc *p)

 {
        int error;
 
 {
        int error;
 


@@ -474,10 +422,10 @@ ndrv_send(struct socket *so, int flags, struct mbuf *m,
 }
 
 
 }
 
 

-int
+static int

 ndrv_abort(struct socket *so)
 {
 ndrv_abort(struct socket *so)
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

 
        if (np == 0)
                return EINVAL;
 
        if (np == 0)
                return EINVAL;


@@ -486,19 +434,10 @@ ndrv_abort(struct socket *so)
        return 0;
 }
 
        return 0;
 }
 

-int
-ndrv_sense(struct socket *so, struct stat *sb)
-{
-       /*
-        * stat: don't bother with a blocksize.
-        */
-       return (0);
-}
-
-int
+static int

 ndrv_sockaddr(struct socket *so, struct sockaddr **nam)
 {
 ndrv_sockaddr(struct socket *so, struct sockaddr **nam)
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

        int len;
 
        if (np == 0)
        int len;
 
        if (np == 0)


@@ -508,16 +447,19 @@ ndrv_sockaddr(struct socket *so, struct sockaddr **nam)
                return EINVAL;
 
        len = np->nd_laddr->snd_len;
                return EINVAL;
 
        len = np->nd_laddr->snd_len;

+       MALLOC(*nam, struct sockaddr *, len, M_SONAME, M_WAITOK);
+       if (*nam == NULL)
+               return ENOMEM;

        bcopy((caddr_t)np->nd_laddr, *nam,
              (unsigned)len);
        return 0;
 }
 
 
        bcopy((caddr_t)np->nd_laddr, *nam,
              (unsigned)len);
        return 0;
 }
 
 

-int
+static int

 ndrv_peeraddr(struct socket *so, struct sockaddr **nam)
 {
 ndrv_peeraddr(struct socket *so, struct sockaddr **nam)
 {

-       register struct ndrv_cb *np = sotondrvcb(so);
+       struct ndrv_cb *np = sotondrvcb(so);

        int len;
 
        if (np == 0)
        int len;
 
        if (np == 0)


@@ -527,25 +469,21 @@ ndrv_peeraddr(struct socket *so, struct sockaddr **nam)
                return ENOTCONN;
 
        len = np->nd_faddr->snd_len;
                return ENOTCONN;
 
        len = np->nd_faddr->snd_len;

+       MALLOC(*nam, struct sockaddr *, len, M_SONAME, M_WAITOK);
+       if (*nam == NULL)
+               return ENOMEM;

        bcopy((caddr_t)np->nd_faddr, *nam,
              (unsigned)len);
        return 0;
 }
 
 
        bcopy((caddr_t)np->nd_faddr, *nam,
              (unsigned)len);
        return 0;
 }
 
 

-/* Control input */
-
-void
-ndrv_ctlinput(int dummy1, struct sockaddr *dummy2, void *dummy3)
-{
-}
-

 /* Control output */
 
 /* Control output */
 

-int
+static int

 ndrv_ctloutput(struct socket *so, struct sockopt *sopt)
 {
 ndrv_ctloutput(struct socket *so, struct sockopt *sopt)
 {

-    register struct ndrv_cb *np = sotondrvcb(so);
+    struct ndrv_cb *np = sotondrvcb(so);

        int error = 0;
     
     switch(sopt->sopt_name)
        int error = 0;
     
     switch(sopt->sopt_name)


@@ -580,25 +518,11 @@ ndrv_ctloutput(struct socket *so, struct sockopt *sopt)
        return(error);
 }
 
        return(error);
 }
 

-/* Drain the queues */
-void
-ndrv_drain()
-{
-}
-
-/* Sysctl hook for NDRV */
-int
-ndrv_sysctl()
-{
-       return(0);
-}
-
-int
-ndrv_do_detach(register struct ndrv_cb *np)
+static int
+ndrv_do_detach(struct ndrv_cb *np)

 {
     struct ndrv_cb*    cur_np = NULL;
     struct socket *so = np->nd_socket;
 {
     struct ndrv_cb*    cur_np = NULL;
     struct socket *so = np->nd_socket;

-    struct ndrv_multicast*     next;

     int error = 0;
 
 #if NDRV_DEBUG
     int error = 0;
 
 #if NDRV_DEBUG


@@ -606,47 +530,41 @@ ndrv_do_detach(register struct ndrv_cb *np)
 #endif
     ndrv_remove_all_multicast(np);
     
 #endif
     ndrv_remove_all_multicast(np);
     

-    if (np->nd_tag != 0)
-    {
-        error = dlil_detach_protocol(np->nd_tag);
-        if (error)
-        {
-            log(LOG_WARNING, "NDRV ndrv_do_detach: error %d removing dl_tag %d",
-                error, np->nd_tag);
-            return error;
-        }
-    }
-    
-    /* Remove from the linked list of control blocks */
-       remque((queue_t)np);
-    
-    if (np->nd_send_tag != 0)
-    {
-        /* Check if this is the last socket attached to this interface */
-        for (cur_np = ndrvl.nd_next; cur_np != &ndrvl; cur_np = cur_np->nd_next)
-        {
-            if (cur_np->nd_family == np->nd_family &&
-                cur_np->nd_unit == np->nd_unit)
-            {
-                break;
-            }
-        }
-        
-        /* If there are no other interfaces, detach PF_NDRV from the interface */
-        if (cur_np == &ndrvl)
-        {
-            dlil_detach_protocol(np->nd_send_tag);
-        }
-    }
+    if (np->nd_if) {
+               if (np->nd_proto_family != PF_NDRV &&
+                       np->nd_proto_family != 0) {
+                       dlil_detach_protocol(np->nd_if, np->nd_proto_family);
+               }
+               
+               /* Remove from the linked list of control blocks */
+               TAILQ_REMOVE(&ndrvl, np, nd_next);
+               
+               /* Check if this is the last socket attached to this interface */
+               TAILQ_FOREACH(cur_np, &ndrvl, nd_next) {
+                       if (cur_np->nd_family == np->nd_family &&
+                               cur_np->nd_unit == np->nd_unit) {
+                               break;
+                       }
+               }
+               
+               /* If there are no other interfaces, detach PF_NDRV from the interface */
+               if (cur_np == NULL) {
+                       dlil_detach_protocol(np->nd_if, PF_NDRV);
+               }
+       } else {
+               /* Remove from the linked list of control blocks */
+               TAILQ_REMOVE(&ndrvl, np, nd_next);
+       }

     
        FREE((caddr_t)np, M_PCB);
        so->so_pcb = 0;
     
        FREE((caddr_t)np, M_PCB);
        so->so_pcb = 0;

+       so->so_flags |= SOF_PCBCLEARING;

        sofree(so);
        return error;
 }
 
        sofree(so);
        return error;
 }
 

-int
-ndrv_do_disconnect(register struct ndrv_cb *np)
+static int
+ndrv_do_disconnect(struct ndrv_cb *np)

 {
 #if NDRV_DEBUG
        kprintf("NDRV disconnect: %x\n", np);
 {
 #if NDRV_DEBUG
        kprintf("NDRV disconnect: %x\n", np);


@@ -662,15 +580,30 @@ ndrv_do_disconnect(register struct ndrv_cb *np)
        return(0);
 }
 
        return(0);
 }
 

+/* Hackery - return a string version of a decimal number */
+static char *
+sprint_d(u_int n, char *buf, int buflen)
+{      char dbuf[IFNAMSIZ];
+       char *cp = dbuf+IFNAMSIZ-1;
+
+        *cp = 0;
+        do {   buflen--;
+               cp--;
+                *cp = "0123456789"[n % 10];
+                n /= 10;
+        } while (n != 0 && buflen > 0);
+       strncpy(buf, cp, IFNAMSIZ-buflen);
+        return (cp);
+}
+

 /*
  * Try to compare a device name (q) with one of the funky ifnet
  *  device names (ifp).
  */
 /*
  * Try to compare a device name (q) with one of the funky ifnet
  *  device names (ifp).
  */

-int name_cmp(register struct ifnet *ifp, register char *q)
-{      register char *r;
-       register int len;
+static int name_cmp(struct ifnet *ifp, char *q)
+{      char *r;
+       int len;

        char buf[IFNAMSIZ];
        char buf[IFNAMSIZ];

-       static char *sprint_d();

 
        r = buf;
        len = strlen(ifp->if_name);
 
        r = buf;
        len = strlen(ifp->if_name);


@@ -683,32 +616,15 @@ int name_cmp(register struct ifnet *ifp, register char *q)
        return(strncmp(buf, q, IFNAMSIZ));
 }
 
        return(strncmp(buf, q, IFNAMSIZ));
 }
 

-/* Hackery - return a string version of a decimal number */
-static char *
-sprint_d(n, buf, buflen)
-        u_int n;
-        char *buf;
-        int buflen;
-{      char dbuf[IFNAMSIZ];
-       register char *cp = dbuf+IFNAMSIZ-1;
-
-        *cp = 0;
-        do {   buflen--;
-               cp--;
-                *cp = "0123456789"[n % 10];
-                n /= 10;
-        } while (n != 0 && buflen > 0);
-       strncpy(buf, cp, IFNAMSIZ-buflen);
-        return (cp);
-}
-
+#if 0
+//### Not used

 /*
  * When closing, dump any enqueued mbufs.
  */
 void
 /*
  * When closing, dump any enqueued mbufs.
  */
 void

-ndrv_flushq(register struct ifqueue *q)
+ndrv_flushq(struct ifqueue *q)

 {
 {

-    register struct mbuf *m;
+    struct mbuf *m;

        for (;;)
        {
                IF_DEQUEUE(q, m);
        for (;;)
        {
                IF_DEQUEUE(q, m);


@@ -719,6 +635,7 @@ ndrv_flushq(register struct ifqueue *q)
                        m_freem(m);
        }
 }
                        m_freem(m);
        }
 }

+#endif 

 
 int
 ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
 
 int
 ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)


@@ -730,7 +647,7 @@ ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
     int                                                        error = 0;
     
     /* Sanity checking */
     int                                                        error = 0;
     
     /* Sanity checking */

-    if (np->nd_tag)
+    if (np->nd_proto_family != PF_NDRV)

         return EBUSY;
     if (np->nd_if == NULL)
         return EINVAL;
         return EBUSY;
     if (np->nd_if == NULL)
         return EINVAL;


@@ -764,7 +681,7 @@ ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
     if (error == 0)
     {
         /* Copy the ndrv demux array from userland */
     if (error == 0)
     {
         /* Copy the ndrv demux array from userland */

-        error = copyin(ndrvSpec.demux_list, ndrvDemux,
+        error = copyin(CAST_USER_ADDR_T(ndrvSpec.demux_list), ndrvDemux,

                     ndrvSpec.demux_count * sizeof(struct ndrv_demux_desc));
         ndrvSpec.demux_list = ndrvDemux;
     }
                     ndrvSpec.demux_count * sizeof(struct ndrv_demux_desc));
         ndrvSpec.demux_list = ndrvDemux;
     }


@@ -779,6 +696,7 @@ ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
         dlilSpec.interface_family = np->nd_family;
         dlilSpec.unit_number = np->nd_unit;
         dlilSpec.input = ndrv_input;
         dlilSpec.interface_family = np->nd_family;
         dlilSpec.unit_number = np->nd_unit;
         dlilSpec.input = ndrv_input;

+               dlilSpec.event = ndrv_event;

         dlilSpec.protocol_family = ndrvSpec.protocol_family;
         
         for (demuxOn = 0; demuxOn < ndrvSpec.demux_count; demuxOn++)
         dlilSpec.protocol_family = ndrvSpec.protocol_family;
         
         for (demuxOn = 0; demuxOn < ndrvSpec.demux_count; demuxOn++)


@@ -796,7 +714,9 @@ ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
     if (error == 0)
     {
         /* We've got all our ducks lined up...lets attach! */
     if (error == 0)
     {
         /* We've got all our ducks lined up...lets attach! */

-        error = dlil_attach_protocol(&dlilSpec, &np->nd_tag);
+        error = dlil_attach_protocol(&dlilSpec);
+        if (error == 0)
+               np->nd_proto_family = dlilSpec.protocol_family;

     }
     
     /* Free any memory we've allocated */
     }
     
     /* Free any memory we've allocated */


@@ -837,32 +757,27 @@ ndrv_delspec(struct ndrv_cb *np)
 {
     int result = 0;
     
 {
     int result = 0;
     

-    if (np->nd_tag == 0)
+    if (np->nd_proto_family == PF_NDRV ||
+       np->nd_proto_family == 0)

         return EINVAL;
     
     /* Detach the protocol */
         return EINVAL;
     
     /* Detach the protocol */

-    result = dlil_detach_protocol(np->nd_tag);
-    if (result == 0)
-    {
-        np->nd_tag = 0;
-    }
+    result = dlil_detach_protocol(np->nd_if, np->nd_proto_family);
+    np->nd_proto_family = PF_NDRV;

     
        return result;
 }
 
 struct ndrv_cb *
     
        return result;
 }
 
 struct ndrv_cb *

-ndrv_find_tag(unsigned int tag)
+ndrv_find_inbound(struct ifnet *ifp, u_long protocol)

 {
     struct ndrv_cb* np;
 {
     struct ndrv_cb* np;

-       int i;
-    
-    if (tag == 0)
-        return NULL;
+       
+       if (protocol == PF_NDRV) return NULL;

     
     

-    for (np = ndrvl.nd_next; np != NULL; np = np->nd_next)
-    {
-        if (np->nd_tag == tag)
-        {
+    TAILQ_FOREACH(np, &ndrvl, nd_next) {
+        if (np->nd_proto_family == protocol &&
+               np->nd_if == ifp) {

             return np;
         }
     }
             return np;
         }
     }


@@ -870,7 +785,7 @@ ndrv_find_tag(unsigned int tag)
        return NULL;
 }
 
        return NULL;
 }
 

-void ndrv_dominit()
+static void ndrv_dominit(void)

 {
         static int ndrv_dominited = 0;
 
 {
         static int ndrv_dominited = 0;
 


@@ -879,55 +794,22 @@ void ndrv_dominit()
                 ndrv_dominited = 1;
 }
 
                 ndrv_dominited = 1;
 }
 

-void
-ndrv_read_event(struct socket* so, caddr_t ref, int waitf)
-{
-    // Read an event
-    struct mbuf *m = NULL;
-    struct kern_event_msg *msg;
-    struct uio auio = {0};
-    int        result = 0;
-    int flags = 0;
-    
-    // Get the data
-    auio.uio_resid = 1000000; // large number to get all of the data
-    flags = MSG_DONTWAIT;
-    result = soreceive(so, (struct sockaddr**)NULL, &auio, &m,
-        (struct mbuf**)NULL, &flags);
-    if (result != 0 || m == NULL)
-        return;
-    
-    // cast the mbuf to a kern_event_msg
-    // this is dangerous, doesn't handle linked mbufs
-    msg = mtod(m, struct kern_event_msg*);
-    
-    // check for detaches, assume even filtering is working
-    if (msg->event_code == KEV_DL_IF_DETACHING ||
-        msg->event_code == KEV_DL_IF_DETACHED)
-    {
-        struct net_event_data *ev_data;
-        ev_data = (struct net_event_data*)msg->event_data;
-        ndrv_handle_ifp_detach(ev_data->if_family, ev_data->if_unit);
-    }
-    
-    m_free(m);
-}
-
-void
+static void

 ndrv_handle_ifp_detach(u_long family, short unit)
 {
     struct ndrv_cb* np;
 ndrv_handle_ifp_detach(u_long family, short unit)
 {
     struct ndrv_cb* np;

-    u_long                     dl_tag;
+    struct ifnet       *ifp = NULL;
+    struct socket *so;

     
     /* Find all sockets using this interface. */
     
     /* Find all sockets using this interface. */

-    for (np = ndrvl.nd_next; np != &ndrvl; np = np->nd_next)
-    {
+    TAILQ_FOREACH(np, &ndrvl, nd_next) {

         if (np->nd_family == family &&
             np->nd_unit == unit)
         {
             /* This cb is using the detaching interface, but not for long. */
             /* Let the protocol go */
         if (np->nd_family == family &&
             np->nd_unit == unit)
         {
             /* This cb is using the detaching interface, but not for long. */
             /* Let the protocol go */

-            if (np->nd_tag != 0)
+            ifp = np->nd_if;
+            if (np->nd_proto_family != 0)

                 ndrv_delspec(np);
             
             /* Delete the multicasts first */
                 ndrv_delspec(np);
             
             /* Delete the multicasts first */


@@ -937,18 +819,19 @@ ndrv_handle_ifp_detach(u_long family, short unit)
             np->nd_if = NULL;
             np->nd_unit = 0;
             np->nd_family = 0;
             np->nd_if = NULL;
             np->nd_unit = 0;
             np->nd_family = 0;

-            np->nd_send_tag = 0;
-            
+           
+                 so = np->nd_socket; 

             /* Make sure sending returns an error */
             /* Is this safe? Will we drop the funnel? */
             /* Make sure sending returns an error */
             /* Is this safe? Will we drop the funnel? */

-            socantsendmore(np->nd_socket);
-            socantrcvmore(np->nd_socket);
+                 lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);
+            socantsendmore(so);
+            socantrcvmore(so);

         }
     }
     
     /* Unregister our protocol */
         }
     }
     
     /* Unregister our protocol */

-    if (dlil_find_dltag(family, unit, PF_NDRV, &dl_tag) == 0) {
-        dlil_detach_protocol(dl_tag);
+    if (ifp) {
+        dlil_detach_protocol(ifp, PF_NDRV);

     }
 }
 
     }
 }
 


@@ -983,7 +866,7 @@ ndrv_do_add_multicast(struct ndrv_cb *np, struct sockopt *sopt)
     if (result == 0)
     {
         // Try adding the multicast
     if (result == 0)
     {
         // Try adding the multicast

-        result = if_addmulti(np->nd_if, &ndrv_multi->addr, NULL);
+        result = if_addmulti(np->nd_if, &ndrv_multi->addr, &ndrv_multi->ifma);

     }
     
     if (result == 0)
     }
     
     if (result == 0)


@@ -1039,7 +922,7 @@ ndrv_do_remove_multicast(struct ndrv_cb *np, struct sockopt *sopt)
     if (result == 0)
     {
         // Try deleting the multicast
     if (result == 0)
     {
         // Try deleting the multicast

-        result = if_delmulti(np->nd_if, &ndrv_entry->addr);
+        result = if_delmultiaddr(ndrv_entry->ifma, 0);

     }
     
     if (result == 0)
     }
     
     if (result == 0)


@@ -1047,6 +930,8 @@ ndrv_do_remove_multicast(struct ndrv_cb *np, struct sockopt *sopt)
         // Remove from our linked list
         struct ndrv_multiaddr* cur = np->nd_multiaddrs;
         
         // Remove from our linked list
         struct ndrv_multiaddr* cur = np->nd_multiaddrs;
         

+        ifma_release(ndrv_entry->ifma);
+        

         if (cur == ndrv_entry)
         {
             np->nd_multiaddrs = cur->next;
         if (cur == ndrv_entry)
         {
             np->nd_multiaddrs = cur->next;


@@ -1101,7 +986,8 @@ ndrv_remove_all_multicast(struct ndrv_cb* np)
             cur = np->nd_multiaddrs;
             np->nd_multiaddrs = cur->next;
             
             cur = np->nd_multiaddrs;
             np->nd_multiaddrs = cur->next;
             

-            if_delmulti(np->nd_if, &cur->addr);
+            if_delmultiaddr(cur->ifma, 0);
+            ifma_release(cur->ifma);

             FREE(cur, M_IFADDR);
         }
     }
             FREE(cur, M_IFADDR);
         }
     }


@@ -1109,17 +995,19 @@ ndrv_remove_all_multicast(struct ndrv_cb* np)
 
 struct pr_usrreqs ndrv_usrreqs = {
        ndrv_abort, pru_accept_notsupp, ndrv_attach, ndrv_bind,
 
 struct pr_usrreqs ndrv_usrreqs = {
        ndrv_abort, pru_accept_notsupp, ndrv_attach, ndrv_bind,

-       ndrv_connect, pru_connect2_notsupp, ndrv_control, ndrv_detach,
+       ndrv_connect, pru_connect2_notsupp, pru_control_notsupp, ndrv_detach,

        ndrv_disconnect, pru_listen_notsupp, ndrv_peeraddr, pru_rcvd_notsupp,
        ndrv_disconnect, pru_listen_notsupp, ndrv_peeraddr, pru_rcvd_notsupp,

-       pru_rcvoob_notsupp, ndrv_send, ndrv_sense, ndrv_shutdown,
-       ndrv_sockaddr, sosend, soreceive, sopoll
+       pru_rcvoob_notsupp, ndrv_send, pru_sense_null, ndrv_shutdown,
+       ndrv_sockaddr, sosend, soreceive, pru_sopoll_notsupp

 };
 
 struct protosw ndrvsw =
 {      SOCK_RAW, &ndrvdomain, NDRVPROTO_NDRV, PR_ATOMIC|PR_ADDR,
 };
 
 struct protosw ndrvsw =
 {      SOCK_RAW, &ndrvdomain, NDRVPROTO_NDRV, PR_ATOMIC|PR_ADDR,

-    0, ndrv_output, ndrv_ctlinput, ndrv_ctloutput,
-    0, ndrv_init, 0, 0,
-    ndrv_drain, ndrv_sysctl, &ndrv_usrreqs
+       0, ndrv_output, 0, ndrv_ctloutput,
+       0, 0, 0, 0,
+       0, 0,
+       &ndrv_usrreqs,
+       0, 0, 0

 };
 
 struct domain ndrvdomain =
 };
 
 struct domain ndrvdomain =