fix olstat to give the correct symlink info

[unix-history] / usr / src / sys / kern / uipc_syscalls.c

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index f3ac96b..158aaca 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,163 +1,184 @@
-/*     uipc_syscalls.c 4.42    83/01/13        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/descrip.h"
-#include "../h/uio.h"
+/*
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)uipc_syscalls.c     8.5 (Berkeley) %G%
+ */
+
+#include <sys/param.h>
+#include <sys/filedesc.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#ifdef KTRACE
+#include <sys/ktrace.h>
+#endif

 
 /*
  * System call interface to the socket abstraction.
  */
 
 /*
  * System call interface to the socket abstraction.
  */

+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+#define COMPAT_OLDSOCK
+#endif
+
+extern struct fileops socketops;

 
 

-socket()
+struct socket_args {
+       int     domain;
+       int     type;
+       int     protocol;
+};
+socket(p, uap, retval)
+       struct proc *p;
+       register struct socket_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     domain;
-               int     type;
-               int     protocol;
-       } *uap = (struct a *)u.u_ap;
+       struct filedesc *fdp = p->p_fd;

        struct socket *so;
        struct socket *so;

-       register struct file *fp;
+       struct file *fp;
+       int fd, error;

 
 

-       if ((fp = falloc()) == NULL)
-               return;
+       if (error = falloc(p, &fp, &fd))
+               return (error);

        fp->f_flag = FREAD|FWRITE;
        fp->f_type = DTYPE_SOCKET;
        fp->f_flag = FREAD|FWRITE;
        fp->f_type = DTYPE_SOCKET;

-       u.u_error = socreate(uap->domain, &so, uap->type, uap->protocol);
-       if (u.u_error)
-               goto bad;
-       fp->f_socket = so;
-       return;
-bad:
-       u.u_ofile[u.u_r.r_val1] = 0;
-       fp->f_count = 0;
+       fp->f_ops = &socketops;
+       if (error = socreate(uap->domain, &so, uap->type, uap->protocol)) {
+               fdp->fd_ofiles[fd] = 0;
+               ffree(fp);
+       } else {
+               fp->f_data = (caddr_t)so;
+               *retval = fd;
+       }
+       return (error);

 }
 
 }
 

-bind()
+struct bind_args {
+       int     s;
+       caddr_t name;
+       int     namelen;
+};
+/* ARGSUSED */
+bind(p, uap, retval)
+       struct proc *p;
+       register struct bind_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t name;
-               int     namelen;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+       struct file *fp;

        struct mbuf *nam;
        struct mbuf *nam;

+       int error;

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       u.u_error = sockname(&nam, uap->name, uap->namelen);
-       if (u.u_error)
-               return;
-       u.u_error = sobind(fp->f_socket, nam);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))
+               return (error);
+       error = sobind((struct socket *)fp->f_data, nam);

        m_freem(nam);
        m_freem(nam);

+       return (error);

 }
 
 }
 

-listen()
+struct listen_args {
+       int     s;
+       int     backlog;
+};
+/* ARGSUSED */
+listen(p, uap, retval)
+       struct proc *p;
+       register struct listen_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               int     backlog;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+       struct file *fp;
+       int error;

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       u.u_error = solisten(fp->f_socket, uap->backlog);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       return (solisten((struct socket *)fp->f_data, uap->backlog));

 }
 
 }
 

-accept()
+struct accept_args {
+       int     s;
+       caddr_t name;
+       int     *anamelen;
+#ifdef COMPAT_OLDSOCK
+       int     compat_43;      /* pseudo */
+#endif
+};
+
+#ifdef COMPAT_OLDSOCK
+accept(p, uap, retval)
+       struct proc *p;
+       struct accept_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t name;
-               int     *anamelen;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+
+       uap->compat_43 = 0;
+       return (accept1(p, uap, retval));
+}
+
+oaccept(p, uap, retval)
+       struct proc *p;
+       struct accept_args *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       return (accept1(p, uap, retval));
+}
+#else /* COMPAT_OLDSOCK */
+
+#define        accept1 accept
+#endif
+
+accept1(p, uap, retval)
+       struct proc *p;
+       register struct accept_args *uap;
+       int *retval;
+{
+       struct file *fp;

        struct mbuf *nam;
        struct mbuf *nam;

-       int namelen;
-       int s;
+       int namelen, error, s;

        register struct socket *so;
 
        register struct socket *so;
 

-       if (uap->name == 0)
-               goto noname;
-       u.u_error = copyin((caddr_t)uap->anamelen, (caddr_t)&namelen,
-               sizeof (namelen));
-       if (u.u_error)
-               return;
-       if (useracc((caddr_t)uap->name, (u_int)namelen, B_WRITE) == 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-noname:
-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
+       if (uap->name && (error = copyin((caddr_t)uap->anamelen,
+           (caddr_t)&namelen, sizeof (namelen))))
+               return (error);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);

        s = splnet();
        s = splnet();

-       so = fp->f_socket;
+       so = (struct socket *)fp->f_data;

        if ((so->so_options & SO_ACCEPTCONN) == 0) {
        if ((so->so_options & SO_ACCEPTCONN) == 0) {

-               u.u_error = EINVAL;

                splx(s);
                splx(s);

-               return;
+               return (EINVAL);

        }
        if ((so->so_state & SS_NBIO) && so->so_qlen == 0) {
        }
        if ((so->so_state & SS_NBIO) && so->so_qlen == 0) {

-               u.u_error = EWOULDBLOCK;

                splx(s);
                splx(s);

-               return;
+               return (EWOULDBLOCK);

        }
        while (so->so_qlen == 0 && so->so_error == 0) {
                if (so->so_state & SS_CANTRCVMORE) {
                        so->so_error = ECONNABORTED;
                        break;
                }
        }
        while (so->so_qlen == 0 && so->so_error == 0) {
                if (so->so_state & SS_CANTRCVMORE) {
                        so->so_error = ECONNABORTED;
                        break;
                }

-               sleep((caddr_t)&so->so_timeo, PZERO+1);
+               if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
+                   netcon, 0)) {
+                       splx(s);
+                       return (error);
+               }

        }
        if (so->so_error) {
        }
        if (so->so_error) {

-               u.u_error = so->so_error;
+               error = so->so_error;
+               so->so_error = 0;

                splx(s);
                splx(s);

-               return;
+               return (error);

        }
        }

