/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1997-2007 Apple Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License"). You may not use this file except in compliance with the
- * License. Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
*
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
-/* Copyright (c) 1997, 1998 Apple Computer, Inc. All Rights Reserved */
/*
* @(#)ndrv.c 1.1 (MacOSX) 6/10/43
* Justin Walker, 970604
/*
* PF_NDRV allows raw access to a specified network device, directly
* with a socket. Expected use involves a socket option to request
- * protocol packets. This lets ndrv_output() call dlil_output(), and
+ * protocol packets. This lets ndrv_output() call ifnet_output(), and
* lets DLIL find the proper recipient for incoming packets.
* The purpose here is for user-mode protocol implementation.
* Note that "pure raw access" will still be accomplished with BPF.
* strange protocol support. One of the main ones will be the
* BlueBox/Classic Shared IP Address support.
*/
+#include <mach/mach_types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <kern/queue.h>
-#include <net/if.h>
-#include <net/netisr.h>
+#include <net/ndrv.h>
#include <net/route.h>
#include <net/if_llc.h>
#include <net/if_dl.h>
#include <net/if_types.h>
+#include <net/ndrv_var.h>
#include <net/dlil.h>
-#include "ndrv.h"
#if INET
#include <netinet/in.h>
#endif
#include <netinet/if_ether.h>
-#if NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-
-#if ISO
-#include <netiso/argo_debug.h>
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#include <netiso/iso_snpac.h>
-#endif
-
-#if LLC
-#include <netccitt/dll.h>
-#include <netccitt/llc_var.h>
-#endif
-
#include <machine/spl.h>
-int ndrv_do_detach(struct ndrv_cb *);
-int ndrv_do_disconnect(struct ndrv_cb *);
+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_ifnet_demux(struct ndrv_demux_desc* ndrv, struct ifnet_demux_desc* ifdemux);
+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 void ndrv_remove_all_multicast(struct ndrv_cb *np);
+static void ndrv_dominit(void) __attribute__((section("__TEXT, initcode")));
unsigned long ndrv_sendspace = NDRVSNDQ;
unsigned long ndrv_recvspace = NDRVRCVQ;
-struct ndrv_cb ndrvl; /* Head of controlblock list */
-
-/* To handle input, need to map tag to ndrv_cb */
-struct ndrv_tag_map
-{ unsigned int tm_tag; /* Tag in use */
- struct ndrv_cb *tm_np; /* Owning device */
- struct dlil_demux_desc *tm_dm; /* Our local copy */
-};
-
-struct ndrv_tag_map *ndrv_tags;
-#define TAG_MAP_COUNT 10
-int tag_map_count;
-
-struct domain ndrvdomain;
-extern struct protosw ndrvsw[];
+TAILQ_HEAD(, ndrv_cb) ndrvl = TAILQ_HEAD_INITIALIZER(ndrvl);
+extern struct domain ndrvdomain;
+extern struct protosw ndrvsw;
+extern lck_mtx_t *domain_proto_mtx;
/*
- * 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()
-{
- ndrvl.nd_next = ndrvl.nd_prev = &ndrvl;
-}
+#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.
*/
-int
-ndrv_output(register struct mbuf *m, register struct socket *so)
-{ register struct ndrv_cb *np = sotondrvcb(so);
- register struct ifnet *ifp = np->nd_if;
- int s, error;
- extern void kprintf(const char *, ...);
+static int
+ndrv_output(struct mbuf *m, struct socket *so)
+{
+ struct ndrv_cb *np = sotondrvcb(so);
+ struct ifnet *ifp = np->nd_if;
+ int result = 0;
#if NDRV_DEBUG
kprintf("NDRV output: %x, %x, %x\n", m, so, np);
if ((m->m_flags&M_PKTHDR) == 0)
return(EINVAL);
+ /* Unlock before calling ifnet_output */
+ socket_unlock(so, 0);
+
/*
- * Can't do multicast accounting because we don't know
- * (a) if our interface does multicast; and
- * (b) what a multicast address looks like
- */
- s = splimp();
-
- /*
- * Can't call DLIL to do the job - we don't have a tag
- * and we aren't really a protocol
- */
-
- (*ifp->if_output)(ifp, m);
- splx(s);
- return (0);
+ * Call DLIL if we can. DLIL is much safer than calling the
+ * ifp directly.
+ */
+ result = ifnet_output_raw(ifp, np->nd_proto_family, m);
+
+ socket_lock(so, 0);
+
+ return (result);
}
-int
-ndrv_input(struct mbuf *m,
- char *frame_header,
- struct ifnet *ifp,
- u_long dl_tag,
- int sync_ok)
-{ int s;
+/* Our input routine called from DLIL */
+static errno_t
+ndrv_input(
+ ifnet_t ifp,
+ protocol_family_t proto_family,
+ mbuf_t m,
+ char *frame_header)
+{
struct socket *so;
- struct sockaddr_dl ndrvsrc = {sizeof (struct sockaddr_dl), AF_NDRV};
- register struct ndrv_cb *np;
- extern struct ndrv_cb *ndrv_find_tag(unsigned int);
+ struct sockaddr_dl ndrvsrc;
+ struct ndrv_cb *np;
+ int error = 0;
+ ndrvsrc.sdl_len = sizeof (struct sockaddr_dl);
+ ndrvsrc.sdl_family = AF_NDRV;
+ ndrvsrc.sdl_index = 0;
- /* move packet from if queue to socket */
+ /* move packet from if queue to socket */
/* Should be media-independent */
- ndrvsrc.sdl_type = IFT_ETHER;
- ndrvsrc.sdl_nlen = 0;
- ndrvsrc.sdl_alen = 6;
- ndrvsrc.sdl_slen = 0;
- bcopy(frame_header, &ndrvsrc.sdl_data, 6);
-
- s = splnet();
- np = ndrv_find_tag(dl_tag);
+ ndrvsrc.sdl_type = IFT_ETHER;
+ ndrvsrc.sdl_nlen = 0;
+ ndrvsrc.sdl_alen = 6;
+ ndrvsrc.sdl_slen = 0;
+ bcopy(frame_header, &ndrvsrc.sdl_data, 6);
+
+ np = ndrv_find_inbound(ifp, proto_family);
if (np == NULL)
- { splx(s);
+ {
return(ENOENT);
}
so = np->nd_socket;
+ /* prepend the frame header */
+ m = m_prepend(m, ifnet_hdrlen(ifp), M_NOWAIT);
+ if (m == NULL)
+ return EJUSTRETURN;
+ bcopy(frame_header, m->m_data, ifnet_hdrlen(ifp));
+
+ 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,
- m, (struct mbuf *)0) == 0)
- { /* yes, sbappendaddr returns zero if the sockbuff is full... */
- splx(s);
- return(ENOMEM);
- } else
+ m, (struct mbuf *)0, &error) != 0) {
sorwakeup(so);
- splx(s);
- return(0);
-}
-
-int
-ndrv_ioctl(unsigned long dl_tag,
- struct ifnet *ifp,
- unsigned long command,
- caddr_t data)
-{
- if (ifp)
- return((*ifp->if_ioctl)(ifp, command, data));
-}
-
-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
*/
-int
-ndrv_attach(struct socket *so, int proto, struct proc *p)
-{ int error;
- register struct ndrv_cb *np = sotondrvcb(so);
+static int
+ndrv_attach(struct socket *so, int proto, __unused struct proc *p)
+{
+ int error;
+ struct ndrv_cb *np = sotondrvcb(so);
if ((so->so_state & SS_PRIV) == 0)
return(EPERM);
#if NDRV_DEBUG
kprintf("NDRV attach: %x, %x, %x\n", so, proto, np);
#endif
+
+ if ((error = soreserve(so, ndrv_sendspace, ndrv_recvspace)))
+ return(error);
+
MALLOC(np, struct ndrv_cb *, sizeof(*np), M_PCB, M_WAITOK);
if (np == NULL)
return (ENOMEM);
+ so->so_pcb = (caddr_t)np;
+ bzero(np, sizeof(*np));
#if NDRV_DEBUG
kprintf("NDRV attach: %x, %x, %x\n", so, proto, np);
#endif
- if ((so->so_pcb = (caddr_t)np))
- bzero(np, sizeof(*np));
- else
- return(ENOBUFS);
- if ((error = soreserve(so, ndrv_sendspace, ndrv_recvspace)))
- return(error);
TAILQ_INIT(&np->nd_dlist);
np->nd_signature = NDRV_SIGNATURE;
np->nd_socket = so;
np->nd_proto.sp_family = so->so_proto->pr_domain->dom_family;
np->nd_proto.sp_protocol = proto;
- insque((queue_t)np, (queue_t)&ndrvl);
+ np->nd_if = NULL;
+ np->nd_proto_family = 0;
+ np->nd_family = 0;
+ np->nd_unit = 0;
+ TAILQ_INSERT_TAIL(&ndrvl, np, nd_next);
return(0);
}
* Flush data or not depending on the options.
*/
-int
+static int
ndrv_detach(struct socket *so)
{
- register struct ndrv_cb *np = sotondrvcb(so);
+ struct ndrv_cb *np = sotondrvcb(so);
if (np == 0)
return EINVAL;
* 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)
return EINVAL;
if (np->nd_faddr)
return EISCONN;
-
- bcopy((caddr_t) nam, (caddr_t) np->nd_faddr, sizeof(struct sockaddr_ndrv));
+
+ /* Allocate memory to store the remote address */
+ MALLOC(np->nd_faddr, struct sockaddr_ndrv*,
+ nam->sa_len, M_IFADDR, M_WAITOK);
+ if (result != 0)
+ return result;
+ if (np->nd_faddr == NULL)
+ return ENOMEM;
+
+ bcopy((caddr_t) nam, (caddr_t) np->nd_faddr, nam->sa_len);
soisconnected(so);
return 0;
}
+static void
+ndrv_event(struct ifnet *ifp, __unused protocol_family_t protocol,
+ const 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) {
+ lck_mtx_assert(ndrvdomain.dom_mtx, LCK_MTX_ASSERT_NOTOWNED);
+ lck_mtx_lock(ndrvdomain.dom_mtx);
+ ndrv_handle_ifp_detach(ifnet_family(ifp), ifnet_unit(ifp));
+ lck_mtx_unlock(ndrvdomain.dom_mtx);
+ }
+}
+
+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 and make it ours.
+ * Here's where we latch onto the driver.
*/
-int
-ndrv_bind(struct socket *so, struct sockaddr *nam, 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 *);
-
- if TAILQ_EMPTY(&ifnet)
+static int
+ndrv_bind(struct socket *so, struct sockaddr *nam, __unused struct proc *p)
+{
+ struct sockaddr_ndrv *sa = (struct sockaddr_ndrv *) nam;
+ char *dname;
+ struct ndrv_cb *np;
+ struct ifnet *ifp;
+ int result;
+
+ if TAILQ_EMPTY(&ifnet_head)
return(EADDRNOTAVAIL); /* Quick sanity check */
np = sotondrvcb(so);
if (np == 0)
if (np->nd_laddr == NULL)
return(ENOMEM);
bcopy((caddr_t) sa, (caddr_t) np->nd_laddr, sizeof(struct sockaddr_ndrv));
- dname = sa->snd_name;
+ dname = (char *) sa->snd_name;
if (*dname == '\0')
return(EINVAL);
#if NDRV_DEBUG
* 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;
}
+ ifnet_head_done();
if (ifp == NULL)
return(EADDRNOTAVAIL);
+
+ // PPP doesn't support PF_NDRV.
+ if (ifnet_family(ifp) != APPLE_IF_FAM_PPP)
+ {
+ /* NDRV on this interface */
+ struct ifnet_attach_proto_param ndrv_proto;
+ result = 0;
+ bzero(&ndrv_proto, sizeof(ndrv_proto));
+ ndrv_proto.event = ndrv_event;
+
+ /* We aren't worried about double attaching, that should just return an error */
+ socket_unlock(so, 0);
+ result = ifnet_attach_protocol(ifp, PF_NDRV, &ndrv_proto);
+ socket_lock(so, 0);
+ 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 = ifnet_family(ifp);
+ np->nd_unit = ifnet_unit(ifp);
+
return(0);
}
-int
+static int
ndrv_disconnect(struct socket *so)
{
- register struct ndrv_cb *np = sotondrvcb(so);
+ struct ndrv_cb *np = sotondrvcb(so);
if (np == 0)
return EINVAL;
/*
* Mark the connection as being incapable of further input.
*/
-int
+static int
ndrv_shutdown(struct socket *so)
{
+ lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);
socantsendmore(so);
return 0;
}
* 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
+static int
ndrv_abort(struct socket *so)
{
- register struct ndrv_cb *np = sotondrvcb(so);
+ struct ndrv_cb *np = sotondrvcb(so);
if (np == 0)
return EINVAL;
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)
{
- register struct ndrv_cb *np = sotondrvcb(so);
+ struct ndrv_cb *np = sotondrvcb(so);
int len;
if (np == 0)
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;
}
-int
+static int
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)
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;
}
-/* Control input */
-
-void
-ndrv_ctlinput(int dummy1, struct sockaddr *dummy2, void *dummy3)
-{
-}
-
/* Control output */
-int
+static int
ndrv_ctloutput(struct socket *so, struct sockopt *sopt)
-{ register struct ndrv_cb *np = sotondrvcb(so);
- struct ndrv_descr nd;
- int count = 0, error = 0;
- int ndrv_getspec(struct ndrv_cb *,
- struct sockopt *,
- struct ndrv_descr *);
- int ndrv_setspec(struct ndrv_cb *, struct ndrv_descr *);
- int ndrv_delspec(struct ndrv_cb *, struct ndrv_descr *);
-
- if (sopt->sopt_name != NDRV_DMXSPECCNT)
- error = sooptcopyin(sopt, &nd, sizeof nd, sizeof nd);
- if (error == 0)
- { switch(sopt->sopt_name)
- { case NDRV_DMXSPEC: /* Get/Set(Add) spec list */
- if (sopt->sopt_dir == SOPT_GET)
- error = ndrv_getspec(np, sopt, &nd);
- else
- error = ndrv_setspec(np, &nd);
- break;
- case NDRV_DELDMXSPEC: /* Delete specified specs */
- error = ndrv_delspec(np, &nd);
- break;
- case NDRV_DMXSPECCNT: /* How many are in the list */
- count = np->nd_descrcnt;
- error = sooptcopyout(sopt, &count, sizeof count);
- break;
- }
- }
+{
+ struct ndrv_cb *np = sotondrvcb(so);
+ int error = 0;
+
+ switch(sopt->sopt_name)
+ {
+ case NDRV_DELDMXSPEC: /* Delete current spec */
+ /* Verify no parameter was passed */
+ if (sopt->sopt_val != 0 || sopt->sopt_valsize != 0) {
+ /*
+ * We don't support deleting a specific demux, it's
+ * all or nothing.
+ */
+ return EINVAL;
+ }
+ error = ndrv_delspec(np);
+ break;
+ case NDRV_SETDMXSPEC: /* Set protocol spec */
+ error = ndrv_setspec(np, sopt);
+ break;
+ case NDRV_ADDMULTICAST:
+ error = ndrv_do_add_multicast(np, sopt);
+ break;
+ case NDRV_DELMULTICAST:
+ error = ndrv_do_remove_multicast(np, sopt);
+ break;
+ default:
+ error = ENOTSUP;
+ }
#ifdef NDRV_DEBUG
log(LOG_WARNING, "NDRV CTLOUT: %x returns %d\n", sopt->sopt_name,
error);
return(error);
}
-/* Drain the queues */
-void
-ndrv_drain()
+static int
+ndrv_do_detach(struct ndrv_cb *np)
{
-}
-
-/* Sysctl hook for NDRV */
-int
-ndrv_sysctl()
-{
- return(0);
-}
-
-int
-ndrv_do_detach(register struct ndrv_cb *np)
-{ register struct socket *so = np->nd_socket;
- int ndrv_dump_descr(struct ndrv_cb *);
+ struct ndrv_cb* cur_np = NULL;
+ struct socket *so = np->nd_socket;
+ int error = 0;
+ struct ifnet * ifp;
#if NDRV_DEBUG
kprintf("NDRV detach: %x, %x\n", so, np);
#endif
- if (!TAILQ_EMPTY(&np->nd_dlist))
- ndrv_dump_descr(np);
-
- remque((queue_t)np);
+ ndrv_remove_all_multicast(np);
+
+ ifp = np->nd_if;
+ /* Remove from the linked list of control blocks */
+ TAILQ_REMOVE(&ndrvl, np, nd_next);
+ if (ifp != NULL) {
+ u_long proto_family = np->nd_proto_family;
+
+ if (proto_family != PF_NDRV && proto_family != 0) {
+ socket_unlock(so, 0);
+ ifnet_detach_protocol(ifp, proto_family);
+ socket_lock(so, 0);
+ }
+
+ /* 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) {
+ socket_unlock(so, 0);
+ ifnet_detach_protocol(ifp, PF_NDRV);
+ socket_lock(so, 0);
+ }
+ }
+ if (np->nd_laddr != NULL) {
+ FREE((caddr_t)np->nd_laddr, M_IFADDR);
+ np->nd_laddr = NULL;
+ }
FREE((caddr_t)np, M_PCB);
so->so_pcb = 0;
+ so->so_flags |= SOF_PCBCLEARING;
sofree(so);
- return(0);
+ return error;
}
-int
-ndrv_do_disconnect(register struct ndrv_cb *np)
+static int
+ndrv_do_disconnect(struct ndrv_cb *np)
{
+ struct socket * so = np->nd_socket;
#if NDRV_DEBUG
kprintf("NDRV disconnect: %x\n", np);
#endif
if (np->nd_faddr)
- { m_freem(dtom(np->nd_faddr));
+ {
+ FREE(np->nd_faddr, M_IFADDR);
np->nd_faddr = 0;
}
- if (np->nd_socket->so_state & SS_NOFDREF)
+ if (so->so_state & SS_NOFDREF)
ndrv_do_detach(np);
- soisdisconnected(np->nd_socket);
+ soisdisconnected(so);
return(0);
}
-/*
- * 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;
- char buf[IFNAMSIZ];
- static char *sprint_d();
-
- r = buf;
- len = strlen(ifp->if_name);
- strncpy(r, ifp->if_name, IFNAMSIZ);
- r += len;
- (void)sprint_d(ifp->if_unit, r, IFNAMSIZ-(r-buf));
-#if NDRV_DEBUG
- kprintf("Comparing %s, %s\n", buf, q);
-#endif
- 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;
+sprint_d(u_int n, char *buf, int buflen)
{ char dbuf[IFNAMSIZ];
- register char *cp = dbuf+IFNAMSIZ-1;
+ char *cp = dbuf+IFNAMSIZ-1;
*cp = 0;
do { buflen--;
return (cp);
}
+/*
+ * Try to compare a device name (q) with one of the funky ifnet
+ * device names (ifp).
+ */
+static int name_cmp(struct ifnet *ifp, char *q)
+{ char *r;
+ int len;
+ char buf[IFNAMSIZ];
+
+ r = buf;
+ len = strlen(ifnet_name(ifp));
+ strncpy(r, ifnet_name(ifp), IFNAMSIZ);
+ r += len;
+ (void)sprint_d(ifnet_unit(ifp), r, IFNAMSIZ-(r-buf));
+#if NDRV_DEBUG
+ kprintf("Comparing %s, %s\n", buf, q);
+#endif
+ return(strncmp(buf, q, IFNAMSIZ));
+}
+
+#if 0
+//### Not used
/*
* When closing, dump any enqueued mbufs.
*/
void
-ndrv_flushq(register struct ifqueue *q)
-{ register struct mbuf *m;
- register int s;
+ndrv_flushq(struct ifqueue *q)
+{
+ struct mbuf *m;
for (;;)
- { s = splimp();
+ {
IF_DEQUEUE(q, m);
if (m == NULL)
break;
IF_DROP(q);
- splx(s);
if (m)
m_freem(m);
}
- splx(s);
}
+#endif
int
-ndrv_getspec(struct ndrv_cb *np,
- struct sockopt *sopt,
- struct ndrv_descr *nd)
-{ struct dlil_demux_desc *mp, *mp1;
- int i, k, error = 0;
-
- /* Compute # structs to copy */
- i = k = min(np->nd_descrcnt,
- (nd->nd_len / sizeof (struct dlil_demux_desc)));
- mp = (struct dlil_demux_desc *)nd->nd_buf;
- TAILQ_FOREACH(mp1, &np->nd_dlist, next)
- { if (k-- == 0)
- break;
- error = copyout(mp1, mp++, sizeof (struct dlil_demux_desc));
- if (error)
- break;
+ndrv_setspec(struct ndrv_cb *np, struct sockopt *sopt)
+{
+ struct ifnet_attach_proto_param proto_param;
+ struct ndrv_protocol_desc ndrvSpec;
+ struct ndrv_demux_desc* ndrvDemux = NULL;
+ int error = 0;
+ struct socket * so = np->nd_socket;
+ user_addr_t user_addr;
+
+ /* Sanity checking */
+ if (np->nd_proto_family != PF_NDRV)
+ return EBUSY;
+ if (np->nd_if == NULL)
+ return EINVAL;
+
+ /* Copy the ndrvSpec */
+ if (proc_is64bit(current_proc())) {
+ struct ndrv_protocol_desc64 ndrvSpec64;
+
+ if (sopt->sopt_valsize != sizeof(ndrvSpec64))
+ return EINVAL;
+
+ error = sooptcopyin(sopt, &ndrvSpec64, sizeof(ndrvSpec64), sizeof(ndrvSpec64));
+ if (error != 0)
+ return error;
+
+ ndrvSpec.version = ndrvSpec64.version;
+ ndrvSpec.protocol_family = ndrvSpec64.protocol_family;
+ ndrvSpec.demux_count = ndrvSpec64.demux_count;
+
+ user_addr = ndrvSpec64.demux_list;
}
+ else {
+ if (sopt->sopt_valsize != sizeof(ndrvSpec))
+ return EINVAL;
+
+ error = sooptcopyin(sopt, &ndrvSpec, sizeof(ndrvSpec), sizeof(ndrvSpec));
+ if (error != 0)
+ return error;
+
+ user_addr = CAST_USER_ADDR_T(ndrvSpec.demux_list);
+ }
+
+ /* Verify the parameter */
+ if (ndrvSpec.version > NDRV_PROTOCOL_DESC_VERS)
+ return ENOTSUP; // version is too new!
+ else if (ndrvSpec.version < 1)
+ return EINVAL; // version is not valid
+
+ bzero(&proto_param, sizeof(proto_param));
+ proto_param.demux_count = ndrvSpec.demux_count;
+
+ /* Allocate storage for demux array */
+ MALLOC(ndrvDemux, struct ndrv_demux_desc*, proto_param.demux_count *
+ sizeof(struct ndrv_demux_desc), M_TEMP, M_WAITOK);
+ if (ndrvDemux == NULL)
+ return ENOMEM;
+
+ /* Allocate enough ifnet_demux_descs */
+ MALLOC(proto_param.demux_array, struct ifnet_demux_desc*,
+ sizeof(*proto_param.demux_array) * ndrvSpec.demux_count,
+ M_TEMP, M_WAITOK);
+ if (proto_param.demux_array == NULL)
+ error = ENOMEM;
+
if (error == 0)
- { nd->nd_len = i * (sizeof (struct dlil_demux_desc));
- error = sooptcopyout(sopt, nd, sizeof (*nd));
+ {
+ /* Copy the ndrv demux array from userland */
+ error = copyin(user_addr, ndrvDemux,
+ ndrvSpec.demux_count * sizeof(struct ndrv_demux_desc));
+ ndrvSpec.demux_list = ndrvDemux;
}
- return(error);
-}
-
-/*
- * Install a protocol descriptor, making us a protocol handler.
- * We expect the client to handle all output tasks (we get fully
- * formed frames from the client and hand them to the driver
- * directly). The reason we register is to get those incoming
- * frames. We do it as a protocol handler because the network layer
- * already knows how find the ones we want, so there's no need to
- * duplicate effort.
- * Since this mechanism is mostly for user mode, most of the procedures
- * to be registered will be null.
- * Note that we jam the pair (PF_XXX, native_type) into the native_type
- * field of the demux descriptor. Yeah, it's a hack.
- */
-int
-ndrv_setspec(struct ndrv_cb *np, struct ndrv_descr *nd)
-{ struct dlil_demux_desc *mp, *mp1;
- int i = 0, error = 0, j;
- unsigned long value;
- int *native_values;
- struct dlil_proto_reg_str proto_spec;
- int ndrv_add_descr(struct ndrv_cb *, struct dlil_proto_reg_str *);
-
- bzero((caddr_t)&proto_spec, sizeof (proto_spec));
- i = nd->nd_len / (sizeof (struct dlil_demux_desc)); /* # elts */
- MALLOC(native_values,int *, i * sizeof (int), M_TEMP, M_WAITOK);
- if (native_values == NULL)
- return (ENOMEM);
- mp = (struct dlil_demux_desc *)nd->nd_buf;
- for (j = 0; j++ < i;)
- { MALLOC(mp1, struct dlil_demux_desc *,
- sizeof (struct dlil_demux_desc), M_PCB, M_WAITOK);
- if (mp1 == NULL)
- { error = ENOBUFS;
- break;
+
+ if (error == 0)
+ {
+ /* At this point, we've at least got enough bytes to start looking around */
+ u_long demuxOn = 0;
+
+ proto_param.demux_count = ndrvSpec.demux_count;
+ proto_param.input = ndrv_input;
+ proto_param.event = ndrv_event;
+
+ for (demuxOn = 0; demuxOn < ndrvSpec.demux_count; demuxOn++)
+ {
+ /* Convert an ndrv_demux_desc to a ifnet_demux_desc */
+ error = ndrv_to_ifnet_demux(&ndrvSpec.demux_list[demuxOn],
+ &proto_param.demux_array[demuxOn]);
+ if (error)
+ break;
}
- error = copyin(mp++, mp1, sizeof (struct dlil_demux_desc));
- if (error)
- break;
- TAILQ_INSERT_TAIL(&np->nd_dlist, mp1, next);
- value = (unsigned long)mp1->native_type;
- native_values[j] = (unsigned short)value;
- mp1->native_type = (char *)&native_values[j];
- proto_spec.protocol_family = (unsigned char)(value>>16); /* Oy! */
- proto_spec.interface_family = np->nd_if->if_family;
- proto_spec.unit_number = np->nd_if->if_unit;
- /* Our input */
- proto_spec.input = ndrv_input;
- proto_spec.pre_output = NULL;
- /* No event/offer functionality needed */
- proto_spec.event = NULL;
- proto_spec.offer = NULL;
- proto_spec.ioctl = ndrv_ioctl; /* ??? */
- /* What exactly does this do again? */
- proto_spec.default_proto = 0;
-
- np->nd_descrcnt++;
}
- if (error)
- { struct dlil_demux_desc *mp2;
-
- while ((mp2 = TAILQ_FIRST(&np->nd_dlist))) {
- TAILQ_REMOVE(&np->nd_dlist, mp2, next);
- FREE(mp2, M_PCB);
- }
- } else
- error = ndrv_add_descr(np, &proto_spec);
-#ifdef NDRV_DEBUG
- log(LOG_WARNING, "NDRV ADDSPEC: got error %d\n", error);
-#endif
- FREE(native_values, M_TEMP);
- return(error);
+
+ if (error == 0)
+ {
+ /* We've got all our ducks lined up...lets attach! */
+ socket_unlock(so, 0);
+ error = ifnet_attach_protocol(np->nd_if, ndrvSpec.protocol_family,
+ &proto_param);
+ socket_lock(so, 0);
+ if (error == 0)
+ np->nd_proto_family = ndrvSpec.protocol_family;
+ }
+
+ /* Free any memory we've allocated */
+ if (proto_param.demux_array)
+ FREE(proto_param.demux_array, M_TEMP);
+ if (ndrvDemux)
+ FREE(ndrvDemux, M_TEMP);
+
+ return error;
}
+
int
-ndrv_delspec(struct ndrv_cb *np, struct ndrv_descr *nd)
-{ struct dlil_demux_desc *mp;
+ndrv_to_ifnet_demux(struct ndrv_demux_desc* ndrv, struct ifnet_demux_desc* ifdemux)
+{
+ bzero(ifdemux, sizeof(*ifdemux));
+
+ if (ndrv->type < DLIL_DESC_ETYPE2)
+ {
+ /* using old "type", not supported */
+ return ENOTSUP;
+ }
+
+ if (ndrv->length > 28)
+ {
+ return EINVAL;
+ }
+
+ ifdemux->type = ndrv->type;
+ ifdemux->data = ndrv->data.other;
+ ifdemux->datalen = ndrv->length;
+
+ return 0;
+}
- return(EINVAL);
+int
+ndrv_delspec(struct ndrv_cb *np)
+{
+ int result = 0;
+
+ if (np->nd_proto_family == PF_NDRV ||
+ np->nd_proto_family == 0)
+ return EINVAL;
+
+ /* Detach the protocol */
+ result = ifnet_detach_protocol(np->nd_if, np->nd_proto_family);
+ np->nd_proto_family = PF_NDRV;
+
+ return result;
}
struct ndrv_cb *
-ndrv_find_tag(unsigned int tag)
-{ struct ndrv_tag_map *tmp;
- int i;
-
- tmp = ndrv_tags;
- for (i=0; i++ < tag_map_count; tmp++)
- if (tmp->tm_tag == tag)
- return(tmp->tm_np);
- return(NULL);
+ndrv_find_inbound(struct ifnet *ifp, u_long protocol)
+{
+ struct ndrv_cb* np;
+
+ if (protocol == PF_NDRV) return NULL;
+
+ TAILQ_FOREACH(np, &ndrvl, nd_next) {
+ if (np->nd_proto_family == protocol &&
+ np->nd_if == ifp) {
+ return np;
+ }
+ }
+
+ return NULL;
}
-int
-ndrv_add_tag(struct ndrv_cb *np, unsigned int tag,
- struct dlil_demux_desc *mp)
-{ struct ndrv_tag_map *tmp;
- int i;
-
- tmp = ndrv_tags;
- for (i=0; i++ < tag_map_count; tmp++)
- if (tmp->tm_tag == 0)
- { tmp->tm_tag = tag;
- tmp->tm_np = np;
-#ifdef NDRV_DEBUG
- log(LOG_WARNING, "NDRV ADDING TAG %d\n", tag);
-#endif
- return(0);
- }
+static void ndrv_dominit(void)
+{
+ static int ndrv_dominited = 0;
- /* Oops - ran out of space. Realloc */
- i = tag_map_count + TAG_MAP_COUNT;
- MALLOC(tmp, struct ndrv_tag_map *, i * sizeof (struct ndrv_tag_map),
- M_PCB, M_WAITOK);
- if (tmp == NULL)
- return(ENOMEM);
- /* Clear tail of new table, except for the slot we are creating ... */
- bzero((caddr_t)&tmp[tag_map_count+1],
- (TAG_MAP_COUNT-1) * sizeof (struct ndrv_tag_map));
- /* ...and then copy in the original piece */
- if (tag_map_count)
- bcopy(ndrv_tags, tmp,
- tag_map_count * sizeof (struct ndrv_tag_map));
- /* ...and then install the new tag... */
- tmp[tag_map_count].tm_tag = tag;
- tmp[tag_map_count].tm_np = np;
- tag_map_count = i;
- if (tag_map_count)
- FREE(ndrv_tags, M_PCB);
- ndrv_tags = tmp;
-#ifdef NDRV_DEBUG
- log(LOG_WARNING, "NDRV ADDING TAG %d (new chunk)\n", tag);
-#endif
- return(0);
+ if (ndrv_dominited == 0 &&
+ net_add_proto(&ndrvsw, &ndrvdomain) == 0)
+ ndrv_dominited = 1;
}
-/*
- * Attach the proto spec list, and record the tags.
- */
-int
-ndrv_add_descr(struct ndrv_cb *np, struct dlil_proto_reg_str *proto_spec)
-{ unsigned long dl_tag;
- int error;
- struct dlil_demux_desc *mp;
-
- /* Attach to our device to get requested packets */
- TAILQ_INIT(&proto_spec->demux_desc_head);
- error = dlil_attach_protocol(proto_spec, &dl_tag);
-
- if (error == 0)
- error = ndrv_add_tag(np, dl_tag, mp);
-
- return(error);
+static void
+ndrv_handle_ifp_detach(u_long family, short unit)
+{
+ struct ndrv_cb* np;
+ struct ifnet *ifp = NULL;
+ struct socket *so;
+
+ /* Find all sockets using this interface. */
+ 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 */
+ ifp = np->nd_if;
+ if (np->nd_proto_family != 0)
+ ndrv_delspec(np);
+
+ /* Delete the multicasts first */
+ ndrv_remove_all_multicast(np);
+
+ /* Disavow all knowledge of the ifp */
+ np->nd_if = NULL;
+ np->nd_unit = 0;
+ np->nd_family = 0;
+
+ so = np->nd_socket;
+ /* Make sure sending returns an error */
+ /* Is this safe? Will we drop the funnel? */
+ lck_mtx_assert(so->so_proto->pr_domain->dom_mtx, LCK_MTX_ASSERT_OWNED);
+ socantsendmore(so);
+ socantrcvmore(so);
+ }
+ }
+
+ /* Unregister our protocol */
+ if (ifp) {
+ ifnet_detach_protocol(ifp, PF_NDRV);
+ }
}
-int
-ndrv_dump_descr(struct ndrv_cb *np)
-{ struct dlil_demux_desc *dm1, *dm2;
- struct ndrv_tag_map *tmp;
- int i, error = 0;
-
- if (dm1 = TAILQ_FIRST(&np->nd_dlist))
- { for (i = 0, tmp = &ndrv_tags[0]; i++ < tag_map_count; tmp++)
- if (tmp->tm_np == np)
- { error = dlil_detach_protocol(tmp->tm_tag);
- while (dm1)
- { dm2 = TAILQ_NEXT(dm1, next);
- FREE(dm1, M_PCB);
- dm1 = dm2;
- }
- log(LOG_WARNING,
- "Detached tag %d (error %d)\n",
- tmp->tm_tag, error);
- tmp->tm_np = 0;
- tmp->tm_tag = 0;
- }
- }
- return(0);
+static int
+ndrv_do_add_multicast(struct ndrv_cb *np, struct sockopt *sopt)
+{
+ struct ndrv_multiaddr* ndrv_multi;
+ int result;
+
+ if (sopt->sopt_val == 0 || sopt->sopt_valsize < 2 ||
+ sopt->sopt_level != SOL_NDRVPROTO)
+ return EINVAL;
+ if (np->nd_if == NULL)
+ return ENXIO;
+
+ // Allocate storage
+ MALLOC(ndrv_multi, struct ndrv_multiaddr*, sizeof(struct ndrv_multiaddr) -
+ sizeof(struct sockaddr) + sopt->sopt_valsize, M_IFADDR, M_WAITOK);
+ if (ndrv_multi == NULL)
+ return ENOMEM;
+
+ // Copy in the address
+ result = copyin(sopt->sopt_val, &ndrv_multi->addr, sopt->sopt_valsize);
+
+ // Validate the sockaddr
+ if (result == 0 && sopt->sopt_valsize != ndrv_multi->addr.sa_len)
+ result = EINVAL;
+
+ if (result == 0 && ndrv_have_multicast(np, &ndrv_multi->addr))
+ result = EEXIST;
+
+ if (result == 0)
+ {
+ // Try adding the multicast
+ result = ifnet_add_multicast(np->nd_if, &ndrv_multi->addr,
+ &ndrv_multi->ifma);
+ }
+
+ if (result == 0)
+ {
+ // Add to our linked list
+ ndrv_multi->next = np->nd_multiaddrs;
+ np->nd_multiaddrs = ndrv_multi;
+ }
+ else
+ {
+ // Free up the memory, something went wrong
+ FREE(ndrv_multi, M_IFADDR);
+ }
+
+ return result;
}
-void ndrv_dominit()
+static int
+ndrv_do_remove_multicast(struct ndrv_cb *np, struct sockopt *sopt)
{
- static int ndrv_dominited = 0;
+ struct sockaddr* multi_addr;
+ struct ndrv_multiaddr* ndrv_entry = NULL;
+ int result;
+
+ if (sopt->sopt_val == 0 || sopt->sopt_valsize < 2 ||
+ sopt->sopt_level != SOL_NDRVPROTO)
+ return EINVAL;
+ if (np->nd_if == NULL)
+ return ENXIO;
+
+ // Allocate storage
+ MALLOC(multi_addr, struct sockaddr*, sopt->sopt_valsize,
+ M_TEMP, M_WAITOK);
+ if (multi_addr == NULL)
+ return ENOMEM;
+
+ // Copy in the address
+ result = copyin(sopt->sopt_val, multi_addr, sopt->sopt_valsize);
+
+ // Validate the sockaddr
+ if (result == 0 && sopt->sopt_valsize != multi_addr->sa_len)
+ result = EINVAL;
+
+ if (result == 0)
+ {
+ /* Find the old entry */
+ ndrv_entry = ndrv_have_multicast(np, multi_addr);
+
+ if (ndrv_entry == NULL)
+ result = ENOENT;
+ }
+
+ if (result == 0)
+ {
+ // Try deleting the multicast
+ result = ifnet_remove_multicast(ndrv_entry->ifma);
+ }
+
+ if (result == 0)
+ {
+ // Remove from our linked list
+ struct ndrv_multiaddr* cur = np->nd_multiaddrs;
+
+ ifmaddr_release(ndrv_entry->ifma);
+
+ if (cur == ndrv_entry)
+ {
+ np->nd_multiaddrs = cur->next;
+ }
+ else
+ {
+ for (cur = cur->next; cur != NULL; cur = cur->next)
+ {
+ if (cur->next == ndrv_entry)
+ {
+ cur->next = cur->next->next;
+ break;
+ }
+ }
+ }
+
+ // Free the memory
+ FREE(ndrv_entry, M_IFADDR);
+ }
+ FREE(multi_addr, M_TEMP);
+
+ return result;
+}
- if (ndrv_dominited == 0) {
- net_add_proto(&ndrvsw[0], &ndrvdomain);
+static struct ndrv_multiaddr*
+ndrv_have_multicast(struct ndrv_cb *np, struct sockaddr* inAddr)
+{
+ struct ndrv_multiaddr* cur;
+ for (cur = np->nd_multiaddrs; cur != NULL; cur = cur->next)
+ {
+
+ if ((inAddr->sa_len == cur->addr.sa_len) &&
+ (bcmp(&cur->addr, inAddr, inAddr->sa_len) == 0))
+ {
+ // Found a match
+ return cur;
+ }
+ }
+
+ return NULL;
+}
- ndrv_dominited = 1;
+static void
+ndrv_remove_all_multicast(struct ndrv_cb* np)
+{
+ struct ndrv_multiaddr* cur;
+
+ if (np->nd_if != NULL)
+ {
+ while (np->nd_multiaddrs != NULL)
+ {
+ cur = np->nd_multiaddrs;
+ np->nd_multiaddrs = cur->next;
+
+ ifnet_remove_multicast(cur->ifma);
+ ifmaddr_release(cur->ifma);
+ FREE(cur, M_IFADDR);
}
+ }
}
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,
- 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, 0, PR_ATOMIC|PR_ADDR,
- 0, ndrv_output, ndrv_ctlinput, ndrv_ctloutput,
- 0, ndrv_init, 0, 0,
- ndrv_drain, ndrv_sysctl, &ndrv_usrreqs
- }
+struct protosw ndrvsw =
+{ SOCK_RAW, &ndrvdomain, NDRVPROTO_NDRV, PR_ATOMIC|PR_ADDR,
+ NULL, ndrv_output, NULL, ndrv_ctloutput,
+ NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ &ndrv_usrreqs,
+ NULL, NULL, NULL,
+ { NULL, NULL}, NULL,
+ { 0 }
};
struct domain ndrvdomain =
-{ AF_NDRV, "NetDriver", ndrv_dominit, NULL, NULL,
+{ AF_NDRV,
+ "NetDriver",
+ ndrv_dominit,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ 0,
+ 0,
NULL,
- NULL, NULL, 0, 0, 0, 0
+ 0,
+ {0, 0}
};