X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..b226f5e54a60dc81db17b1260381d7dbfea3cdf1:/bsd/net/raw_usrreq.c diff --git a/bsd/net/raw_usrreq.c b/bsd/net/raw_usrreq.c index 236033d47..462842129 100644 --- a/bsd/net/raw_usrreq.c +++ b/bsd/net/raw_usrreq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2012 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -73,7 +73,8 @@ #include -lck_mtx_t *raw_mtx; /*### global raw cb mutex for now */ +decl_lck_mtx_data(,raw_mtx_data); /*### global raw cb mutex for now */ +lck_mtx_t *raw_mtx = &raw_mtx_data; lck_attr_t *raw_mtx_attr; lck_grp_t *raw_mtx_grp; lck_grp_attr_t *raw_mtx_grp_attr; @@ -81,19 +82,22 @@ lck_grp_attr_t *raw_mtx_grp_attr; * Initialize raw connection block q. */ void -raw_init() +raw_init(struct protosw *pp, struct domain *dp) { - raw_mtx_grp_attr = lck_grp_attr_alloc_init(); +#pragma unused(pp, dp) + static int raw_initialized = 0; - raw_mtx_grp = lck_grp_alloc_init("rawcb", raw_mtx_grp_attr); + /* This is called by key_init as well, so do it only once */ + if (!raw_initialized) { + raw_initialized = 1; - raw_mtx_attr = lck_attr_alloc_init(); + raw_mtx_grp_attr = lck_grp_attr_alloc_init(); + raw_mtx_grp = lck_grp_alloc_init("rawcb", raw_mtx_grp_attr); + raw_mtx_attr = lck_attr_alloc_init(); - if ((raw_mtx = lck_mtx_alloc_init(raw_mtx_grp, raw_mtx_attr)) == NULL) { - printf("raw_init: can't alloc raw_mtx\n"); - return; + lck_mtx_init(raw_mtx, raw_mtx_grp, raw_mtx_attr); + LIST_INIT(&rawcb_list); } - LIST_INIT(&rawcb_list); } @@ -106,14 +110,12 @@ raw_init() * Raw protocol interface. */ void -raw_input(m0, proto, src, dst) - struct mbuf *m0; - register struct sockproto *proto; - struct sockaddr *src, *dst; +raw_input(struct mbuf *m0, struct sockproto *proto, struct sockaddr *src, + struct sockaddr *dst) { - register struct rawcb *rp; - register struct mbuf *m = m0; - register int sockets = 0; + struct rawcb *rp; + struct mbuf *m = m0; + int sockets = 0; struct socket *last; int error; @@ -121,7 +123,7 @@ raw_input(m0, proto, src, dst) //####LD socket we'll find and need to append to is unlocked. //####LD calls from the output (locked) path need to make sure the socket is not locked when //####LD we call in raw_input - last = 0; + last = NULL; lck_mtx_lock(raw_mtx); LIST_FOREACH(rp, &rawcb_list, list) { if (rp->rcb_proto.sp_family != proto->sp_family) @@ -173,13 +175,11 @@ raw_input(m0, proto, src, dst) /*ARGSUSED*/ void -raw_ctlinput(cmd, arg, dummy) - int cmd; - struct sockaddr *arg; - void *dummy; +raw_ctlinput(int cmd, __unused struct sockaddr *arg, __unused void *dummy, + __unused struct ifnet *ifp) { - if (cmd < 0 || cmd > PRC_NCMDS) + if (cmd < 0 || cmd >= PRC_NCMDS) return; /* INCOMPLETE */ } @@ -194,7 +194,7 @@ raw_uabort(struct socket *so) mutex_held = (*so->so_proto->pr_getlock)(so, 0); else mutex_held = so->so_proto->pr_domain->dom_mtx; - lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(mutex_held, LCK_MTX_ASSERT_OWNED); if (rp == 0) return EINVAL; @@ -207,33 +207,25 @@ raw_uabort(struct socket *so) /* pru_accept is EOPNOTSUPP */ static int -raw_uattach(struct socket *so, int proto, struct proc *p) +raw_uattach(struct socket *so, int proto, __unused struct proc *p) { struct rawcb *rp = sotorawcb(so); -#ifndef __APPLE__ - int error; -#endif if (rp == 0) return EINVAL; -#ifdef __APPLE__ if ((so->so_state & SS_PRIV) == 0) return (EPERM); -#else - if (p && (error = suser(p)) != 0) - return error; -#endif return raw_attach(so, proto); } static int -raw_ubind(struct socket *so, struct sockaddr *nam, struct proc *p) +raw_ubind(__unused struct socket *so, __unused struct sockaddr *nam, __unused struct proc *p) { return EINVAL; } static int -raw_uconnect(struct socket *so, struct sockaddr *nam, struct proc *p) +raw_uconnect(__unused struct socket *so, __unused struct sockaddr *nam, __unused struct proc *p) { return EINVAL; } @@ -251,7 +243,7 @@ raw_udetach(struct socket *so) mutex_held = (*so->so_proto->pr_getlock)(so, 0); else mutex_held = so->so_proto->pr_domain->dom_mtx; - lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(mutex_held, LCK_MTX_ASSERT_OWNED); if (rp == 0) return EINVAL; @@ -295,7 +287,7 @@ raw_upeeraddr(struct socket *so, struct sockaddr **nam) static int raw_usend(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *nam, struct mbuf *control, struct proc *p) + struct sockaddr *nam, struct mbuf *control, __unused struct proc *p) { int error; struct rawcb *rp = sotorawcb(so); @@ -305,7 +297,7 @@ raw_usend(struct socket *so, int flags, struct mbuf *m, mutex_held = (*so->so_proto->pr_getlock)(so, 0); else mutex_held = so->so_proto->pr_domain->dom_mtx; - lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(mutex_held, LCK_MTX_ASSERT_OWNED); if (rp == 0) { error = EINVAL; @@ -317,6 +309,11 @@ raw_usend(struct socket *so, int flags, struct mbuf *m, goto release; } + if (so->so_proto->pr_output == NULL) { + error = EOPNOTSUPP; + goto release; + } + if (control && control->m_len) { error = EOPNOTSUPP; goto release; @@ -334,7 +331,7 @@ raw_usend(struct socket *so, int flags, struct mbuf *m, error = (*so->so_proto->pr_output)(m, so); m = NULL; if (nam) - rp->rcb_faddr = 0; + rp->rcb_faddr = NULL; release: if (m != NULL) m_freem(m); @@ -352,7 +349,7 @@ raw_ushutdown(struct socket *so) mutex_held = (*so->so_proto->pr_getlock)(so, 0); else mutex_held = so->so_proto->pr_domain->dom_mtx; - lck_mtx_assert(mutex_held, LCK_MTX_ASSERT_OWNED); + LCK_MTX_ASSERT(mutex_held, LCK_MTX_ASSERT_OWNED); if (rp == 0) return EINVAL; @@ -374,9 +371,16 @@ raw_usockaddr(struct socket *so, struct sockaddr **nam) } struct pr_usrreqs raw_usrreqs = { - raw_uabort, pru_accept_notsupp, raw_uattach, raw_ubind, raw_uconnect, - pru_connect2_notsupp, pru_control_notsupp, raw_udetach, - raw_udisconnect, pru_listen_notsupp, raw_upeeraddr, pru_rcvd_notsupp, - pru_rcvoob_notsupp, raw_usend, pru_sense_null, raw_ushutdown, - raw_usockaddr, sosend, soreceive, pru_sopoll_notsupp + .pru_abort = raw_uabort, + .pru_attach = raw_uattach, + .pru_bind = raw_ubind, + .pru_connect = raw_uconnect, + .pru_detach = raw_udetach, + .pru_disconnect = raw_udisconnect, + .pru_peeraddr = raw_upeeraddr, + .pru_send = raw_usend, + .pru_shutdown = raw_ushutdown, + .pru_sockaddr = raw_usockaddr, + .pru_sosend = sosend, + .pru_soreceive = soreceive, };