-       if ((so->so_options & SO_NEWFDONCONN) == 0) {
-               struct socket *nso = so->so_q;
-               (void) soqremque(nso, 1);
-               u.u_error = soclose(so, 1);
-               fp->f_socket = nso;
-               nso->so_q = 0;
-               so = nso;
-               goto ret;
-       }
-       if (ufalloc() < 0) {
+       if (error = falloc(p, &fp, retval)) {

                splx(s);
                splx(s);

-               return;
-       }
-       fp = falloc();
-       if (fp == 0) {
-               u.u_ofile[u.u_r.r_val1] = 0;
-               splx(s);
-               return;
+               return (error);

        }
        { struct socket *aso = so->so_q;
          if (soqremque(aso, 1) == 0)
        }
        { struct socket *aso = so->so_q;
          if (soqremque(aso, 1) == 0)


@@ -166,459 +187,1001 @@ noname:
        }
        fp->f_type = DTYPE_SOCKET;
        fp->f_flag = FREAD|FWRITE;
        }
        fp->f_type = DTYPE_SOCKET;
        fp->f_flag = FREAD|FWRITE;

-       fp->f_socket = so;
-ret:
+       fp->f_ops = &socketops;
+       fp->f_data = (caddr_t)so;

        nam = m_get(M_WAIT, MT_SONAME);
        (void) soaccept(so, nam);
        if (uap->name) {
        nam = m_get(M_WAIT, MT_SONAME);
        (void) soaccept(so, nam);
        if (uap->name) {

+#ifdef COMPAT_OLDSOCK
+               if (uap->compat_43)
+                       mtod(nam, struct osockaddr *)->sa_family =
+                           mtod(nam, struct sockaddr *)->sa_family;
+#endif

                if (namelen > nam->m_len)
                        namelen = nam->m_len;
                /* SHOULD COPY OUT A CHAIN HERE */
                if (namelen > nam->m_len)
                        namelen = nam->m_len;
                /* SHOULD COPY OUT A CHAIN HERE */

-               (void) copyout(mtod(nam, caddr_t), (caddr_t)uap->name,
-                   (u_int)namelen);
-               (void) copyout((caddr_t)&namelen, (caddr_t)uap->anamelen,
-                   sizeof (*uap->anamelen));
+               if ((error = copyout(mtod(nam, caddr_t), (caddr_t)uap->name,
+                   (u_int)namelen)) == 0)
+                       error = copyout((caddr_t)&namelen,
+                           (caddr_t)uap->anamelen, sizeof (*uap->anamelen));

        }
        m_freem(nam);
        splx(s);
        }
        m_freem(nam);
        splx(s);

+       return (error);

 }
 
 }
 

-connect()
+struct connect_args {
+       int     s;
+       caddr_t name;
+       int     namelen;
+};
+/* ARGSUSED */
+connect(p, uap, retval)
+       struct proc *p;
+       register struct connect_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t name;
-               int     namelen;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+       struct file *fp;

        register struct socket *so;
        struct mbuf *nam;
        register struct socket *so;
        struct mbuf *nam;

-       int s;
+       int error, s;

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       so = fp->f_socket;
-       u.u_error = sockname(&nam, uap->name, uap->namelen);
-       if (u.u_error)
-               return;
-       u.u_error = soconnect(so, nam);
-       if (u.u_error)
-               goto bad;
-       s = splnet();
-       if ((so->so_state & SS_NBIO) &&
-           (so->so_state & SS_ISCONNECTING)) {
-               u.u_error = EINPROGRESS;
-               splx(s);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       so = (struct socket *)fp->f_data;
+       if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING))
+               return (EALREADY);
+       if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))
+               return (error);
+       error = soconnect(so, nam);
+       if (error)

                goto bad;
                goto bad;

+       if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
+               m_freem(nam);
+               return (EINPROGRESS);

        }
        }

+       s = splnet();

        while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)
        while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)

-               sleep((caddr_t)&so->so_timeo, PZERO+1);
-       u.u_error = so->so_error;
-       so->so_error = 0;
+               if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
+                   netcon, 0))
+                       break;
+       if (error == 0) {
+               error = so->so_error;
+               so->so_error = 0;
+       }

        splx(s);
 bad:
        splx(s);
 bad:

+       so->so_state &= ~SS_ISCONNECTING;

        m_freem(nam);
        m_freem(nam);

+       if (error == ERESTART)
+               error = EINTR;
+       return (error);

 }
 
 }
 

