X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..ff6e181ae92fc6f1e89841290f461d1f2f9badd9:/bsd/netkey/keysock.c

diff --git a/bsd/netkey/keysock.c b/bsd/netkey/keysock.c
index ae1bc6203..a65bcc690 100644
--- a/bsd/netkey/keysock.c
+++ b/bsd/netkey/keysock.c
@@ -29,46 +29,22 @@
  * SUCH DAMAGE.
  */
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include "opt_inet.h"
-#endif
-
 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
 
-#if defined(__NetBSD__) || defined (__APPLE__)
-# ifdef _KERNEL
-#  define KERNEL
-# endif
-#endif
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#if defined(__FreeBSD__) || defined (__APPLE__)
 #include <sys/sysctl.h>
-#endif
 #include <sys/mbuf.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 || defined (__APPLE__)
 #include <sys/malloc.h>
-#endif
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/errno.h>
-#ifdef __NetBSD__
-#include <sys/proc.h>
-#include <sys/queue.h>
-#endif
 
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 3
-#include <machine/ipl.h>
-#else
-#include <machine/spl.h>
-#endif
-#endif
+#include <kern/locks.h>
 
 #include <net/raw_cb.h>
 #include <net/route.h>
@@ -79,145 +55,50 @@
 #include <netkey/keysock.h>
 #include <netkey/key_debug.h>
 
+extern lck_mtx_t *raw_mtx;
+extern lck_mtx_t *sadb_mutex;
+extern void key_init(void);
 
 struct sockaddr key_dst = { 2, PF_KEY, };
 struct sockaddr key_src = { 2, PF_KEY, };
-struct sockproto key_proto = { PF_KEY, PF_KEY_V2 };
 
-static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));
+static int key_sendup0(struct rawcb *, struct mbuf *, int);
 
 struct pfkeystat pfkeystat;
 
-#if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(__APPLE__)
 /*
- * key_usrreq()
- * derived from net/rtsock.c:route_usrreq()
+ * key_output()
  */
-#ifndef __NetBSD__
 int
-key_usrreq(so, req, m, nam, control)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
+#ifdef __APPLE__
+/* No variable argument support? */
+key_output(struct mbuf *m, struct socket *so)
 #else
