/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
* provided that the above copyright notice and this paragraph are
* from this software without specific prior written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#)uipc_usrreq.c 7.9 (Berkeley) %G%
+ * @(#)uipc_usrreq.c 7.19 (Berkeley) %G%
*/
#include "param.h"
-#include "dir.h"
#include "user.h"
-#include "mbuf.h"
#include "domain.h"
#include "protosw.h"
#include "socket.h"
#include "socketvar.h"
#include "unpcb.h"
#include "un.h"
-#include "inode.h"
+#include "vnode.h"
#include "file.h"
#include "stat.h"
+#include "mbuf.h"
/*
* Unix communications domain.
* rethink name space problems
* need a proper out-of-band
*/
-struct sockaddr sun_noname = { AF_UNIX };
+struct sockaddr sun_noname = { sizeof(sun_noname), AF_UNIX };
ino_t unp_ino; /* prototype for fake inode numbers */
/*ARGSUSED*/
-uipc_usrreq(so, req, m, nam, rights)
+uipc_usrreq(so, req, m, nam, control)
struct socket *so;
int req;
- struct mbuf *m, *nam, *rights;
+ struct mbuf *m, *nam, *control;
{
struct unpcb *unp = sotounpcb(so);
register struct socket *so2;
- int error = 0;
+ register int error = 0;
if (req == PRU_CONTROL)
return (EOPNOTSUPP);
- if (req != PRU_SEND && rights && rights->m_len) {
+ if (req != PRU_SEND && control && control->m_len) {
error = EOPNOTSUPP;
goto release;
}
break;
case PRU_LISTEN:
- if (unp->unp_inode == 0)
+ if (unp->unp_vnode == 0)
error = EINVAL;
break;
break;
case PRU_SEND:
- if (rights) {
- error = unp_internalize(rights);
- if (error)
- break;
- }
+ if (control && (error = unp_internalize(control)))
+ break;
switch (so->so_type) {
case SOCK_DGRAM: {
from = mtod(unp->unp_addr, struct sockaddr *);
else
from = &sun_noname;
- if (sbspace(&so2->so_rcv) > 0 &&
- sbappendaddr(&so2->so_rcv, from, m, rights)) {
+ if (sbappendaddr(&so2->so_rcv, from, m, control)) {
sorwakeup(so2);
m = 0;
+ control = 0;
} else
error = ENOBUFS;
if (nam)
* send buffer hiwater marks to maintain backpressure.
* Wake up readers.
*/
- if (rights)
- (void)sbappendrights(rcv, m, rights);
- else
+ if (control) {
+ (void)sbappendcontrol(rcv, m, control);
+ control = 0;
+ } else
sbappend(rcv, m);
snd->sb_mbmax -=
rcv->sb_mbcnt - unp->unp_conn->unp_mbcnt;
panic("piusrreq");
}
release:
+ if (control)
+ m_freem(control);
if (m)
m_freem(m);
return (error);
register struct unpcb *unp;
{
- if (unp->unp_inode) {
- unp->unp_inode->i_socket = 0;
- irele(unp->unp_inode);
- unp->unp_inode = 0;
+ if (unp->unp_vnode) {
+ unp->unp_vnode->v_socket = 0;
+ vrele(unp->unp_vnode);
+ unp->unp_vnode = 0;
}
if (unp->unp_conn)
unp_disconnect(unp);
struct mbuf *nam;
{
struct sockaddr_un *soun = mtod(nam, struct sockaddr_un *);
- register struct inode *ip;
+ register struct vnode *vp;
register struct nameidata *ndp = &u.u_nd;
+ struct vattr vattr;
int error;
ndp->ni_dirp = soun->sun_path;
- if (unp->unp_inode != NULL)
+ if (unp->unp_vnode != NULL)
return (EINVAL);
if (nam->m_len == MLEN) {
if (*(mtod(nam, caddr_t) + nam->m_len - 1) != 0)
} else
*(mtod(nam, caddr_t) + nam->m_len) = 0;
/* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */
- ndp->ni_nameiop = CREATE | FOLLOW;
+ ndp->ni_nameiop = CREATE | FOLLOW | LOCKPARENT;
ndp->ni_segflg = UIO_SYSSPACE;
- ip = namei(ndp);
- if (ip) {
- iput(ip);
- return (EADDRINUSE);
- }
- if (error = u.u_error) {
- u.u_error = 0; /* XXX */
+ if (error = namei(ndp))
return (error);
+ vp = ndp->ni_vp;
+ if (vp != NULL) {
+ VOP_ABORTOP(ndp);
+ if (ndp->ni_dvp == vp)
+ vrele(ndp->ni_dvp);
+ else
+ vput(ndp->ni_dvp);
+ vrele(vp);
+ return (EADDRINUSE);
}
- ip = maknode(IFSOCK | 0777, ndp);
- if (ip == NULL) {
- error = u.u_error; /* XXX */
- u.u_error = 0; /* XXX */
+ VATTR_NULL(&vattr);
+ vattr.va_type = VSOCK;
+ vattr.va_mode = 0777;
+ if (error = VOP_CREATE(ndp, &vattr))
return (error);
- }
- ip->i_socket = unp->unp_socket;
- unp->unp_inode = ip;
+ vp = ndp->ni_vp;
+ vp->v_socket = unp->unp_socket;
+ unp->unp_vnode = vp;
unp->unp_addr = m_copy(nam, 0, (int)M_COPYALL);
- iunlock(ip); /* but keep reference */
+ VOP_UNLOCK(vp);
return (0);
}
struct mbuf *nam;
{
register struct sockaddr_un *soun = mtod(nam, struct sockaddr_un *);
- register struct inode *ip;
+ register struct vnode *vp;
register struct socket *so2, *so3;
register struct nameidata *ndp = &u.u_nd;
struct unpcb *unp2, *unp3;
return (EMSGSIZE);
} else
*(mtod(nam, caddr_t) + nam->m_len) = 0;
- ndp->ni_nameiop = LOOKUP | FOLLOW;
+ ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
ndp->ni_segflg = UIO_SYSSPACE;
- ip = namei(ndp);
- if (ip == 0) {
- error = u.u_error;
- u.u_error = 0;
- return (error); /* XXX */
- }
- if (access(ip, IWRITE)) {
- error = u.u_error;
- u.u_error = 0; /* XXX */
- goto bad;
- }
- if ((ip->i_mode&IFMT) != IFSOCK) {
+ if (error = namei(ndp))
+ return (error);
+ vp = ndp->ni_vp;
+ if (vp->v_type != VSOCK) {
error = ENOTSOCK;
goto bad;
}
- so2 = ip->i_socket;
+ if (error = VOP_ACCESS(vp, VWRITE, ndp->ni_cred))
+ goto bad;
+ so2 = vp->v_socket;
if (so2 == 0) {
error = ECONNREFUSED;
goto bad;
}
if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
- (so3 = sonewconn(so2)) == 0) {
+ (so3 = sonewconn(so2, 0)) == 0) {
error = ECONNREFUSED;
goto bad;
}
unp2 = sotounpcb(so2);
unp3 = sotounpcb(so3);
if (unp2->unp_addr)
- unp3->unp_addr = m_copy(unp2->unp_addr, 0, M_COPYALL);
+ unp3->unp_addr =
+ m_copy(unp2->unp_addr, 0, (int)M_COPYALL);
so2 = so3;
}
error = unp_connect2(so, so2);
bad:
- iput(ip);
+ vput(vp);
return (error);
}
case SOCK_STREAM:
unp2->unp_conn = unp;
- soisconnected(so2);
soisconnected(so);
+ soisconnected(so2);
break;
default:
unp_externalize(rights)
struct mbuf *rights;
{
- int newfds = rights->m_len / sizeof (int);
register int i;
- register struct file **rp = mtod(rights, struct file **);
+ register struct cmsghdr *cm = mtod(rights, struct cmsghdr *);
+ register struct file **rp = (struct file **)(cm + 1);
register struct file *fp;
+ int newfds = (cm->cmsg_len - sizeof(*cm)) / sizeof (int);
int f;
if (newfds > ufavail()) {
return (EMSGSIZE);
}
for (i = 0; i < newfds; i++) {
- f = ufalloc(0);
- if (f < 0)
+ if (ufalloc(0, &f))
panic("unp_externalize");
fp = *rp;
u.u_ofile[f] = fp;
return (0);
}
-unp_internalize(rights)
- struct mbuf *rights;
+unp_internalize(control)
+ struct mbuf *control;
{
+ register struct cmsghdr *cm = mtod(control, struct cmsghdr *);
register struct file **rp;
- int oldfds = rights->m_len / sizeof (int);
- register int i;
register struct file *fp;
+ register int i, fd;
+ int oldfds;
- rp = mtod(rights, struct file **);
- for (i = 0; i < oldfds; i++)
- if (getf(*(int *)rp++) == 0)
+ if (cm->cmsg_type != SCM_RIGHTS || cm->cmsg_level != SOL_SOCKET ||
+ cm->cmsg_len != control->m_len)
+ return (EINVAL);
+ oldfds = (cm->cmsg_len - sizeof (*cm)) / sizeof (int);
+ rp = (struct file **)(cm + 1);
+ for (i = 0; i < oldfds; i++) {
+ fd = *(int *)rp++;
+ if ((unsigned)fd >= NOFILE || u.u_ofile[fd] == NULL)
return (EBADF);
- rp = mtod(rights, struct file **);
+ }
+ rp = (struct file **)(cm + 1);
for (i = 0; i < oldfds; i++) {
- fp = getf(*(int *)rp);
+ fp = u.u_ofile[*(int *)rp];
*rp++ = fp;
fp->f_count++;
fp->f_msgcount++;
{
register struct mbuf *m;
register struct file **rp;
+ register struct cmsghdr *cm;
register int i;
int qfds;
while (m0) {
for (m = m0; m; m = m->m_next)
- if (m->m_type == MT_RIGHTS && m->m_len) {
- qfds = m->m_len / sizeof (struct file *);
- rp = mtod(m, struct file **);
+ if (m->m_type == MT_CONTROL &&
+ m->m_len >= sizeof(*cm)) {
+ cm = mtod(m, struct cmsghdr *);
+ if (cm->cmsg_level != SOL_SOCKET ||
+ cm->cmsg_type != SCM_RIGHTS)
+ continue;
+ qfds = (cm->cmsg_len - sizeof *cm)
+ / sizeof (struct file *);
+ rp = (struct file **)(cm + 1);
for (i = 0; i < qfds; i++)
(*op)(*rp++);
break; /* XXX, but saves time */
fp->f_msgcount--;
unp_rights--;
- closef(fp);
+ (void) closef(fp);
}