-socketpair()
+struct socketpair_args {
+       int     domain;
+       int     type;
+       int     protocol;
+       int     *rsv;
+};
+socketpair(p, uap, retval)
+       struct proc *p;
+       register struct socketpair_args *uap;
+       int retval[];

 {
 {

+       register struct filedesc *fdp = p->p_fd;
+       struct file *fp1, *fp2;
+       struct socket *so1, *so2;
+       int fd, error, sv[2];

 
 

-       u.u_error = ENOENT;
+       if (error = socreate(uap->domain, &so1, uap->type, uap->protocol))
+               return (error);
+       if (error = socreate(uap->domain, &so2, uap->type, uap->protocol))
+               goto free1;
+       if (error = falloc(p, &fp1, &fd))
+               goto free2;
+       sv[0] = fd;
+       fp1->f_flag = FREAD|FWRITE;
+       fp1->f_type = DTYPE_SOCKET;
+       fp1->f_ops = &socketops;
+       fp1->f_data = (caddr_t)so1;
+       if (error = falloc(p, &fp2, &fd))
+               goto free3;
+       fp2->f_flag = FREAD|FWRITE;
+       fp2->f_type = DTYPE_SOCKET;
+       fp2->f_ops = &socketops;
+       fp2->f_data = (caddr_t)so2;
+       sv[1] = fd;
+       if (error = soconnect2(so1, so2))
+               goto free4;
+       if (uap->type == SOCK_DGRAM) {
+               /*
+                * Datagram socket connection is asymmetric.
+                */
+                if (error = soconnect2(so2, so1))
+                       goto free4;
+       }
+       error = copyout((caddr_t)sv, (caddr_t)uap->rsv, 2 * sizeof (int));
+       retval[0] = sv[0];              /* XXX ??? */
+       retval[1] = sv[1];              /* XXX ??? */
+       return (error);
+free4:
+       ffree(fp2);
+       fdp->fd_ofiles[sv[1]] = 0;
+free3:
+       ffree(fp1);
+       fdp->fd_ofiles[sv[0]] = 0;
+free2:
+       (void)soclose(so2);
+free1:
+       (void)soclose(so1);
+       return (error);

 }
 
 }
 

-sendto()
+struct sendto_args {
+       int     s;
+       caddr_t buf;
+       size_t  len;
+       int     flags;
+       caddr_t to;
+       int     tolen;
+};
+sendto(p, uap, retval)
+       struct proc *p;
+       register struct sendto_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t buf;
-               int     len;
-               int     flags;
-               caddr_t to;
-               int     tolen;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
-       struct uio auio;
+       struct msghdr msg;

        struct iovec aiov;
        struct iovec aiov;

-       struct mbuf *to;
-
-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       auio.uio_iov = &aiov;
-       auio.uio_iovcnt = 1;
+
+       msg.msg_name = uap->to;
+       msg.msg_namelen = uap->tolen;
+       msg.msg_iov = &aiov;
+       msg.msg_iovlen = 1;
+       msg.msg_control = 0;
+#ifdef COMPAT_OLDSOCK
+       msg.msg_flags = 0;
+#endif

        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;

-       auio.uio_resid = uap->len;
-       auio.uio_segflg = 0;
-       auio.uio_offset = 0;    /* XXX */
-       if (useracc(uap->buf, (u_int)uap->len, B_READ) == 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-       u.u_error = sockname(&to, uap->to, uap->tolen);
-       if (u.u_error)
-               goto bad;
-       u.u_error = sosend(fp->f_socket, to, &auio, uap->flags);
-       u.u_r.r_val1 = uap->len - auio.uio_resid;
-bad:
-       m_freem(to);
+       return (sendit(p, uap->s, &msg, uap->flags, retval));

 }
 
 }
 

-send()
+#ifdef COMPAT_OLDSOCK
+struct osend_args {
+       int     s;
+       caddr_t buf;
+       int     len;
+       int     flags;
+};
+osend(p, uap, retval)
+       struct proc *p;
+       register struct osend_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t buf;
-               int     len;
-               int     flags;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
-       struct uio auio;
+       struct msghdr msg;

        struct iovec aiov;
 
        struct iovec aiov;
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       auio.uio_iov = &aiov;
-       auio.uio_iovcnt = 1;
+       msg.msg_name = 0;
+       msg.msg_namelen = 0;
+       msg.msg_iov = &aiov;
+       msg.msg_iovlen = 1;

        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;

-       auio.uio_resid = uap->len;
-       auio.uio_segflg = 0;
-       auio.uio_offset = 0;    /* XXX */
-       if (useracc(uap->buf, (u_int)uap->len, B_READ) == 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-       if (u.u_error)
-               return;
-       u.u_error = sosend(fp->f_socket, (struct mbuf *)0, &auio, uap->flags);
-       u.u_r.r_val1 = uap->len - auio.uio_resid;
+       msg.msg_control = 0;
+       msg.msg_flags = 0;
+       return (sendit(p, uap->s, &msg, uap->flags, retval));

 }
 
 }
 

-recvfrom()
+#define MSG_COMPAT     0x8000
+struct osendmsg_args {
+       int     s;
+       caddr_t msg;
+       int     flags;
+};
+osendmsg(p, uap, retval)
+       struct proc *p;
+       register struct osendmsg_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t buf;
-               int     len;
-               int     flags;
-               caddr_t from;
-               int     *fromlenaddr;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+       struct msghdr msg;
+       struct iovec aiov[UIO_SMALLIOV], *iov;
+       int error;
+
+       if (error = copyin(uap->msg, (caddr_t)&msg, sizeof (struct omsghdr)))
+               return (error);
+       if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
+               if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
+                       return (EMSGSIZE);
+               MALLOC(iov, struct iovec *,
+                     sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV, 
+                     M_WAITOK);
+       } else
+               iov = aiov;
+       if (error = copyin((caddr_t)msg.msg_iov, (caddr_t)iov,
+           (unsigned)(msg.msg_iovlen * sizeof (struct iovec))))
+               goto done;
+       msg.msg_flags = MSG_COMPAT;
+       msg.msg_iov = iov;
+       error = sendit(p, uap->s, &msg, uap->flags, retval);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);
+}
+#endif
+
+struct sendmsg_args {
+       int     s;
+       caddr_t msg;
+       int     flags;
+};
+sendmsg(p, uap, retval)
+       struct proc *p;
+       register struct sendmsg_args *uap;
+       int *retval;
+{
+       struct msghdr msg;
+       struct iovec aiov[UIO_SMALLIOV], *iov;
+       int error;
+
+       if (error = copyin(uap->msg, (caddr_t)&msg, sizeof (msg)))
+               return (error);
+       if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
+               if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
+                       return (EMSGSIZE);
+               MALLOC(iov, struct iovec *,
+                      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
+                      M_WAITOK);
+       } else
+               iov = aiov;
+       if (msg.msg_iovlen &&
+           (error = copyin((caddr_t)msg.msg_iov, (caddr_t)iov,
+           (unsigned)(msg.msg_iovlen * sizeof (struct iovec)))))
+               goto done;
+       msg.msg_iov = iov;
+#ifdef COMPAT_OLDSOCK
+       msg.msg_flags = 0;
+#endif
+       error = sendit(p, uap->s, &msg, uap->flags, retval);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);
+}
+
+sendit(p, s, mp, flags, retsize)
+       register struct proc *p;
+       int s;
+       register struct msghdr *mp;
+       int flags, *retsize;
+{
+       struct file *fp;

        struct uio auio;
        struct uio auio;

-       struct iovec aiov;
-       struct mbuf *from;
-       int fromlen;
-
-       u.u_error = copyin((caddr_t)uap->fromlenaddr, (caddr_t)&fromlen,
-               sizeof (fromlen));
-       if (u.u_error)
-               return;
-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
+       register struct iovec *iov;
+       register int i;
+       struct mbuf *to, *control;
+       int len, error;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif
+       
+       if (error = getsock(p->p_fd, s, &fp))
+               return (error);
+       auio.uio_iov = mp->msg_iov;
+       auio.uio_iovcnt = mp->msg_iovlen;
+       auio.uio_segflg = UIO_USERSPACE;
+       auio.uio_rw = UIO_WRITE;
+       auio.uio_procp = p;
+       auio.uio_offset = 0;                    /* XXX */
+       auio.uio_resid = 0;
+       iov = mp->msg_iov;
+       for (i = 0; i < mp->msg_iovlen; i++, iov++) {
+               if (auio.uio_resid + iov->iov_len < auio.uio_resid)
+                       return (EINVAL);
+               auio.uio_resid += iov->iov_len;

        }
        }