-int
-key_usrreq(so, req, m, nam, control, p)
-	register struct socket *so;
-	int req;
-	struct mbuf *m, *nam, *control;
-	struct proc *p;
-#endif /*__NetBSD__*/
-{
-	register int error = 0;
-	register struct keycb *kp = (struct keycb *)sotorawcb(so);
-	int s;
-
-#ifdef __NetBSD__
-	s = splsoftnet();
+#if __STDC__
+key_output(struct mbuf *m, ...)
 #else
-	s = splnet();
-#endif
-	if (req == PRU_ATTACH) {
-		kp = (struct keycb *)_MALLOC(sizeof(*kp), M_PCB, M_WAITOK);
-		so->so_pcb = (caddr_t)kp;
-		if (so->so_pcb)
-			bzero(so->so_pcb, sizeof(*kp));
-	}
-	if (req == PRU_DETACH && kp) {
-		int af = kp->kp_raw.rcb_proto.sp_protocol;
-		if (af == PF_KEY) /* XXX: AF_KEY */
-			key_cb.key_count--;
-		key_cb.any_count--;
-
-		key_freereg(so);
-	}
-
-#ifndef __NetBSD__
-	error = raw_usrreq(so, req, m, nam, control);
-#else
-	error = raw_usrreq(so, req, m, nam, control, p);
+key_output(m, va_alist)
+	struct mbuf *m;
+	va_dcl
 #endif
-	m = control = NULL;	/* reclaimed in raw_usrreq */
-	kp = (struct keycb *)sotorawcb(so);
-	if (req == PRU_ATTACH && kp) {
-		int af = kp->kp_raw.rcb_proto.sp_protocol;
-		if (error) {
-#if IPSEC_DEBUG
-			printf("key_usrreq: key_usrreq results %d\n", error);
 #endif
-			pfkeystat.sockerr++;
-			_FREE((caddr_t)kp, M_PCB);
-			so->so_pcb = (caddr_t) 0;
-			splx(s);
-			return(error);
-		}
-
-		kp->kp_promisc = kp->kp_registered = 0;
-
-		if (af == PF_KEY) /* XXX: AF_KEY */
-			key_cb.key_count++;
-		key_cb.any_count++;
-#ifndef __bsdi__
-		kp->kp_raw.rcb_laddr = &key_src;
-		kp->kp_raw.rcb_faddr = &key_dst;
-#else
-		/*
-		 * XXX rcb_faddr must be dynamically allocated, otherwise
-		 * raw_disconnect() will be angry.
-		 */
-	    {
-		struct mbuf *m, *n;
-		MGET(m, M_WAITOK, MT_DATA);
-		if (!m) {
-			error = ENOBUFS;
-			pfkeystat.in_nomem++;
-			_FREE((caddr_t)kp, M_PCB);
-			so->so_pcb = (caddr_t) 0;
-			splx(s);
-			return(error);
-		}
-		MGET(n, M_WAITOK, MT_DATA);
-		if (!n) {
-			error = ENOBUFS;
-			m_freem(m);
-			pfkeystat.in_nomem++;
-			_FREE((caddr_t)kp, M_PCB);
-			so->so_pcb = (caddr_t) 0;
-			splx(s);
-			return(error);
-		}
-		m->m_len = sizeof(key_src);
-		kp->kp_raw.rcb_laddr = mtod(m, struct sockaddr *);
-		bcopy(&key_src, kp->kp_raw.rcb_laddr, sizeof(key_src));
-		n->m_len = sizeof(key_dst);
-		kp->kp_raw.rcb_faddr = mtod(n, struct sockaddr *);
-		bcopy(&key_dst, kp->kp_raw.rcb_faddr, sizeof(key_dst));
-	    }
-#endif
-		soisconnected(so);
-		so->so_options |= SO_USELOOPBACK;
-	}
-	splx(s);
-	return(error);
-}
-#endif /* other than FreeBSD >= 3 */
-
-/*
- * key_output()
- */
-int
-key_output(m, so)
-	register struct mbuf *m;
-	struct socket *so;
 {
-	struct sadb_msg *msg = NULL;
+	struct sadb_msg *msg;
 	int len, error = 0;
-	int s;
-	int target;
+#ifndef __APPLE__
+	struct socket *so;
+	va_list ap;
+
+	va_start(ap, m);
+	so = va_arg(ap, struct socket *);
+	va_end(ap);
+#endif
 
 	if (m == 0)
 		panic("key_output: NULL pointer was passed.\n");
 
+	socket_unlock(so, 0);
+	lck_mtx_lock(sadb_mutex);
 	pfkeystat.out_total++;
 	pfkeystat.out_bytes += m->m_pkthdr.len;
 
@@ -245,7 +126,7 @@ key_output(m, so)
 	if ((m->m_flags & M_PKTHDR) == 0)
 		panic("key_output: not M_PKTHDR ??");
 
-#if defined(IPSEC_DEBUG)
+#if IPSEC_DEBUG
 	KEYDEBUG(KEYDEBUG_KEY_DUMP, kdebug_mbuf(m));
 #endif /* defined(IPSEC_DEBUG) */
 
@@ -260,43 +141,15 @@ key_output(m, so)
 		goto end;
 	}
 
