*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/file.h>
+#include <sys/kauth.h>
#include <net/if.h>
#include <net/if_dl.h>
{0xC0, 0x00, 0x40, 0x00, 0x00, 0x00}};
/* called only in router mode */
-static int set_zones(ifz)
- zone_usage_t *ifz;
+static int set_zones(zone_usage_t *ifz)
/* 1. adds zone to table
2. looks up each route entry from zone list
* ifp is 0 if not an interface-specific ioctl.
*/
-int at_control(so, cmd, data, ifp)
+int
+at_control(so, cmd, data, ifp)
struct socket *so;
u_long cmd;
caddr_t data;
struct ifaddr *ifa;
struct sockaddr_dl *sdl;
- if (cmd == 0x2000ff99) {
+ if ((cmd & 0xffff) == 0xff99) {
+ u_long fixed_command;
/* *** this is a temporary hack to get at_send_to_dev() to
work with BSD-style sockets instead of the special purpose
system calls, ATsocket() and ATioctl().
*** */
- if ((error = at_ioctl((struct atpcb *)so->so_pcb, cmd, data, 0))) {
+ fixed_command = _IOW(0, 0xff99, user_addr_t);
+ if ((error = at_ioctl((struct atpcb *)so->so_pcb, fixed_command, data, 0))) {
if (((struct atpcb *)so->so_pcb)->proto != ATPROTO_LAP) {
((struct atpcb *)so->so_pcb)->proto = ATPROTO_LAP;
- error = at_ioctl((struct atpcb *)so->so_pcb, cmd, data, 0);
+ error = at_ioctl((struct atpcb *)so->so_pcb, fixed_command, data , 0);
}
}
return(error);
at_def_zone_t *defzonep = (at_def_zone_t *)data;
/* check for root access */
- if (error = suser(p->p_ucred, &p->p_acflag))
+ if (error = suser(kauth_cred_get(), 0))
return(EACCES);
ifID = 0;
{
at_nbp_reg_t *nbpP = (at_nbp_reg_t *)data;
nve_entry_t nve;
- int error;
+ int error2;
if (!(at_state.flags & AT_ST_STARTED) || !ifID_home)
return(ENOTREADY);
/* Normal case; no tuple found for this name, so insert
* this tuple in the registry and return ok response.
*/
- ATDISABLE(nve_lock, NVE_LOCK);
- if ((error = nbp_new_nve_entry(&nve, ifID)) == 0) {
+ if ((error2 = nbp_new_nve_entry(&nve, ifID)) == 0) {
nbpP->addr.net = ifID->ifThisNode.s_net;
nbpP->addr.node = ifID->ifThisNode.s_node;
nbpP->unique_nbp_id = nve.unique_nbp_id;
}
- ATENABLE(nve_lock, NVE_LOCK);
- return(error);
+ return(error2);
break;
}
/* delete by id */
if (nbpP->unique_nbp_id) {
- ATDISABLE(nve_lock, NVE_LOCK);
TAILQ_FOREACH(nve_entry, &name_registry, nve_link) {
if (nve_entry->unique_nbp_id == nbpP->unique_nbp_id) {
/* Found a match! */
nbp_delete_entry(nve_entry);
- ATENABLE(nve_lock, NVE_LOCK);
return(0);
}
}
- ATENABLE(nve_lock, NVE_LOCK);
return(EADDRNOTAVAIL);
}
if ((nve_entry = nbp_find_nve(&nve)) == NULL)
continue;
- ATDISABLE(nve_lock, NVE_LOCK);
nbp_delete_entry(nve_entry);
- ATENABLE(nve_lock, NVE_LOCK);
found = TRUE;
}
if (found)
/* Normal case; tuple found for this name, so delete
* the entry from the registry and return ok response.
*/
- ATDISABLE(nve_lock, NVE_LOCK);
nbp_delete_entry(nve_entry);
- ATENABLE(nve_lock, NVE_LOCK);
return(0);
break;
at_router_params_t *rt = (at_router_params_t *)data;
/* check for root access */
- if (error = suser(p->p_ucred, &p->p_acflag))
+ if (error = suser(kauth_cred_get(), 0))
return(EACCES);
/* when in routing/multihome mode the AIOCSETROUTER IOCTL
at_kern_err_t *keP = (at_kern_err_t *)data;
/* check for root access */
- if (suser(p->p_ucred, &p->p_acflag))
+ if (suser(kauth_cred_get(), 0))
return(EACCES);
if (!(at_state.flags & AT_ST_STARTED))
ret;
/* check for root access */
- if (error = suser(p->p_ucred, &p->p_acflag))
+ if (error = suser(kauth_cred_get(), 0))
return(EACCES);
ret = ddp_shutdown(*count_only);
case SIOCSIFADDR:
/* check for root access */
- if (error = suser(p->p_ucred, &p->p_acflag))
+ if (error = suser(kauth_cred_get(), 0))
error = EACCES;
else if (ifID)
error = EEXIST;
ifID->aa_ifp = ifp;
ifa = &ifID->aa_ifa;
+ ifnet_lock_exclusive(ifp);
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr) &&
(sdl->sdl_family == AF_LINK)) {
ifID->ifNodeAddress.sat_family = AF_APPLETALK;
/* the address itself will be filled in when ifThisNode
is set */
- s = splnet();
- TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
- splx(s);
+ if_attach_ifa(ifp, ifa);
+ ifnet_lock_done(ifp);
switch (ifp->if_type) {
case IFT_ETHER:
- ether_attach_at(ifp, &ifID->at_dl_tag,
- &ifID->aarp_dl_tag);
+ case IFT_L2VLAN:
+ case IFT_IEEE8023ADLAG: /* bonded ethernet */
+ ether_attach_at(ifp);
error = 0;
ifID->cable_multicast_addr = etalk_multicast_addr;
deletion of interfaces *** */
case SIOCDIFADDR:
/* check for root access */
- if (error = suser(p->p_ucred, &p->p_acflag))
+ if (error = suser(kauth_cred_get(), 0))
error = EACCES;
else if (!ifID)
error = EINVAL;
#endif
case SIOCSETOT: {
- int s;
struct atpcb *at_pcb, *clonedat_pcb;
int cloned_fd = *(int *)data;
- s = splnet(); /* XXX */
at_pcb = sotoatpcb(so);
/* let's make sure it's either -1 or a valid file descriptor */
if (cloned_fd != -1) {
struct socket *cloned_so;
- struct file *cloned_fp;
- error = getsock(p->p_fd, cloned_fd, &cloned_fp);
- if (error){
- splx(s); /* XXX */
+ error = file_socket(cloned_fd, &cloned_so);
+ if (error)
break;
- }
- cloned_so = (struct socket *)cloned_fp->f_data;
clonedat_pcb = sotoatpcb(cloned_so);
} else {
clonedat_pcb = NULL;
} else {
at_pcb->ddp_flags = clonedat_pcb->ddp_flags;
}
- splx(s); /* XXX */
+ file_drop(cloned_fd);
break;
}
projects / apple / xnu.git / blobdiff