-       auio.uio_iov = &aiov;
-       auio.uio_iovcnt = 1;
-       aiov.iov_base = uap->buf;
-       aiov.iov_len = uap->len;
-       auio.uio_resid = uap->len;
-       auio.uio_segflg = 0;
-       auio.uio_offset = 0;    /* XXX */
-       if (useracc(uap->buf, (u_int)uap->len, B_WRITE) == 0)  {
-               u.u_error = EFAULT;
-               return;
-       }
-       from = 0;
-       u.u_error = soreceive(fp->f_socket, &from, &auio, uap->flags);
-       if (u.u_error)
-               goto bad;
-       if (from == 0)
-               fromlen = 0;
-       else {
-               if (fromlen > from->m_len)
-                       fromlen = from->m_len;
-               u.u_error = copyout(mtod(from, caddr_t), uap->from,
-                       (u_int)fromlen);
-               if (u.u_error)
+       if (mp->msg_name) {
+               if (error = sockargs(&to, mp->msg_name, mp->msg_namelen,
+                   MT_SONAME))
+                       return (error);
+       } else
+               to = 0;
+       if (mp->msg_control) {
+               if (mp->msg_controllen < sizeof(struct cmsghdr)
+#ifdef COMPAT_OLDSOCK
+                   && mp->msg_flags != MSG_COMPAT
+#endif
+               ) {
+                       error = EINVAL;
+                       goto bad;
+               }
+               if (error = sockargs(&control, mp->msg_control,
+                   mp->msg_controllen, MT_CONTROL))

                        goto bad;
                        goto bad;

+#ifdef COMPAT_OLDSOCK
+               if (mp->msg_flags == MSG_COMPAT) {
+                       register struct cmsghdr *cm;
+
+                       M_PREPEND(control, sizeof(*cm), M_WAIT);
+                       if (control == 0) {
+                               error = ENOBUFS;
+                               goto bad;
+                       } else {
+                               cm = mtod(control, struct cmsghdr *);
+                               cm->cmsg_len = control->m_len;
+                               cm->cmsg_level = SOL_SOCKET;
+                               cm->cmsg_type = SCM_RIGHTS;
+                       }
+               }
+#endif
+       } else
+               control = 0;
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_GENIO)) {
+               int iovlen = auio.uio_iovcnt * sizeof (struct iovec);
+
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);

        }
        }

-       u.u_error = copyout((caddr_t)&fromlen, (caddr_t)uap->fromlenaddr,
-           sizeof (fromlen));
-       if (u.u_error)
-               goto bad;
-       u.u_r.r_val1 = uap->len - auio.uio_resid;
+#endif
+       len = auio.uio_resid;
+       if (error = sosend((struct socket *)fp->f_data, to, &auio,
+           (struct mbuf *)0, control, flags)) {
+               if (auio.uio_resid != len && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+               if (error == EPIPE)
+                       psignal(p, SIGPIPE);
+       }
+       if (error == 0)
+               *retsize = len - auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               if (error == 0)
+                       ktrgenio(p->p_tracep, s, UIO_WRITE,
+                               ktriov, *retsize, error);
+               FREE(ktriov, M_TEMP);
+       }
+#endif

 bad:
 bad:

-       if (from)
-               m_freem(from);
+       if (to)
+               m_freem(to);
+       return (error);

 }
 
 }
 

