#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/mbuf.h>
+#include <sys/mcache.h>
#include <sys/malloc.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <netkey/key_debug.h>
extern lck_mtx_t *raw_mtx;
-extern lck_mtx_t *sadb_mutex;
-extern void key_init(void);
+extern void key_init(struct protosw *, struct domain *);
-struct sockaddr key_dst = { 2, PF_KEY, };
-struct sockaddr key_src = { 2, PF_KEY, };
+struct sockaddr key_dst = { 2, PF_KEY, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,} };
+struct sockaddr key_src = { 2, PF_KEY, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,} };
+static void key_dinit(struct domain *);
static int key_sendup0(struct rawcb *, struct mbuf *, int);
struct pfkeystat pfkeystat;
+static struct domain *keydomain = NULL;
+
+extern lck_mtx_t *pfkey_stat_mutex;
+
/*
* key_output()
*/
panic("key_output: NULL pointer was passed.\n");
socket_unlock(so, 0);
- lck_mtx_lock(sadb_mutex);
+ lck_mtx_lock(pfkey_stat_mutex);
pfkeystat.out_total++;
pfkeystat.out_bytes += m->m_pkthdr.len;
+ lck_mtx_unlock(pfkey_stat_mutex);
len = m->m_pkthdr.len;
if (len < sizeof(struct sadb_msg)) {
#if IPSEC_DEBUG
printf("key_output: Invalid message length.\n");
#endif
- pfkeystat.out_tooshort++;
+ PFKEY_STAT_INCREMENT(pfkeystat.out_tooshort);
error = EINVAL;
goto end;
}
#if IPSEC_DEBUG
printf("key_output: can't pullup mbuf\n");
#endif
- pfkeystat.out_nomem++;
+ PFKEY_STAT_INCREMENT(pfkeystat.out_nomem);
error = ENOBUFS;
goto end;
}
#endif /* defined(IPSEC_DEBUG) */
msg = mtod(m, struct sadb_msg *);
- pfkeystat.out_msgtype[msg->sadb_msg_type]++;
+ PFKEY_STAT_INCREMENT(pfkeystat.out_msgtype[msg->sadb_msg_type]);
if (len != PFKEY_UNUNIT64(msg->sadb_msg_len)) {
#if IPSEC_DEBUG
printf("key_output: Invalid message length.\n");
#endif
- pfkeystat.out_invlen++;
+ PFKEY_STAT_INCREMENT(pfkeystat.out_invlen);
error = EINVAL;
goto end;
}
end:
if (m)
m_freem(m);
- lck_mtx_unlock(sadb_mutex);
socket_lock(so, 0);
return error;
}
{
int error;
- lck_mtx_assert(sadb_mutex, LCK_MTX_ASSERT_OWNED);
if (promisc) {
struct sadb_msg *pmsg;
#if IPSEC_DEBUG
printf("key_sendup0: cannot pullup\n");
#endif
- pfkeystat.in_nomem++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_nomem);
m_freem(m);
return ENOBUFS;
}
pmsg->sadb_msg_len = PFKEY_UNIT64(m->m_pkthdr.len);
/* pid and seq? */
- pfkeystat.in_msgtype[pmsg->sadb_msg_type]++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_msgtype[pmsg->sadb_msg_type]);
}
if (!sbappendaddr(&rp->rcb_socket->so_rcv, (struct sockaddr *)&key_src,
#if IPSEC_DEBUG
printf("key_sendup0: sbappendaddr failed\n");
#endif
- pfkeystat.in_nomem++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_nomem);
}
else {
sorwakeup(rp->rcb_socket);
struct rawcb *rp;
int error = 0;
- 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");
+ lck_mtx_lock(pfkey_stat_mutex);
pfkeystat.in_total++;
pfkeystat.in_bytes += m->m_pkthdr.len;
+ lck_mtx_unlock(pfkey_stat_mutex);
if (m->m_len < sizeof(struct sadb_msg)) {
#if 1
m = m_pullup(m, sizeof(struct sadb_msg));
if (m == NULL) {
- pfkeystat.in_nomem++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_nomem);
return ENOBUFS;
}
#else
if (m->m_len >= sizeof(struct sadb_msg)) {
struct sadb_msg *msg;
msg = mtod(m, struct sadb_msg *);
- pfkeystat.in_msgtype[msg->sadb_msg_type]++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_msgtype[msg->sadb_msg_type]);
}
lck_mtx_lock(raw_mtx);
sendup++;
break;
}
- pfkeystat.in_msgtarget[target]++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_msgtarget[target]);
if (!sendup) {
socket_unlock(rp->rcb_socket, 1);
printf("key_sendup: m_copy fail\n");
#endif
m_freem(m);
- pfkeystat.in_nomem++;
+ PFKEY_STAT_INCREMENT(pfkeystat.in_nomem);
socket_unlock(rp->rcb_socket, 1);
lck_mtx_unlock(raw_mtx);
return ENOBUFS;
return error;
}
- socket_lock(so, 1);
+ /* so is already locked when calling key_attach */
if (kp->kp_raw.rcb_proto.sp_protocol == PF_KEY) /* XXX: AF_KEY */
key_cb.key_count++;
key_cb.any_count++;
soisconnected(so);
so->so_options |= SO_USELOOPBACK;
- socket_unlock(so, 1);
return 0;
}
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);
return error;
}
-struct pr_usrreqs key_usrreqs = {
- key_abort, pru_accept_notsupp, key_attach, key_bind,
- key_connect,
- pru_connect2_notsupp, pru_control_notsupp, key_detach,
- key_disconnect, pru_listen_notsupp, key_peeraddr,
- pru_rcvd_notsupp,
- pru_rcvoob_notsupp, key_send, pru_sense_null, key_shutdown,
- key_sockaddr, sosend, soreceive, pru_sopoll_notsupp
+static struct pr_usrreqs key_usrreqs = {
+ .pru_abort = key_abort,
+ .pru_attach = key_attach,
+ .pru_bind = key_bind,
+ .pru_connect = key_connect,
+ .pru_detach = key_detach,
+ .pru_disconnect = key_disconnect,
+ .pru_peeraddr = key_peeraddr,
+ .pru_send = key_send,
+ .pru_shutdown = key_shutdown,
+ .pru_sockaddr = key_sockaddr,
+ .pru_sosend = sosend,
+ .pru_soreceive = soreceive,
};
/* sysctl */
-SYSCTL_NODE(_net, PF_KEY, key, CTLFLAG_RW, 0, "Key Family");
+SYSCTL_NODE(_net, PF_KEY, key, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Key Family");
/*
* Definitions of protocols supported in the KEY domain.
*/
-extern struct domain keydomain;
+extern struct domain keydomain_s;
-struct protosw keysw[] = {
-{ SOCK_RAW, &keydomain, PF_KEY_V2, PR_ATOMIC|PR_ADDR,
- 0, key_output, raw_ctlinput, 0,
- 0,
- key_init, 0, 0, 0,
- 0,
- &key_usrreqs,
- 0, 0, 0,
+static struct protosw keysw[] = {
+{
+ .pr_type = SOCK_RAW,
+ .pr_protocol = PF_KEY_V2,
+ .pr_flags = PR_ATOMIC|PR_ADDR,
+ .pr_output = key_output,
+ .pr_ctlinput = raw_ctlinput,
+ .pr_init = key_init,
+ .pr_usrreqs = &key_usrreqs,
}
};
-struct domain keydomain =
- { PF_KEY, "key", key_domain_init, 0, 0,
- keysw, 0,
- 0,0,
- sizeof(struct key_cb), 0
- };
+static int key_proto_count = (sizeof (keysw) / sizeof (struct protosw));
+
+struct domain keydomain_s = {
+ .dom_family = PF_KEY,
+ .dom_name = "key",
+ .dom_init = key_dinit,
+ .dom_maxrtkey = sizeof (struct key_cb),
+};
+
+static void
+key_dinit(struct domain *dp)
+{
+ struct protosw *pr;
+ int i;
+
+ VERIFY(!(dp->dom_flags & DOM_INITIALIZED));
+ VERIFY(keydomain == NULL);
-DOMAIN_SET(key);
+ keydomain = dp;
+
+ for (i = 0, pr = &keysw[0]; i < key_proto_count; i++, pr++)
+ net_add_proto(pr, dp, 1);
+}
projects / apple / xnu.git / blobdiff