-	/*
-	 * allocate memory for sadb_msg, and copy to sadb_msg from mbuf
-	 * XXX: To be processed directly without a copy.
-	 */
-	msg = (struct sadb_msg *)_MALLOC(len, M_SECA, M_WAITOK);
-	if (msg == NULL) {
-#if IPSEC_DEBUG
-		printf("key_output: No more memory.\n");
-#endif
-		error = ENOBUFS;
-		pfkeystat.out_nomem++;
-		goto end;
-		/* or do panic ? */
-	}
-	m_copydata(m, 0, len, (caddr_t)msg);
-
-	/*XXX giant lock*/
-#ifdef __NetBSD__
-	s = splsoftnet();
-#else
-	s = splnet();
-#endif
-	if ((len = key_parse(&msg, so, &target)) == 0) {
-		/* discard. i.e. no need to reply. */
-		/* msg has been freed at key_parse() */
-		error = 0;
-		splx(s);
-		goto end;
-	}
+	error = key_parse(m, so);
+	m = NULL;
 
-	/* send up message to the socket */
-	error = key_sendup(so, msg, len, target);
-	splx(s);
-	_FREE(msg, M_SECA);
 end:
-	m_freem(m);
-	return (error);
+	if (m)
+		m_freem(m);
+	lck_mtx_unlock(sadb_mutex);
+	socket_lock(so, 0);
+	return error;
 }
 
 /*
@@ -308,6 +161,9 @@ key_sendup0(rp, m, promisc)
 	struct mbuf *m;
 	int promisc;
 {
+	int error;
+
+	lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED);
 	if (promisc) {
 		struct sadb_msg *pmsg;
 
@@ -318,7 +174,7 @@ key_sendup0(rp, m, promisc)
 #if IPSEC_DEBUG
 			printf("key_sendup0: cannot pullup\n");
 #endif
-		pfkeystat.in_nomem++;
+			pfkeystat.in_nomem++;
 			m_freem(m);
 			return ENOBUFS;
 		}
@@ -334,104 +190,21 @@ key_sendup0(rp, m, promisc)
 		pfkeystat.in_msgtype[pmsg->sadb_msg_type]++;
 	}
 
-	if (!sbappendaddr(&rp->rcb_socket->so_rcv,
-			(struct sockaddr *)&key_src, m, NULL)) {
+	if (!sbappendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&key_src,
+	    m, NULL, &error)) {
 #if IPSEC_DEBUG
 		printf("key_sendup0: sbappendaddr failed\n");
 #endif
 		pfkeystat.in_nomem++;
-		m_freem(m);
-		return ENOBUFS;
 	}
-	sorwakeup(rp->rcb_socket);
-	return 0;
-}
-
-/* XXX this interface should be obsoleted. */
-int
-key_sendup(so, msg, len, target)
-	struct socket *so;
-	struct sadb_msg *msg;
-	u_int len;
-	int target;	/*target of the resulting message*/
-{
-	struct mbuf *m, *n, *mprev;
-	int tlen;
-
-	/* sanity check */
-	if (so == 0 || msg == 0)
-		panic("key_sendup: NULL pointer was passed.\n");
-
-	KEYDEBUG(KEYDEBUG_KEY_DUMP,
-		printf("key_sendup: \n");
-		kdebug_sadb(msg));
-
-	/*
-	 * we increment statistics here, just in case we have ENOBUFS
-	 * in this function.
-	 */
-	pfkeystat.in_total++;
-	pfkeystat.in_bytes += len;
-	pfkeystat.in_msgtype[msg->sadb_msg_type]++;
-
-	/*
-	 * Get mbuf chain whenever possible (not clusters),
-	 * to save socket buffer.  We'll be generating many SADB_ACQUIRE
-	 * messages to listening key sockets.  If we simmply allocate clusters,
-	 * sbappendaddr() will raise ENOBUFS due to too little sbspace().
-	 * sbspace() computes # of actual data bytes AND mbuf region.
-	 *
-	 * TODO: SADB_ACQUIRE filters should be implemented.
-	 */
-	tlen = len;
-	m = mprev = NULL;
-	while (tlen > 0) {
-		if (tlen == len) {
-			MGETHDR(n, M_DONTWAIT, MT_DATA);
-			n->m_len = MHLEN;
-		} else {
-			MGET(n, M_DONTWAIT, MT_DATA);
-			n->m_len = MLEN;
-		}
-		if (!n) {
-			pfkeystat.in_nomem++;
-			return ENOBUFS;
-		}
-		if (tlen >= MCLBYTES) {	/*XXX better threshold? */
-			MCLGET(n, M_DONTWAIT);
-			if ((n->m_flags & M_EXT) == 0) {
-				m_free(n);
-				m_freem(m);
-				pfkeystat.in_nomem++;
-				return ENOBUFS;
-			}
-			n->m_len = MCLBYTES;
-		}
-
-		if (tlen < n->m_len)
-			n->m_len = tlen;
-		n->m_next = NULL;
-		if (m == NULL)
-			m = mprev = n;
-		else {
-			mprev->m_next = n;
-			mprev = n;
-		}
-		tlen -= n->m_len;
-		n = NULL;
+	else {
+		sorwakeup(rp->rcb_socket);
 	}
-	m->m_pkthdr.len = len;
-	m->m_pkthdr.rcvif = NULL;
-	m_copyback(m, 0, len, (caddr_t)msg);
-
-	/* avoid duplicated statistics */
-	pfkeystat.in_total--;
-	pfkeystat.in_bytes -= len;
-	pfkeystat.in_msgtype[msg->sadb_msg_type]--;
-
-	return key_sendup_mbuf(so, m, target);
+	return error;
 }
 
+
+/* so can be NULL if target != KEY_SENDUP_ONE */
 int
 key_sendup_mbuf(so, m, target)
 	struct socket *so;
@@ -442,9 +215,12 @@ key_sendup_mbuf(so, m, target)
 	struct keycb *kp;
 	int sendup;
 	struct rawcb *rp;
-	int error;
+	int error = 0;
 
-	if (so == NULL || m == NULL)
+	lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED);
+	if (m == NULL)
+		panic("key_sendup_mbuf: NULL pointer was passed.\n");
+	if (so == NULL && target == KEY_SENDUP_ONE)
 		panic("key_sendup_mbuf: NULL pointer was passed.\n");
 
 	pfkeystat.in_total++;