-recv()
+struct recvfrom_args {
+       int     s;
+       caddr_t buf;
+       size_t  len;
+       int     flags;
+       caddr_t from;
+       int     *fromlenaddr;
+};
+
+#ifdef COMPAT_OLDSOCK
+orecvfrom(p, uap, retval)
+       struct proc *p;
+       struct recvfrom_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     s;
-               caddr_t buf;
-               int     len;
-               int     flags;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
-       struct uio auio;
+
+       uap->flags |= MSG_COMPAT;
+       return (recvfrom(p, uap, retval));
+}
+#endif
+
+recvfrom(p, uap, retval)
+       struct proc *p;
+       register struct recvfrom_args *uap;
+       int *retval;
+{
+       struct msghdr msg;

        struct iovec aiov;
        struct iovec aiov;

+       int error;

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       auio.uio_iov = &aiov;
-       auio.uio_iovcnt = 1;
+       if (uap->fromlenaddr) {
+               if (error = copyin((caddr_t)uap->fromlenaddr,
+                   (caddr_t)&msg.msg_namelen, sizeof (msg.msg_namelen)))
+                       return (error);
+       } else
+               msg.msg_namelen = 0;
+       msg.msg_name = uap->from;
+       msg.msg_iov = &aiov;
+       msg.msg_iovlen = 1;

        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;

-       auio.uio_resid = uap->len;
-       auio.uio_segflg = 0;
-       auio.uio_offset = 0;    /* XXX */
-       if (useracc(uap->buf, (u_int)uap->len, B_WRITE) == 0)  {
-               u.u_error = EFAULT;
-               return;
-       }
-       u.u_error =
-           soreceive(fp->f_socket, (struct mbuf **)0, &auio, uap->flags);
-       u.u_r.r_val1 = uap->len - auio.uio_resid;
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       return (recvit(p, uap->s, &msg, (caddr_t)uap->fromlenaddr, retval));

 }
 
 }
 

-sendmsg()
+#ifdef COMPAT_OLDSOCK
+struct orecv_args {
+       int     s;
+       caddr_t buf;
+       int     len;
+       int     flags;
+};
+orecv(p, uap, retval)
+       struct proc *p;
+       register struct orecv_args *uap;
+       int *retval;

 {
 {

+       struct msghdr msg;
+       struct iovec aiov;

 
 

-       u.u_error = EINVAL;
+       msg.msg_name = 0;
+       msg.msg_namelen = 0;
+       msg.msg_iov = &aiov;
+       msg.msg_iovlen = 1;
+       aiov.iov_base = uap->buf;
+       aiov.iov_len = uap->len;
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       return (recvit(p, uap->s, &msg, (caddr_t)0, retval));

 }
 
 }
 

-recvmsg()
+/*
+ * Old recvmsg.  This code takes advantage of the fact that the old msghdr
+ * overlays the new one, missing only the flags, and with the (old) access
+ * rights where the control fields are now.
+ */
+struct orecvmsg_args {
+       int     s;
+       struct  omsghdr *msg;
+       int     flags;
+};
+orecvmsg(p, uap, retval)
+       struct proc *p;
+       register struct orecvmsg_args *uap;
+       int *retval;

 {
 {

+       struct msghdr msg;
+       struct iovec aiov[UIO_SMALLIOV], *iov;
+       int error;
+
+       if (error = copyin((caddr_t)uap->msg, (caddr_t)&msg,
+           sizeof (struct omsghdr)))
+               return (error);
+       if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
+               if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
+                       return (EMSGSIZE);
+               MALLOC(iov, struct iovec *,
+                     sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
+                     M_WAITOK);
+       } else
+               iov = aiov;
+       msg.msg_flags = uap->flags | MSG_COMPAT;
+       if (error = copyin((caddr_t)msg.msg_iov, (caddr_t)iov,
+           (unsigned)(msg.msg_iovlen * sizeof (struct iovec))))
+               goto done;
+       msg.msg_iov = iov;
+       error = recvit(p, uap->s, &msg, (caddr_t)&uap->msg->msg_namelen, retval);

 
 

-       u.u_error = EINVAL;
+       if (msg.msg_controllen && error == 0)
+               error = copyout((caddr_t)&msg.msg_controllen,
+                   (caddr_t)&uap->msg->msg_accrightslen, sizeof (int));
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);

 }
 }

+#endif

 
 

-shutdown()
+struct recvmsg_args {
+       int     s;
+       struct  msghdr *msg;
+       int     flags;
+};
+recvmsg(p, uap, retval)
+       struct proc *p;
+       register struct recvmsg_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     s;
-               int     how;
-       } *uap = (struct a *)u.u_ap;
-       struct file *fp;
+       struct msghdr msg;
+       struct iovec aiov[UIO_SMALLIOV], *uiov, *iov;
+       register int error;

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
+       if (error = copyin((caddr_t)uap->msg, (caddr_t)&msg, sizeof (msg)))
+               return (error);
+       if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
+               if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
+                       return (EMSGSIZE);
+               MALLOC(iov, struct iovec *,
+                      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
+                      M_WAITOK);
+       } else
+               iov = aiov;
+#ifdef COMPAT_OLDSOCK
+       msg.msg_flags = uap->flags &~ MSG_COMPAT;
+#else
+       msg.msg_flags = uap->flags;
+#endif
+       uiov = msg.msg_iov;
+       msg.msg_iov = iov;
+       if (error = copyin((caddr_t)uiov, (caddr_t)iov,
+           (unsigned)(msg.msg_iovlen * sizeof (struct iovec))))
+               goto done;
+       if ((error = recvit(p, uap->s, &msg, (caddr_t)0, retval)) == 0) {
+               msg.msg_iov = uiov;
+               error = copyout((caddr_t)&msg, (caddr_t)uap->msg, sizeof(msg));

        }
        }

-       u.u_error = soshutdown(fp->f_socket, uap->how);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);

 }
 
 }
 

