/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, 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) 1996 Apple Computer, Inc.
* Kernel process to implement the AURP daemon:
* manage tunnels to remote AURP servers across IP networks
*/
+#ifdef AURP_SUPPORT
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/proc.h>
+#include <sys/kauth.h>
#include <sys/filedesc.h>
#include <sys/fcntl.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/malloc.h>
#include <sys/proc.h>
+#include <sys/uio_internal.h>
+#include <kern/locks.h>
#include <netinet/in.h>
#include <net/if.h>
#include <netat/sysglue.h>
#include <netat/appletalk.h>
+#include <netat/at_pcb.h>
#include <netat/at_var.h>
#include <netat/routing_tables.h>
#include <netat/at_pcb.h>
#define M_RCVBUF (64 * 1024)
#define M_SNDBUF (64 * 1024)
+extern lck_mtx_t * atalk_mutex;
+
static int ip_to_atalk(struct sockaddr_in *fp, register gbuf_t *p_mbuf);
static int aurp_bindrp(struct socket *so);
int maxbuf;
struct sockopt sopt;
- if (suser(current_proc()->p_ucred, ¤t_proc()->p_acflag) != 0 )
+ if (suser(kauth_cred_get(), 0) != 0 )
return(EPERM);
/*
*/
bzero((char *)&aurp_global.tunnel, sizeof(aurp_global.tunnel));
/*lock_alloc(&aurp_global.glock, LOCK_ALLOC_PIN, AURP_EVNT_LOCK, -1);*/
- ATLOCKINIT(aurp_global.glock);
ATEVENTINIT(aurp_global.event_anchor);
/* open udp socket */
goto out;
} else {
maxbuf = M_RCVBUF;
- sopt.sopt_val = &maxbuf;
+ sopt.sopt_val = CAST_USER_ADDR_T(&maxbuf);
sopt.sopt_valsize = sizeof(maxbuf);
sopt.sopt_level = SOL_SOCKET;
sopt.sopt_name = SO_RCVBUF;
sopt.sopt_dir = SOPT_SET;
+ sopt.sopt_p = NULL;
if ((error = sosetopt(so, &sopt)) != 0)
goto out;
}
} else {
maxbuf = M_SNDBUF;
- sopt.sopt_val = &maxbuf;
+ sopt.sopt_val = CAST_USER_ADDR_T(&maxbuf);
sopt.sopt_valsize = sizeof(maxbuf);
sopt.sopt_level = SOL_SOCKET;
sopt.sopt_name = SO_SNDBUF;
sopt.sopt_dir = SOPT_SET;
+ sopt.sopt_p = NULL;
if ((error = sosetopt(so, &sopt)) != 0)
goto out;
}
so->so_snd.sb_flags |=(SB_SEL|SB_NOINTR);
out:
- sbunlock(&so->so_snd);
- sbunlock(&so->so_rcv);
+ sbunlock(&so->so_snd, 0);
+ sbunlock(&so->so_rcv, 0);
return(error);
}
AURPgetmsg(err)
int *err;
{ register struct socket *so;
- register int s, events;
+ register int events;
so = aurp_global.tunnel;
*err = 0;
for (;;)
{ gbuf_t *from, *p_mbuf;
int flags = MSG_DONTWAIT;
- struct uio auio;
+ uio_t auio;
+ char uio_buf[ UIO_SIZEOF(0) ];
/*
* Wait for a package to arrive. This will be from the
* when a packet arrives
*/
- ATDISABLE(s, aurp_global.glock);
events = aurp_global.event;
if (((*err == 0) || (*err == EWOULDBLOCK)) && events == 0)
{
- *err = tsleep(&aurp_global.event_anchor, PSOCK | PCATCH, "AURPgetmsg", 0);
+ lck_mtx_assert(atalk_mutex, LCK_MTX_ASSERT_OWNED);
+ *err = msleep(&aurp_global.event_anchor, atalk_mutex, PSOCK | PCATCH, "AURPgetmsg", 0);
events = aurp_global.event;
aurp_global.event = 0;
}
- ATENABLE(s, aurp_global.glock);
/*
* Shut down if we have the AE_SHUTDOWN event or if we got
* give it no iov's, point off to non-existant user space,
* but make sure the 'resid' count means somehting.
*/
-
- auio.uio_iov = NULL;
- auio.uio_iovcnt = 0;
- auio.uio_segflg = UIO_SYSSPACE;
- auio.uio_offset = 0; /* XXX */
+ auio = uio_createwithbuffer(0, 0, UIO_SYSSPACE, UIO_READ,
+ &uio_buf[0], sizeof(uio_buf));
/* Keep up an even flow... */
for (;;)
#define A_LARGE_SIZE 700
flags = MSG_DONTWAIT;
- auio.uio_resid = A_LARGE_SIZE;
- *err = soreceive(so, (struct sockaddr **)&from, &auio, &p_mbuf, 0, &flags);
+ uio_setresid(auio, A_LARGE_SIZE);
+ *err = soreceive(so, (struct sockaddr **)&from, auio, &p_mbuf, 0, &flags);
dPrintf(D_M_AURP, D_L_VERBOSE,
("AURPgetmsg: soreceive returned %d, aurp_global.event==0x%x\n", *err, events));
/* soreceive() sets *mp to zero! at start */
if (p_mbuf)
- ip_to_atalk(from, p_mbuf);
+ ip_to_atalk((struct sockaddr_in *)from, p_mbuf);
if (*err || (p_mbuf == NULL)) {
/*
* An error occurred in soreceive(),
* which will wake us from the sleep at
* the top of the outer loop.
*/
- int s;
- ATDISABLE(s, aurp_global.glock);
aurp_global.event &= ~AE_UDPIP;
- ATENABLE(s, aurp_global.glock);
dPrintf(D_M_AURP, D_L_WARNING, ("AURPgetmsg: spurious soreceive, err==%d, p_mbuf==0x%x\n", *err, (unsigned int) p_mbuf));
break;
}
*
* This conforms to the so_upcall function pointer member of struct sockbuf.
*/
-void aurp_wakeup(struct socket *so, register caddr_t p, int state)
+void aurp_wakeup(__unused struct socket *so, register caddr_t p, __unused int state)
{
- register int s;
register int bit;
bit = (int) p;
- ATDISABLE(s, aurp_global.glock);
aurp_global.event |= bit;
- ATENABLE(s, aurp_global.glock);
dPrintf(D_M_AURP, D_L_STATE_CHG,
("aurp_wakeup: bit 0x%x, aurp_global.event now 0x%x\n",
bit, aurp_global.event));
- thread_wakeup(&aurp_global.event_anchor);
+ wakeup(&aurp_global.event_anchor);
}
/*
{
struct sockaddr_in sin;
struct proc *p = current_proc();
- gbuf_t *m;
int error;
sblock(&so->so_snd, M_WAIT);
so->so_state |= SS_PRIV;
error = (*so->so_proto->pr_usrreqs->pru_bind)(so, (struct sockaddr *) &sin, p);
- sbunlock(&so->so_snd);
- sbunlock(&so->so_rcv);
+ sbunlock(&so->so_snd, 0);
+ sbunlock(&so->so_rcv, 0);
return (error);
}
int error;
int flags = MSG_DONTWAIT;
struct sockaddr_in rem_addr;
- int s;
- m->m_type = MT_HEADER;
+ m_mchtype(m, MT_HEADER);
m->m_pkthdr.len = gbuf_msgsize(m);
m->m_pkthdr.rcvif = 0;
domain = (aurp_domain_t *)gbuf_rptr(m);
*(long *) &rem_addr.sin_addr = domain->dst_address;
- ATDISABLE(s, aurp_global.glock);
aurp_global.running++;
- ATENABLE(s, aurp_global.glock);
if (aurp_global.shutdown) {
gbuf_freem(m);
- ATDISABLE(s, aurp_global.glock);
aurp_global.running--;
- ATENABLE(s, aurp_global.glock);
dPrintf(D_M_AURP, D_L_SHUTDN_INFO,
("atalk_to_ip: detected aurp_global.shutdown state\n"));
return;
error));
}
- ATDISABLE(s, aurp_global.glock);
aurp_global.running--;
- ATENABLE(s, aurp_global.glock);
return;
}
+#endif /* AURP_SUPPORT */
projects / apple / xnu.git / blobdiff