@@ -465,14 +241,9 @@ key_sendup_mbuf(so, m, target)
 		msg = mtod(m, struct sadb_msg *);
 		pfkeystat.in_msgtype[msg->sadb_msg_type]++;
 	}
-
-#ifdef __NetBSD__
-	for (rp = rawcb.lh_first; rp; rp = rp->rcb_list.le_next)
-#elif defined(__FreeBSD__) && __FreeBSD__ >= 3 || defined (__APPLE__)
+	
+	lck_mtx_lock(raw_mtx);
 	LIST_FOREACH(rp, &rawcb_list, list)
-#else
-	for (rp = rawcb.rcb_next; rp != &rawcb; rp = rp->rcb_next)
-#endif
 	{
 		if (rp->rcb_proto.sp_family != PF_KEY)
 			continue;
@@ -482,7 +253,8 @@ key_sendup_mbuf(so, m, target)
 		}
 
 		kp = (struct keycb *)rp;
-
+		
+		socket_lock(rp->rcb_socket, 1);
 		/*
 		 * If you are in promiscuous mode, and when you get broadcasted
 		 * reply, you'll get two PF_KEY messages.
@@ -496,15 +268,15 @@ key_sendup_mbuf(so, m, target)
 		}
 
 		/* the exact target will be processed later */
-		if (sotorawcb(so) == rp)
+		if (so && sotorawcb(so) == rp) {
+			socket_unlock(rp->rcb_socket, 1);
 			continue;
+		}
 
 		sendup = 0;
 		switch (target) {
 		case KEY_SENDUP_ONE:
 			/* the statement has no effect */
-			if (sotorawcb(so) == rp)
-				sendup++;
 			break;
 		case KEY_SENDUP_ALL:
 			sendup++;
@@ -516,8 +288,12 @@ key_sendup_mbuf(so, m, target)
 		}
 		pfkeystat.in_msgtarget[target]++;
 