-setsockopt()
+recvit(p, s, mp, namelenp, retsize)
+       register struct proc *p;
+       int s;
+       register struct msghdr *mp;
+       caddr_t namelenp;
+       int *retsize;

 {
 {

-       struct a {
-               int     s;
-               int     level;
-               int     name;
-               caddr_t val;
-               int     valsize;
-       } *uap = (struct a *)u.u_ap;

        struct file *fp;
        struct file *fp;

-       struct mbuf *m = NULL;
+       struct uio auio;
+       register struct iovec *iov;
+       register int i;
+       int len, error;
+       struct mbuf *from = 0, *control = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif
+       
+       if (error = getsock(p->p_fd, s, &fp))
+               return (error);
+       auio.uio_iov = mp->msg_iov;
+       auio.uio_iovcnt = mp->msg_iovlen;
+       auio.uio_segflg = UIO_USERSPACE;
+       auio.uio_rw = UIO_READ;
+       auio.uio_procp = p;
+       auio.uio_offset = 0;                    /* XXX */
+       auio.uio_resid = 0;
+       iov = mp->msg_iov;
+       for (i = 0; i < mp->msg_iovlen; i++, iov++) {
+               if (auio.uio_resid + iov->iov_len < auio.uio_resid)
+                       return (EINVAL);
+               auio.uio_resid += iov->iov_len;
+       }
+#ifdef KTRACE
+       if (KTRPOINT(p, KTR_GENIO)) {
+               int iovlen = auio.uio_iovcnt * sizeof (struct iovec);

 
 

-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);

        }
        }

-       if (uap->valsize > MLEN) {
-               u.u_error = EINVAL;
-               return;
+#endif
+       len = auio.uio_resid;
+       if (error = soreceive((struct socket *)fp->f_data, &from, &auio,
+           (struct mbuf **)0, mp->msg_control ? &control : (struct mbuf **)0,
+           &mp->msg_flags)) {
+               if (auio.uio_resid != len && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;

        }
        }

-       if (uap->val) {
-               m = m_get(M_WAIT, MT_SOOPTS);
-               if (m == 0) {
-                       u.u_error = ENOBUFS;
-                       return;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               if (error == 0)
+                       ktrgenio(p->p_tracep, s, UIO_READ,
+                               ktriov, len - auio.uio_resid, error);
+               FREE(ktriov, M_TEMP);
+       }
+#endif
+       if (error)
+               goto out;
+       *retsize = len - auio.uio_resid;
+       if (mp->msg_name) {
+               len = mp->msg_namelen;
+               if (len <= 0 || from == 0)
+                       len = 0;
+               else {
+#ifdef COMPAT_OLDSOCK
+                       if (mp->msg_flags & MSG_COMPAT)
+                               mtod(from, struct osockaddr *)->sa_family =
+                                   mtod(from, struct sockaddr *)->sa_family;
+#endif
+                       if (len > from->m_len)
+                               len = from->m_len;
+                       /* else if len < from->m_len ??? */
+                       if (error = copyout(mtod(from, caddr_t),
+                           (caddr_t)mp->msg_name, (unsigned)len))
+                               goto out;
+               }
+               mp->msg_namelen = len;
+               if (namelenp &&
+                   (error = copyout((caddr_t)&len, namelenp, sizeof (int)))) {
+#ifdef COMPAT_OLDSOCK
+                       if (mp->msg_flags & MSG_COMPAT)
+                               error = 0;      /* old recvfrom didn't check */
+                       else
+#endif
+                       goto out;

                }
                }

-               u.u_error = copyin(uap->val, mtod(m, caddr_t),
-                 (u_int)uap->valsize);
-               if (u.u_error)
-                       goto bad;
-               m->m_len = uap->valsize;

        }
        }

-       u.u_error = sosetopt(fp->f_socket, uap->level, uap->name, m);
-bad:
-       if (m != NULL)
-               (void) m_free(m);
+       if (mp->msg_control) {
+#ifdef COMPAT_OLDSOCK
+               /*
+                * We assume that old recvmsg calls won't receive access
+                * rights and other control info, esp. as control info
+                * is always optional and those options didn't exist in 4.3.
+                * If we receive rights, trim the cmsghdr; anything else
+                * is tossed.
+                */
+               if (control && mp->msg_flags & MSG_COMPAT) {
+                       if (mtod(control, struct cmsghdr *)->cmsg_level !=
+                           SOL_SOCKET ||
+                           mtod(control, struct cmsghdr *)->cmsg_type !=
+                           SCM_RIGHTS) {
+                               mp->msg_controllen = 0;
+                               goto out;
+                       }
+                       control->m_len -= sizeof (struct cmsghdr);
+                       control->m_data += sizeof (struct cmsghdr);
+               }
+#endif
+               len = mp->msg_controllen;
+               if (len <= 0 || control == 0)
+                       len = 0;
+               else {
+                       if (len >= control->m_len)
+                               len = control->m_len;
+                       else
+                               mp->msg_flags |= MSG_CTRUNC;
+                       error = copyout((caddr_t)mtod(control, caddr_t),
+                           (caddr_t)mp->msg_control, (unsigned)len);
+               }
+               mp->msg_controllen = len;
+       }
+out:
+       if (from)
+               m_freem(from);
+       if (control)
+               m_freem(control);
+       return (error);

 }
 
 }
 

-getsockopt()
+struct shutdown_args {
+       int     s;
+       int     how;
+};
+/* ARGSUSED */
+shutdown(p, uap, retval)
+       struct proc *p;
+       register struct shutdown_args *uap;
+       int *retval;
+{
+       struct file *fp;
+       int error;
+
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       return (soshutdown((struct socket *)fp->f_data, uap->how));
+}
+
+struct setsockopt_args {
+       int     s;
+       int     level;
+       int     name;
+       caddr_t val;
+       int     valsize;
+};
+/* ARGSUSED */
+setsockopt(p, uap, retval)
+       struct proc *p;
+       register struct setsockopt_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     s;
-               int     level;
-               int     name;
-               caddr_t val;
-               int     *avalsize;
-       } *uap = (struct a *)u.u_ap;

        struct file *fp;
        struct mbuf *m = NULL;
        struct file *fp;
        struct mbuf *m = NULL;

-       int valsize;
-
-       fp = getf(uap->s);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
+       int error;
+
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       if (uap->valsize > MLEN)
+               return (EINVAL);

        if (uap->val) {
        if (uap->val) {

-               u.u_error = copyin((caddr_t)uap->avalsize, (caddr_t)&valsize,
-                       sizeof (valsize));
-               if (u.u_error)
-                       return;

                m = m_get(M_WAIT, MT_SOOPTS);
                m = m_get(M_WAIT, MT_SOOPTS);

-               if (m == NULL) {
-                       u.u_error = ENOBUFS;
-                       return;
+               if (m == NULL)
+                       return (ENOBUFS);
+               if (error = copyin(uap->val, mtod(m, caddr_t),
+                   (u_int)uap->valsize)) {
+                       (void) m_free(m);
+                       return (error);

                }
                }

+               m->m_len = uap->valsize;

        }
        }

-       u.u_error = sogetopt(fp->f_socket, uap->level, uap->name, m);
-       if (u.u_error)
-               goto bad;
+       return (sosetopt((struct socket *)fp->f_data, uap->level,
+           uap->name, m));
+}
+
+struct getsockopt_args {
+       int     s;
+       int     level;
+       int     name;
+       caddr_t val;
+       int     *avalsize;
+};
+/* ARGSUSED */
+getsockopt(p, uap, retval)
+       struct proc *p;
+       register struct getsockopt_args *uap;
+       int *retval;
+{
+       struct file *fp;
+       struct mbuf *m = NULL;
+       int valsize, error;
+
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);

        if (uap->val) {
        if (uap->val) {

+               if (error = copyin((caddr_t)uap->avalsize, (caddr_t)&valsize,
+                   sizeof (valsize)))
+                       return (error);
+       } else
+               valsize = 0;
+       if ((error = sogetopt((struct socket *)fp->f_data, uap->level,
+           uap->name, &m)) == 0 && uap->val && valsize && m != NULL) {

                if (valsize > m->m_len)
                        valsize = m->m_len;
                if (valsize > m->m_len)
                        valsize = m->m_len;

-               u.u_error = copyout(mtod(m, caddr_t), uap->val, (u_int)valsize);
-               if (u.u_error)
-                       goto bad;
-               u.u_error = copyout((caddr_t)&valsize, (caddr_t)uap->avalsize,
-                   sizeof (valsize));
+               error = copyout(mtod(m, caddr_t), uap->val, (u_int)valsize);
+               if (error == 0)
+                       error = copyout((caddr_t)&valsize,
+                           (caddr_t)uap->avalsize, sizeof (valsize));

        }
        }

-bad:

        if (m != NULL)
                (void) m_free(m);
        if (m != NULL)
                (void) m_free(m);

+       return (error);

 }
 
 }
 

-pipe()
+struct pipe_args {
+       int     dummy;
+};
+/* ARGSUSED */
+pipe(p, uap, retval)
+       struct proc *p;
+       struct pipe_args *uap;
+       int retval[];

 {
 {

-       register struct file *rf, *wf;
+       register struct filedesc *fdp = p->p_fd;
+       struct file *rf, *wf;

        struct socket *rso, *wso;
        struct socket *rso, *wso;

-       int r;
-
-       u.u_error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0,
-               (struct socketopt *)0);
-       if (u.u_error)
-               return;
-       u.u_error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0,
-               (struct socketopt *)0);
-       if (u.u_error)
-               goto free;
-       rf = falloc();
-       if (rf == NULL)
+       int fd, error;
+
+       if (error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0))
+               return (error);
+       if (error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0))
+               goto free1;
+       if (error = falloc(p, &rf, &fd))

                goto free2;
                goto free2;

-       r = u.u_r.r_val1;
+       retval[0] = fd;

        rf->f_flag = FREAD;
        rf->f_type = DTYPE_SOCKET;
        rf->f_flag = FREAD;
        rf->f_type = DTYPE_SOCKET;

-       rf->f_socket = rso;
-       wf = falloc();
-       if (wf == NULL)
+       rf->f_ops = &socketops;
+       rf->f_data = (caddr_t)rso;
+       if (error = falloc(p, &wf, &fd))

                goto free3;
        wf->f_flag = FWRITE;
        wf->f_type = DTYPE_SOCKET;
                goto free3;
        wf->f_flag = FWRITE;
        wf->f_type = DTYPE_SOCKET;

-       wf->f_socket = wso;
-       u.u_r.r_val2 = u.u_r.r_val1;
-       u.u_r.r_val1 = r;
-       if (piconnect(wso, rso) == 0)
+       wf->f_ops = &socketops;
+       wf->f_data = (caddr_t)wso;
+       retval[1] = fd;
+       if (error = unp_connect2(wso, rso))

                goto free4;
                goto free4;

-       return;
+       return (0);

 free4:
 free4:

-       wf->f_count = 0;
-       u.u_ofile[u.u_r.r_val2] = 0;
+       ffree(wf);
+       fdp->fd_ofiles[retval[1]] = 0;

 free3:
 free3:

-       rf->f_count = 0;
-       u.u_ofile[r] = 0;
+       ffree(rf);
+       fdp->fd_ofiles[retval[0]] = 0;

 free2:
 free2:

-       wso->so_state |= SS_NOFDREF;
-       sofree(wso);
-free:
-       rso->so_state |= SS_NOFDREF;
-       sofree(rso);
+       (void)soclose(wso);
+free1:
+       (void)soclose(rso);
+       return (error);

 }
 
 /*
 }
 
 /*

- * Get socket address.
+ * Get socket name.

  */
  */