-		if (!sendup)
+		if (!sendup) {
+			socket_unlock(rp->rcb_socket, 1);
 			continue;
+		}
+		else
+			sendup = 0;  // clear for next iteration
 
 		if ((n = m_copy(m, 0, (int)M_COPYALL)) == NULL) {
 #if IPSEC_DEBUG
@@ -525,23 +301,34 @@ key_sendup_mbuf(so, m, target)
 #endif
 			m_freem(m);
 			pfkeystat.in_nomem++;
+			socket_unlock(rp->rcb_socket, 1);
+			lck_mtx_unlock(raw_mtx);
 			return ENOBUFS;
 		}
 
-		if ((error = key_sendup0(rp, n, 0)) != 0) {
-			m_freem(m);
-			return error;
-		}
-
+		/*
+		 * ignore error even if queue is full.  PF_KEY does not
+		 * guarantee the delivery of the message.
+		 * this is important when target == KEY_SENDUP_ALL.
+		 */
+		key_sendup0(rp, n, 0);
+		socket_unlock(rp->rcb_socket, 1);
 		n = NULL;
 	}
 
-	error = key_sendup0(sotorawcb(so), m, 0);
-	m = NULL;
+	lck_mtx_unlock(raw_mtx);
+	if (so) {
+		socket_lock(so, 1);
+		error = key_sendup0(sotorawcb(so), m, 0);
+		socket_unlock(so, 1);
+		m = NULL;
+	} else {
+		error = 0;
+		m_freem(m);
+	}
 	return error;
 }
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3 || defined (__APPLE__)
 /*
  * key_abort()
  * derived from net/rtsock.c:rts_abort()
@@ -549,10 +336,8 @@ key_sendup_mbuf(so, m, target)
 static int
 key_abort(struct socket *so)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_abort(so);
-	splx(s);
 	return error;
 }
 
@@ -564,7 +349,7 @@ static int
 key_attach(struct socket *so, int proto, struct proc *p)
 {
 	struct keycb *kp;
-	int s, error;
+	int error;
 
 	if (sotorawcb(so) != 0)
 		return EISCONN;	/* XXX panic? */
@@ -573,36 +358,29 @@ key_attach(struct socket *so, int proto, struct proc *p)
 		return ENOBUFS;
 	bzero(kp, sizeof *kp);
 
-	/*
-	 * The splnet() is necessary to block protocols from sending
-	 * error notifications (like RTM_REDIRECT or RTM_LOSING) while
-	 * this PCB is extant but incompletely initialized.
-	 * Probably we should try to do more of this work beforehand and
-	 * eliminate the spl.
-	 */
-	s = splnet();
 	so->so_pcb = (caddr_t)kp;
+	kp->kp_promisc = kp->kp_registered = 0;
+	kp->kp_raw.rcb_laddr = &key_src;
+	kp->kp_raw.rcb_faddr = &key_dst;
+
 	error = raw_usrreqs.pru_attach(so, proto, p);
 	kp = (struct keycb *)sotorawcb(so);
 	if (error) {
 		_FREE(kp, M_PCB);
 		so->so_pcb = (caddr_t) 0;
-		splx(s);
+		so->so_flags |= SOF_PCBCLEARING;
 		printf("key_usrreq: key_usrreq results %d\n", error);
 		return error;
 	}
 
-	kp->kp_promisc = kp->kp_registered = 0;
-
+	socket_lock(so, 1);
 	if (kp->kp_raw.rcb_proto.sp_protocol == PF_KEY) /* XXX: AF_KEY */
 		key_cb.key_count++;
 	key_cb.any_count++;
-	kp->kp_raw.rcb_laddr = &key_src;
-	kp->kp_raw.rcb_faddr = &key_dst;
 	soisconnected(so);
 	so->so_options |= SO_USELOOPBACK;
+	socket_unlock(so, 1);
 
-	splx(s);
 	return 0;
 }
 