-ssocketaddr()
+struct getsockname_args {
+       int     fdes;
+       caddr_t asa;
+       int     *alen;
+#ifdef COMPAT_OLDSOCK
+       int     compat_43;      /* pseudo */
+#endif
+};
+#ifdef COMPAT_OLDSOCK
+getsockname(p, uap, retval)
+       struct proc *p;
+       struct getsockname_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     fdes;
-               struct  sockaddr *asa;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+
+       uap->compat_43 = 0;
+       return (getsockname1(p, uap, retval));
+}
+
+ogetsockname(p, uap, retval)
+       struct proc *p;
+       struct getsockname_args *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       return (getsockname1(p, uap, retval));
+}
+#else /* COMPAT_OLDSOCK */
+
+#define        getsockname1    getsockname
+#endif
+
+/* ARGSUSED */
+getsockname1(p, uap, retval)
+       struct proc *p;
+       register struct getsockname_args *uap;
+       int *retval;
+{
+       struct file *fp;

        register struct socket *so;
        struct mbuf *m;
        register struct socket *so;
        struct mbuf *m;

+       int len, error;

 
 

-       fp = getf(uap->fdes);
-       if (fp == 0)
-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       so = fp->f_socket;
+       if (error = getsock(p->p_fd, uap->fdes, &fp))
+               return (error);
+       if (error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len)))
+               return (error);
+       so = (struct socket *)fp->f_data;

        m = m_getclr(M_WAIT, MT_SONAME);
        m = m_getclr(M_WAIT, MT_SONAME);

-       u.u_error =
-               (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0);
-       if (u.u_error)
+       if (m == NULL)
+               return (ENOBUFS);
+       if (error = (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0))

                goto bad;
                goto bad;

-       u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa,
-               sizeof (struct sockaddr));
+       if (len > m->m_len)
+               len = m->m_len;
+#ifdef COMPAT_OLDSOCK
+       if (uap->compat_43)
+               mtod(m, struct osockaddr *)->sa_family =
+                   mtod(m, struct sockaddr *)->sa_family;
+#endif
+       error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
+       if (error == 0)
+               error = copyout((caddr_t)&len, (caddr_t)uap->alen,
+                   sizeof (len));

 bad:
        m_freem(m);
 bad:
        m_freem(m);

+       return (error);

 }
 
 }
 

-sockname(aname, name, namelen)
-       struct mbuf **aname;
-       caddr_t name;
-       int namelen;
+/*
+ * Get name of peer for connected socket.
+ */
+struct getpeername_args {
+       int     fdes;
+       caddr_t asa;
+       int     *alen;
+#ifdef COMPAT_OLDSOCK
+       int     compat_43;      /* pseudo */
+#endif
+};
+
+#ifdef COMPAT_OLDSOCK
+getpeername(p, uap, retval)
+       struct proc *p;
+       struct getpeername_args *uap;
+       int *retval;

 {
 {

+
+       uap->compat_43 = 0;
+       return (getpeername1(p, uap, retval));
+}
+
+ogetpeername(p, uap, retval)
+       struct proc *p;
+       struct getpeername_args *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       return (getpeername1(p, uap, retval));
+}
+#else /* COMPAT_OLDSOCK */
+
+#define        getpeername1    getpeername
+#endif
+
+/* ARGSUSED */
+getpeername1(p, uap, retval)
+       struct proc *p;
+       register struct getpeername_args *uap;
+       int *retval;
+{
+       struct file *fp;
+       register struct socket *so;
+       struct mbuf *m;
+       int len, error;
+
+       if (error = getsock(p->p_fd, uap->fdes, &fp))
+               return (error);
+       so = (struct socket *)fp->f_data;
+       if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0)
+               return (ENOTCONN);
+       if (error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len)))
+               return (error);
+       m = m_getclr(M_WAIT, MT_SONAME);
+       if (m == NULL)
+               return (ENOBUFS);
+       if (error = (*so->so_proto->pr_usrreq)(so, PRU_PEERADDR, 0, m, 0))
+               goto bad;
+       if (len > m->m_len)
+               len = m->m_len;
+#ifdef COMPAT_OLDSOCK
+       if (uap->compat_43)
+               mtod(m, struct osockaddr *)->sa_family =
+                   mtod(m, struct sockaddr *)->sa_family;
+#endif
+       if (error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len))
+               goto bad;
+       error = copyout((caddr_t)&len, (caddr_t)uap->alen, sizeof (len));
+bad:
+       m_freem(m);
+       return (error);
+}
+
+sockargs(mp, buf, buflen, type)
+       struct mbuf **mp;
+       caddr_t buf;
+       int buflen, type;
+{
+       register struct sockaddr *sa;

        register struct mbuf *m;
        int error;
 
        register struct mbuf *m;
        int error;
 

-       if (namelen > MLEN)
+       if ((u_int)buflen > MLEN) {
+#ifdef COMPAT_OLDSOCK
+               if (type == MT_SONAME && (u_int)buflen <= 112)
+                       buflen = MLEN;          /* unix domain compat. hack */
+               else
+#endif

                return (EINVAL);
                return (EINVAL);

-       m = m_get(M_WAIT, MT_SONAME);
-       m->m_len = namelen;
-       error = copyin(name, mtod(m, caddr_t), (u_int)namelen);
+       }
+       m = m_get(M_WAIT, type);
+       if (m == NULL)
+               return (ENOBUFS);
+       m->m_len = buflen;
+       error = copyin(buf, mtod(m, caddr_t), (u_int)buflen);

        if (error)
                (void) m_free(m);
        if (error)
                (void) m_free(m);

-       else
-               *aname = m;
+       else {
+               *mp = m;
+               if (type == MT_SONAME) {
+                       sa = mtod(m, struct sockaddr *);
+
+#if defined(COMPAT_OLDSOCK) && BYTE_ORDER != BIG_ENDIAN
+                       if (sa->sa_family == 0 && sa->sa_len < AF_MAX)
+                               sa->sa_family = sa->sa_len;
+#endif
+                       sa->sa_len = buflen;
+               }
+       }

        return (error);
 }
        return (error);
 }

+
+getsock(fdp, fdes, fpp)
+       struct filedesc *fdp;
+       int fdes;
+       struct file **fpp;
+{
+       register struct file *fp;
+
+       if ((unsigned)fdes >= fdp->fd_nfiles ||
+           (fp = fdp->fd_ofiles[fdes]) == NULL)
+               return (EBADF);
+       if (fp->f_type != DTYPE_SOCKET)
+               return (ENOTSOCK);
+       *fpp = fp;
+       return (0);
+}