@@ -613,10 +391,8 @@ key_attach(struct socket *so, int proto, struct proc *p)
 static int
 key_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_bind(so, nam, p); /* xxx just EINVAL */
-	splx(s);
 	return error;
 }
 
@@ -627,10 +403,8 @@ key_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
 static int
 key_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_connect(so, nam, p); /* XXX just EINVAL */
-	splx(s);
 	return error;
 }
 
@@ -642,19 +416,19 @@ static int
 key_detach(struct socket *so)
 {
 	struct keycb *kp = (struct keycb *)sotorawcb(so);
-	int s, error;
+	int error;
 
-	s = splnet();
 	if (kp != 0) {
-		if (kp->kp_raw.rcb_proto.sp_protocol
-		    == PF_KEY) /* XXX: AF_KEY */
+		if (kp->kp_raw.rcb_proto.sp_protocol == PF_KEY) /* XXX: AF_KEY */
 			key_cb.key_count--;
 		key_cb.any_count--;
-
+		socket_unlock(so, 0);
+		lck_mtx_lock(sadb_mutex);
 		key_freereg(so);
+		lck_mtx_unlock(sadb_mutex);
+		socket_lock(so, 0);
 	}
 	error = raw_usrreqs.pru_detach(so);
-	splx(s);
 	return error;
 }
 
@@ -665,10 +439,8 @@ key_detach(struct socket *so)
 static int
 key_disconnect(struct socket *so)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_disconnect(so);
-	splx(s);
 	return error;
 }
 
@@ -679,10 +451,8 @@ key_disconnect(struct socket *so)
 static int
 key_peeraddr(struct socket *so, struct sockaddr **nam)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_peeraddr(so, nam);
-	splx(s);
 	return error;
 }
 
@@ -694,10 +464,8 @@ static int
 key_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 	 struct mbuf *control, struct proc *p)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_send(so, flags, m, nam, control, p);
-	splx(s);
 	return error;
 }
 
@@ -708,10 +476,8 @@ key_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 static int
 key_shutdown(struct socket *so)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_shutdown(so);
-	splx(s);
 	return error;
 }
 
@@ -722,10 +488,8 @@ key_shutdown(struct socket *so)
 static int
 key_sockaddr(struct socket *so, struct sockaddr **nam)
 {
-	int s, error;
-	s = splnet();
+	int error;
 	error = raw_usrreqs.pru_sockaddr(so, nam);
-	splx(s);
 	return error;
 }
 
@@ -736,14 +500,11 @@ struct pr_usrreqs key_usrreqs = {
 	key_disconnect, pru_listen_notsupp, key_peeraddr,
 	pru_rcvd_notsupp,
 	pru_rcvoob_notsupp, key_send, pru_sense_null, key_shutdown,
-	key_sockaddr, sosend, soreceive, sopoll
+	key_sockaddr, sosend, soreceive, pru_sopoll_notsupp
 };
-#endif /* __FreeBSD__ >= 3 */
 
-#if __FreeBSD__ || defined (__APPLE__)
 /* sysctl */
 SYSCTL_NODE(_net, PF_KEY, key, CTLFLAG_RW, 0, "Key Family");
-#endif
 
 /*
  * Definitions of protocols supported in the KEY domain.
@@ -755,13 +516,15 @@ struct protosw keysw[] = {
 { SOCK_RAW,	&keydomain,	PF_KEY_V2,	PR_ATOMIC|PR_ADDR,
   0,		key_output,	raw_ctlinput,	0,
   0,
-  raw_init,	0,		0,		0,
-  0, &key_usrreqs
+  key_init,	0,		0,		0,
+  0,
+  &key_usrreqs,
+  0,		0,		0,
 }
 };
 
 struct domain keydomain =
-    { PF_KEY, "key", key_init, 0, 0,
+    { PF_KEY, "key", key_domain_init, 0, 0,
       keysw, 0,
       0,0,
       sizeof(struct key_cb), 0