u. is gone, pcb is at p_addr; aston => signotify

[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 0de8865..a704ef7 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,23 +1,12 @@
 /*
  *
 /*
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * 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.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)uipc_syscalls.c     7.12 (Berkeley) %G%
+ *     @(#)uipc_syscalls.c     7.23 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"

-/* #include "user.h" */
-#include "syscontext.h" /* XXX */
+#include "filedesc.h"

 #include "proc.h"
 #include "file.h"
 #include "buf.h"
 #include "proc.h"
 #include "file.h"
 #include "buf.h"


@@ -26,123 +15,152 @@
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"

+#ifdef KTRACE
+#include "ktrace.h"
+#endif

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

-struct file *getsock();

 extern struct fileops socketops;
 
 extern struct fileops socketops;
 

-socket()
-{
-       register struct a {
+socket(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     domain;
                int     type;
                int     protocol;
                int     domain;
                int     type;
                int     protocol;

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

        struct socket *so;
        struct file *fp;
        struct socket *so;
        struct file *fp;

-       int fd;
+       int fd, error;

 
 

-       if (u.u_error = falloc(&fp, &fd))
-               return;
+       if (error = falloc(p, &fp, &fd))
+               return (error);

        fp->f_flag = FREAD|FWRITE;
        fp->f_type = DTYPE_SOCKET;
        fp->f_ops = &socketops;
        fp->f_flag = FREAD|FWRITE;
        fp->f_type = DTYPE_SOCKET;
        fp->f_ops = &socketops;

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

 }
 
 }
 

-bind()
-{
-       register struct a {
+/* ARGSUSED */
+bind(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t name;
                int     namelen;
                int     s;
                caddr_t name;
                int     namelen;

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

        struct mbuf *nam;
        struct mbuf *nam;

+       int error;

 
 

-       fp = getsock(uap->s);
-       if (fp == 0)
-               return;
-       u.u_error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME);
-       if (u.u_error)
-               return;
-       u.u_error = sobind((struct socket *)fp->f_data, 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()
-{
-       register struct a {
+/* ARGSUSED */
+listen(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                int     backlog;
                int     s;
                int     backlog;

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

 
 

-       fp = getsock(uap->s);
-       if (fp == 0)
-               return;
-       u.u_error = solisten((struct socket *)fp->f_data, uap->backlog);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       return (solisten((struct socket *)fp->f_data, uap->backlog));

 }
 
 #ifdef COMPAT_43
 }
 
 #ifdef COMPAT_43

-accept()
+accept(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     s;
+               caddr_t name;
+               int     *anamelen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       accept1(0);
+
+       uap->compat_43 = 0;
+       return (accept1(p, uap, retval));

 }
 
 }
 

-oaccept()
+oaccept(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     s;
+               caddr_t name;
+               int     *anamelen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       accept1(1);
+
+       uap->compat_43 = 1;
+       return (accept1(p, uap, retval));

 }
 }

+#else /* COMPAT_43 */

 
 

-accept1(compat_43)
-#else
-accept()
+#define        accept1 accept

 #endif
 #endif

-{
-       register struct a {
+
+accept1(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t name;
                int     *anamelen;
                int     s;
                caddr_t name;
                int     *anamelen;

-       } *uap = (struct a *)u.u_ap;
+#ifdef COMPAT_43
+               int     compat_43;
+#endif
+       } *uap;
+       int *retval;
+{

        struct file *fp;
        struct mbuf *nam;
        int namelen, error, s;
        register struct socket *so;
 
        struct file *fp;
        struct mbuf *nam;
        int namelen, error, s;
        register struct socket *so;
 

-       if (uap->name == 0)
-               goto noname;
-       error = copyin((caddr_t)uap->anamelen, (caddr_t)&namelen,
-               sizeof (namelen));
-       if (error)
-               RETURN (error);
-       if (useracc((caddr_t)uap->name, (u_int)namelen, B_WRITE) == 0)
-               RETURN (EFAULT);
-noname:
-       fp = getsock(uap->s);
-       if (fp == 0)
-               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();
        so = (struct socket *)fp->f_data;
        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                splx(s);
        s = splnet();
        so = (struct socket *)fp->f_data;
        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                splx(s);

-               RETURN (EINVAL);
+               return (EINVAL);

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

-               RETURN (EWOULDBLOCK);
+               return (EWOULDBLOCK);

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


@@ -152,18 +170,18 @@ noname:
                if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
                    netcon, 0)) {
                        splx(s);
                if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
                    netcon, 0)) {
                        splx(s);

-                       RETURN (error);
+                       return (error);

                }
        }
        if (so->so_error) {
                error = so->so_error;
                so->so_error = 0;
                splx(s);
                }
        }
        if (so->so_error) {
                error = so->so_error;
                so->so_error = 0;
                splx(s);

-               RETURN (error);
+               return (error);

        }
        }

-       if (error = falloc(&fp, &u.u_r.r_val1)) {
+       if (error = falloc(p, &fp, retval)) {

                splx(s);
                splx(s);

-               RETURN (error);
+               return (error);

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


@@ -178,49 +196,51 @@ noname:
        (void) soaccept(so, nam);
        if (uap->name) {
 #ifdef COMPAT_43
        (void) soaccept(so, nam);
        if (uap->name) {
 #ifdef COMPAT_43

-               if (compat_43)
+               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 */
                        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 */

-               (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 (0);
+       return (error);

 }
 
 }
 

-connect()
-{
-       register struct a {
+/* ARGSUSED */
+connect(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t name;
                int     namelen;
                int     s;
                caddr_t name;
                int     namelen;

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

        register struct socket *so;
        struct mbuf *nam;
        int error, s;
 
        register struct socket *so;
        struct mbuf *nam;
        int error, s;
 

-       fp = getsock(uap->s);
-       if (fp == 0)
-               return;
+       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))
        so = (struct socket *)fp->f_data;
        if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING))

-               RETURN (EALREADY);
+               return (EALREADY);

        if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))
        if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))

-               RETURN (error);
+               return (error);

        error = soconnect(so, nam);
        if (error)
                goto bad;
        if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
                m_freem(nam);
        error = soconnect(so, nam);
        if (error)
                goto bad;
        if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
                m_freem(nam);

-               RETURN (EINPROGRESS);
+               return (EINPROGRESS);

        }
        s = splnet();
        while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)
        }
        s = splnet();
        while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)


@@ -237,86 +257,85 @@ bad:
        m_freem(nam);
        if (error == ERESTART)
                error = EINTR;
        m_freem(nam);
        if (error == ERESTART)
                error = EINTR;

-       RETURN (error);
+       return (error);

 }
 
 }
 

-socketpair()
-{
-       register struct a {
+socketpair(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     domain;
                int     type;
                int     protocol;
                int     *rsv;
                int     domain;
                int     type;
                int     protocol;
                int     *rsv;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int retval[];
+{
+       register struct filedesc *fdp = p->p_fd;

        struct file *fp1, *fp2;
        struct socket *so1, *so2;
        struct file *fp1, *fp2;
        struct socket *so1, *so2;

-       int fd, sv[2];
+       int fd, error, sv[2];

 
 

-       if (useracc((caddr_t)uap->rsv, 2 * sizeof (int), B_WRITE) == 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-       u.u_error = socreate(uap->domain, &so1, uap->type, uap->protocol);
-       if (u.u_error)
-               return;
-       u.u_error = socreate(uap->domain, &so2, uap->type, uap->protocol);
-       if (u.u_error)
+       if (error = socreate(uap->domain, &so1, uap->type, uap->protocol))
+               return (error);
+       if (error = socreate(uap->domain, &so2, uap->type, uap->protocol))

                goto free1;
                goto free1;

-       if (u.u_error = falloc(&fp1, &fd))
+       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;
                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 (u.u_error = falloc(&fp2, &fd))
+       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;
                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;

-       u.u_error = soconnect2(so1, so2);
-       if (u.u_error)
+       if (error = soconnect2(so1, so2))

                goto free4;
        if (uap->type == SOCK_DGRAM) {
                /*
                 * Datagram socket connection is asymmetric.
                 */
                goto free4;
        if (uap->type == SOCK_DGRAM) {
                /*
                 * Datagram socket connection is asymmetric.
                 */

-                u.u_error = soconnect2(so2, so1);
-                if (u.u_error)
+                if (error = soconnect2(so2, so1))

                        goto free4;
        }
                        goto free4;
        }

-       (void) copyout((caddr_t)sv, (caddr_t)uap->rsv, 2 * sizeof (int));
-       u.u_r.r_val1 = sv[0];
-       u.u_r.r_val2 = sv[1];
-       return;
+       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:
        crfree(fp2->f_cred);
        fp2->f_count = 0;
 free4:
        crfree(fp2->f_cred);
        fp2->f_count = 0;

-       u.u_ofile[sv[1]] = 0;
+       fdp->fd_ofiles[sv[1]] = 0;

 free3:
        crfree(fp1->f_cred);
        fp1->f_count = 0;
 free3:
        crfree(fp1->f_cred);
        fp1->f_count = 0;

-       u.u_ofile[sv[0]] = 0;
+       fdp->fd_ofiles[sv[0]] = 0;

 free2:
        (void)soclose(so2);
 free1:
        (void)soclose(so1);
 free2:
        (void)soclose(so2);
 free1:
        (void)soclose(so1);

+       return (error);

 }
 
 }
 

-sendto()
-{
-       register struct a {
+sendto(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                caddr_t to;
                int     tolen;
                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                caddr_t to;
                int     tolen;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct iovec aiov;
        struct msghdr msg;
        struct iovec aiov;

+       int error;

 
        msg.msg_name = uap->to;
        msg.msg_namelen = uap->tolen;
 
        msg.msg_name = uap->to;
        msg.msg_namelen = uap->tolen;


@@ -328,19 +347,20 @@ sendto()
 #endif
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;
 #endif
        aiov.iov_base = uap->buf;
        aiov.iov_len = uap->len;

-       sendit(uap->s, &msg, uap->flags);
+       return (sendit(p, uap->s, &msg, uap->flags, retval));

 }
 
 #ifdef COMPAT_43
 }
 
 #ifdef COMPAT_43

-
-osend()
-{
-       register struct a {
+osend(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                int     s;
                caddr_t buf;
                int     len;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct iovec aiov;
 
        struct msghdr msg;
        struct iovec aiov;
 


@@ -352,118 +372,143 @@ osend()
        aiov.iov_len = uap->len;
        msg.msg_control = 0;
        msg.msg_flags = 0;
        aiov.iov_len = uap->len;
        msg.msg_control = 0;
        msg.msg_flags = 0;

-       sendit(uap->s, &msg, uap->flags);
+       return (sendit(p, uap->s, &msg, uap->flags, retval));

 }
 
 }
 

-#define MSG_OSENDMSG   0x8000
-osendmsg()
-{
-       register struct a {
+#define MSG_COMPAT     0x8000
+osendmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t msg;
                int     flags;
                int     s;
                caddr_t msg;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct msghdr msg;

-       struct iovec aiov[MSG_MAXIOVLEN];
-
-       u.u_error = copyin(uap->msg, (caddr_t)&msg, sizeof (struct omsghdr));
-       if (u.u_error)
-               return;
-       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
-               u.u_error = EMSGSIZE;
-               return;
-       }
-       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
-               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
-       if (u.u_error)
-               return;
-       msg.msg_flags = MSG_OSENDMSG;
-       sendit(uap->s, &msg, uap->flags);
+       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
 
 }
 #endif
 

-sendmsg()
-{
-       register struct a {
+sendmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t msg;
                int     flags;
                int     s;
                caddr_t msg;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct msghdr msg;

-       struct iovec aiov[MSG_MAXIOVLEN];
+       struct iovec aiov[UIO_SMALLIOV], *iov;
+       int error;

 
 

-       if (u.u_error = copyin(uap->msg, (caddr_t)&msg, sizeof (msg)))
-               return;
-       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
-               u.u_error = EMSGSIZE;
-               return;
-       }
+       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 &&
        if (msg.msg_iovlen &&

-           (u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
-                               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])))))
-               return;
-       msg.msg_iov = aiov;
+           (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_43
        msg.msg_flags = 0;
 #endif
 #ifdef COMPAT_43
        msg.msg_flags = 0;
 #endif

-       sendit(uap->s, &msg, uap->flags);
+       error = sendit(p, uap->s, &msg, uap->flags, retval);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);

 }
 
 }
 

-sendit(s, mp, flags)
+sendit(p, s, mp, flags, retsize)
+       register struct proc *p;

        int s;
        register struct msghdr *mp;
        int s;
        register struct msghdr *mp;

-       int flags;
+       int flags, *retsize;

 {
 {

-       register struct file *fp;
+       struct file *fp;

        struct uio auio;
        register struct iovec *iov;
        register int i;
        struct mbuf *to, *control;
        struct uio auio;
        register struct iovec *iov;
        register int i;
        struct mbuf *to, *control;

-       int len;
+       int len, error;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

        
        

-       fp = getsock(s);
-       if (fp == 0)
-               return;
+       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_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++) {
        auio.uio_offset = 0;                    /* XXX */
        auio.uio_resid = 0;
        iov = mp->msg_iov;
        for (i = 0; i < mp->msg_iovlen; i++, iov++) {

-               if (iov->iov_len < 0) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-               if (iov->iov_len == 0)
-                       continue;
-               if (useracc(iov->iov_base, (u_int)iov->iov_len, B_READ) == 0) {
-                       u.u_error = EFAULT;
-                       return;
-               }
-               auio.uio_resid += iov->iov_len;
+               if (iov->iov_len < 0)
+                       return (EINVAL);
+               if ((auio.uio_resid += iov->iov_len) < 0)
+                       return (EINVAL);

        }
        if (mp->msg_name) {
        }
        if (mp->msg_name) {

-               u.u_error =
-                   sockargs(&to, mp->msg_name, mp->msg_namelen, MT_SONAME);
-               if (u.u_error)
-                       return;
+               if (error = sockargs(&to, mp->msg_name, mp->msg_namelen,
+                   MT_SONAME))
+                       return (error);

        } else
                to = 0;
        if (mp->msg_control) {
        } else
                to = 0;
        if (mp->msg_control) {

-               u.u_error =
-                   sockargs(&control, mp->msg_control, mp->msg_controllen,
-                   MT_CONTROL);
-               if (u.u_error)
+               if (mp->msg_controllen < sizeof(struct cmsghdr)
+#ifdef COMPAT_43
+                   && mp->msg_flags != MSG_COMPAT
+#endif
+               ) {
+                       error = EINVAL;
+                       goto bad;
+               }
+               if (error = sockargs(&control, mp->msg_control,
+                   mp->msg_controllen, MT_CONTROL))

                        goto bad;
 #ifdef COMPAT_43
                        goto bad;
 #ifdef COMPAT_43

-               if (mp->msg_flags) {
+               if (mp->msg_flags == MSG_COMPAT) {

                        register struct cmsghdr *cm;
                        register struct cmsghdr *cm;

+

                        M_PREPEND(control, sizeof(*cm), M_WAIT);
                        M_PREPEND(control, sizeof(*cm), M_WAIT);

-                       if (control == 0)
-                               u.u_error = ENOBUFS;
-                       else {
+                       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 = mtod(control, struct cmsghdr *);
                                cm->cmsg_len = control->m_len;
                                cm->cmsg_level = SOL_SOCKET;


@@ -473,76 +518,101 @@ sendit(s, mp, flags)
 #endif
        } else
                control = 0;
 #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);
+       }
+#endif

        len = auio.uio_resid;
        len = auio.uio_resid;

-       u.u_error = sosend((struct socket *)fp->f_data, to, &auio,
-           flags, control);
-       if ((u.u_error == EINTR || u.u_error == ERESTART ||
-           u.u_error == EWOULDBLOCK) && auio.uio_resid != len)
-               u.u_error = 0;
-       u.u_r.r_val1 = len - auio.uio_resid;
-       if (control)
-               m_freem(control);
+       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:
        if (to)
                m_freem(to);
 bad:
        if (to)
                m_freem(to);

+       return (error);

 }
 
 #ifdef COMPAT_43
 }
 
 #ifdef COMPAT_43

-recvfrom()
+orecvfrom(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     s;
+               caddr_t buf;
+               int     len;
+               int     flags;
+               caddr_t from;
+               int     *fromlenaddr;
+       } *uap;
+       int *retval;

 {
 {

-       recvfrom1(0);
-}

 
 

-orecvfrom()
-{
-       recvfrom1(1);
+       uap->flags |= MSG_COMPAT;
+       return (recvfrom(p, uap, retval));

 }
 }

-
-recvfrom1(compat_43)
-{      /* vi will want an extra } to be happy! */
-#else
-recvfrom()
-{
-       int compat_43 = 0;

 #endif
 #endif

-       register struct a {
+
+recvfrom(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                caddr_t from;
                int     *fromlenaddr;
                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                caddr_t from;
                int     *fromlenaddr;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct iovec aiov;
        struct msghdr msg;
        struct iovec aiov;

-       int len;
+       int error;

 
        if (uap->fromlenaddr) {
 
        if (uap->fromlenaddr) {

-               u.u_error = copyin((caddr_t)uap->fromlenaddr, (caddr_t)&len,
-                  sizeof (len));
-               if (u.u_error)
-                       return;
+               if (error = copyin((caddr_t)uap->fromlenaddr,
+                   (caddr_t)&msg.msg_namelen, sizeof (msg.msg_namelen)))
+                       return (error);

        } else
        } else

-               len = 0;
+               msg.msg_namelen = 0;

        msg.msg_name = uap->from;
        msg.msg_name = uap->from;

-       msg.msg_namelen = len;

        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;
        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;

-       recvit(uap->s, &msg, (caddr_t)uap->fromlenaddr, (caddr_t)0, compat_43);
+       return (recvit(p, uap->s, &msg, (caddr_t)uap->fromlenaddr, retval));

 }
 }

+

 #ifdef COMPAT_43
 #ifdef COMPAT_43

-orecv()
-{
-       register struct a {
+orecv(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                caddr_t buf;
                int     len;
                int     flags;
                int     s;
                caddr_t buf;
                int     len;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct iovec aiov;
 
        struct msghdr msg;
        struct iovec aiov;
 


@@ -554,174 +624,206 @@ orecv()
        aiov.iov_len = uap->len;
        msg.msg_control = 0;
        msg.msg_flags = uap->flags;
        aiov.iov_len = uap->len;
        msg.msg_control = 0;
        msg.msg_flags = uap->flags;

-       recvit(uap->s, &msg, (caddr_t)0, (caddr_t)0, 0);
+       return (recvit(p, uap->s, &msg, (caddr_t)0, retval));

 }
 
 }
 

-orecvmsg()
-{
-       register struct a {
+/*
+ * 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.
+ */
+orecvmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                struct  omsghdr *msg;
                int     flags;
                int     s;
                struct  omsghdr *msg;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct msghdr msg;

-       struct iovec aiov[MSG_MAXIOVLEN];
-
-       u.u_error = copyin((caddr_t)uap->msg, (caddr_t)&msg,
-           sizeof (struct omsghdr));
-       if (u.u_error)
-               return;
-       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
-               u.u_error = EMSGSIZE;
-               return;
-       }
-       msg.msg_flags = uap->flags;
-       u.u_error = copyin((caddr_t)msg.msg_iov, (caddr_t)aiov,
-               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
-       if (u.u_error)
-               return;
-       msg.msg_iov = aiov;
-       if (msg.msg_control)
-               if (useracc((caddr_t)msg.msg_control,
-                   (unsigned)msg.msg_controllen, B_WRITE) == 0) {
-                           u.u_error = EFAULT;
-                           return;
-               }
-           
-       recvit(uap->s, &msg, (caddr_t)&uap->msg->msg_namelen,
-           (caddr_t)&uap->msg->msg_accrightslen, /* compat_43 */1);
+       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);
+
+       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
 
 }
 #endif
 

-recvmsg()
-{
-       register struct a {
+recvmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                struct  msghdr *msg;
                int     flags;
                int     s;
                struct  msghdr *msg;
                int     flags;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct msghdr msg;
        struct msghdr msg;

-       struct iovec aiov[MSG_MAXIOVLEN], *uiov;
-       register int error1;
-
-       u.u_error = copyin((caddr_t)uap->msg, (caddr_t)&msg, sizeof (msg));
-       if (u.u_error)
-               return;
-       if ((u_int)msg.msg_iovlen >= sizeof (aiov) / sizeof (aiov[0])) {
-               u.u_error = EMSGSIZE;
-               return;
-       }
+       struct iovec aiov[UIO_SMALLIOV], *uiov, *iov;
+       register int error;
+
+       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_43
+       msg.msg_flags = uap->flags &~ MSG_COMPAT;
+#else

        msg.msg_flags = uap->flags;
        msg.msg_flags = uap->flags;

+#endif

        uiov = msg.msg_iov;
        uiov = msg.msg_iov;

-       msg.msg_iov = aiov;
-       u.u_error = copyin((caddr_t)uiov, (caddr_t)aiov,
-               (unsigned)(msg.msg_iovlen * sizeof (aiov[0])));
-       if (u.u_error)
-               return;
-       if (msg.msg_control)
-               if (useracc((caddr_t)msg.msg_control,
-                   (unsigned)msg.msg_controllen, B_WRITE) == 0) {
-                       u.u_error = EFAULT;
-                       return;
-               }
-       recvit(uap->s, &msg, (caddr_t)0, (caddr_t)0, 0);
-       msg.msg_iov = uiov;
-       error1 = copyout((caddr_t)&msg, (caddr_t)uap->msg, sizeof(msg));
-       if (error1 && u.u_error == 0)
-               u.u_error = error1;
+       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));
+       }
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       return (error);

 }
 
 }
 

-/* ARGSUSED */
-recvit(s, mp, namelenp, rightslenp, compat_43)
-       int s, compat_43;
+recvit(p, s, mp, namelenp, retsize)
+       register struct proc *p;
+       int s;

        register struct msghdr *mp;
        register struct msghdr *mp;

-       caddr_t namelenp, rightslenp;
+       caddr_t namelenp;
+       int *retsize;

 {
 {

-       register struct file *fp;
+       struct file *fp;

        struct uio auio;
        register struct iovec *iov;
        register int i;
        struct uio auio;
        register struct iovec *iov;
        register int i;

-       int len;
-       struct mbuf *from = 0, *rights = 0, *control = 0;
+       int len, error;
+       struct mbuf *from = 0, *control = 0;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif

        
        

-       fp = getsock(s);
-       if (fp == 0)
-               return;
+       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_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++) {
        auio.uio_offset = 0;                    /* XXX */
        auio.uio_resid = 0;
        iov = mp->msg_iov;
        for (i = 0; i < mp->msg_iovlen; i++, iov++) {

-               if (iov->iov_len < 0) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-               if (iov->iov_len == 0)
-                       continue;
-               if (useracc(iov->iov_base, (u_int)iov->iov_len, B_WRITE) == 0) {
-                       u.u_error = EFAULT;
-                       return;
-               }
-               auio.uio_resid += iov->iov_len;
+               if (iov->iov_len < 0)
+                       return (EINVAL);
+               if ((auio.uio_resid += iov->iov_len) < 0)
+                       return (EINVAL);

        }
        }

+#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);
+       }
+#endif

        len = auio.uio_resid;
        len = auio.uio_resid;

-       u.u_error = soreceive((struct socket *)fp->f_data, &from, &auio,
-           &mp->msg_flags, &rights, &control);
-       if ((u.u_error == EINTR || u.u_error == ERESTART ||
-           u.u_error == EWOULDBLOCK) && auio.uio_resid != len)
-               u.u_error = 0;
-       u.u_r.r_val1 = len - auio.uio_resid;
+       if (error = soreceive((struct socket *)fp->f_data, &from, &auio,
+           (struct mbuf **)0, &control, &mp->msg_flags)) {
+               if (auio.uio_resid != len && (error == ERESTART ||
+                   error == EINTR || error == EWOULDBLOCK))
+                       error = 0;
+       }
+#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_43
        if (mp->msg_name) {
                len = mp->msg_namelen;
                if (len <= 0 || from == 0)
                        len = 0;
                else {
 #ifdef COMPAT_43

-                       if (compat_43)
+                       if (mp->msg_flags & MSG_COMPAT)

                                mtod(from, struct osockaddr *)->sa_family =
                                    mtod(from, struct sockaddr *)->sa_family;
 #endif
                                mtod(from, struct osockaddr *)->sa_family =
                                    mtod(from, struct sockaddr *)->sa_family;
 #endif

-                       if (len > from->m_len)          /* ??? */
+                       if (len > from->m_len)

                                len = from->m_len;
                                len = from->m_len;

-                       (void) copyout(mtod(from, caddr_t),
-                           (caddr_t)mp->msg_name, (unsigned)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;
                }
                mp->msg_namelen = len;

-               if (namelenp)
-                       (void) copyout((caddr_t)&len, namelenp, sizeof (int));
-       }
-       if (rightslenp) {       /* only from orecvmsg() */
-               len = mp->msg_controllen;
-               if (len <= 0 || rights == 0)
-                       len = 0;
-               else {
-                       rights->m_len -= sizeof (struct cmsghdr);
-                       rights->m_data += sizeof (struct cmsghdr);
-                       if (len > rights->m_len)
-                               len = rights->m_len;
-                       (void) copyout((caddr_t)mtod(rights, caddr_t),
-                           (caddr_t)mp->msg_control, (unsigned)len);
-                       m_freem(rights);
-                       rights = 0;
+               if (namelenp &&
+                   (error = copyout((caddr_t)&len, namelenp, sizeof (int)))) {
+#ifdef COMPAT_43
+                       if (mp->msg_flags & MSG_COMPAT)
+                               error = 0;      /* old recvfrom didn't check */
+                       else
+#endif
+                       goto out;

                }
                }

-               (void) copyout((caddr_t)&len, rightslenp, sizeof (int));
-               mp->msg_control = 0;

        }
        if (mp->msg_control) {
        }
        if (mp->msg_control) {

-               if (rights) {
-                       if (control) {
-                               rights->m_next = control;
-                               rights = m_pullup(rights,
-                                               rights->m_len + control->m_len);
-                               if (rights == 0)
-                                       mp->msg_flags |= MSG_CTRUNC;
+#ifdef COMPAT_43
+               /*
+                * 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 = rights;
-                       rights = 0;
+                       control->m_len -= sizeof (struct cmsghdr);
+                       control->m_data += sizeof (struct cmsghdr);

                }
                }

+#endif

                len = mp->msg_controllen;
                if (len <= 0 || control == 0)
                        len = 0;
                len = mp->msg_controllen;
                if (len <= 0 || control == 0)
                        len = 0;


@@ -730,286 +832,331 @@ recvit(s, mp, namelenp, rightslenp, compat_43)
                                len = control->m_len;
                        else
                                mp->msg_flags |= MSG_CTRUNC;
                                len = control->m_len;
                        else
                                mp->msg_flags |= MSG_CTRUNC;

-                       (void) copyout((caddr_t)mtod(control, caddr_t),
+                       error = copyout((caddr_t)mtod(control, caddr_t),

                            (caddr_t)mp->msg_control, (unsigned)len);
                }
                mp->msg_controllen = len;
        }
                            (caddr_t)mp->msg_control, (unsigned)len);
                }
                mp->msg_controllen = len;
        }

-       if (rights)
-               m_freem(rights);
+out:

        if (from)
                m_freem(from);
        if (control)
                m_freem(control);
        if (from)
                m_freem(from);
        if (control)
                m_freem(control);

+       return (error);

 }
 
 }
 

-shutdown()
-{
-       struct a {
+/* ARGSUSED */
+shutdown(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                int     how;
                int     s;
                int     how;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

        struct file *fp;
        struct file *fp;

+       int error;

 
 

-       fp = getsock(uap->s);
-       if (fp == 0)
-               return;
-       u.u_error = soshutdown((struct socket *)fp->f_data, uap->how);
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);
+       return (soshutdown((struct socket *)fp->f_data, uap->how));

 }
 
 }
 

-setsockopt()
-{
-       struct a {
+/* ARGSUSED */
+setsockopt(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                int     level;
                int     name;
                caddr_t val;
                int     valsize;
                int     s;
                int     level;
                int     name;
                caddr_t val;
                int     valsize;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

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

+       int error;

 
 

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

        if (uap->val) {
                m = m_get(M_WAIT, MT_SOOPTS);
        if (uap->val) {
                m = m_get(M_WAIT, MT_SOOPTS);

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

                        (void) m_free(m);
                        (void) m_free(m);

-                       return;
+                       return (error);

                }
                m->m_len = uap->valsize;
        }
                }
                m->m_len = uap->valsize;
        }

-       u.u_error =
-           sosetopt((struct socket *)fp->f_data, uap->level, uap->name, m);
+       return (sosetopt((struct socket *)fp->f_data, uap->level,
+           uap->name, m));

 }
 
 }
 

-getsockopt()
-{
-       struct a {
+/* ARGSUSED */
+getsockopt(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                int     level;
                int     name;
                caddr_t val;
                int     *avalsize;
                int     s;
                int     level;
                int     name;
                caddr_t val;
                int     *avalsize;

-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{

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

-       int valsize;
+       int valsize, error;

 
 

-       fp = getsock(uap->s);
-       if (fp == 0)
-               return;
+       if (error = getsock(p->p_fd, uap->s, &fp))
+               return (error);

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

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

        } else
                valsize = 0;
        } else
                valsize = 0;

-       u.u_error =
-           sogetopt((struct socket *)fp->f_data, uap->level, uap->name, &m);
-       if (u.u_error)
-               goto bad;
-       if (uap->val && valsize && m != NULL) {
+       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()
+/* ARGSUSED */
+pipe(p, uap, retval)
+       struct proc *p;
+       struct args *uap;
+       int retval[];

 {
 {

+       register struct filedesc *fdp = p->p_fd;

        struct file *rf, *wf;
        struct socket *rso, *wso;
        struct file *rf, *wf;
        struct socket *rso, *wso;

-       int fd;
+       int fd, error;

 
 

-       u.u_error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0);
-       if (u.u_error)
-               return;
-       u.u_error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
-       if (u.u_error)
+       if (error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0))
+               return (error);
+       if (error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0))

                goto free1;
                goto free1;

-       if (u.u_error = falloc(&rf, &fd))
+       if (error = falloc(p, &rf, &fd))

                goto free2;
                goto free2;

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

        rf->f_flag = FREAD;
        rf->f_type = DTYPE_SOCKET;
        rf->f_ops = &socketops;
        rf->f_data = (caddr_t)rso;
        rf->f_flag = FREAD;
        rf->f_type = DTYPE_SOCKET;
        rf->f_ops = &socketops;
        rf->f_data = (caddr_t)rso;

-       if (u.u_error = falloc(&wf, &fd))
+       if (error = falloc(p, &wf, &fd))

                goto free3;
        wf->f_flag = FWRITE;
        wf->f_type = DTYPE_SOCKET;
        wf->f_ops = &socketops;
        wf->f_data = (caddr_t)wso;
                goto free3;
        wf->f_flag = FWRITE;
        wf->f_type = DTYPE_SOCKET;
        wf->f_ops = &socketops;
        wf->f_data = (caddr_t)wso;

-       u.u_r.r_val2 = fd;
-       if (u.u_error = unp_connect2(wso, rso))
+       retval[1] = fd;
+       if (error = unp_connect2(wso, rso))

                goto free4;
                goto free4;

-       return;
+       return (0);

 free4:
        wf->f_count = 0;
 free4:
        wf->f_count = 0;

-       u.u_ofile[u.u_r.r_val2] = 0;
+       fdp->fd_ofiles[retval[1]] = 0;

 free3:
        rf->f_count = 0;
 free3:
        rf->f_count = 0;

-       u.u_ofile[u.u_r.r_val1] = 0;
+       fdp->fd_ofiles[retval[0]] = 0;

 free2:
        (void)soclose(wso);
 free1:
        (void)soclose(rso);
 free2:
        (void)soclose(wso);
 free1:
        (void)soclose(rso);

+       return (error);

 }
 
 /*
  * Get socket name.
  */
 #ifdef COMPAT_43
 }
 
 /*
  * Get socket name.
  */
 #ifdef COMPAT_43

-getsockname()
+getsockname(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       getsockname1(0);
+
+       uap->compat_43 = 0;
+       return (getsockname1(p, uap, retval));

 }
 
 }
 

-ogetsockname()
+ogetsockname(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       getsockname1(1);
+
+       uap->compat_43 = 1;
+       return (getsockname1(p, uap, retval));

 }
 }

+#else /* COMPAT_43 */

 
 

-getsockname1(compat_43)
-#else
-getsockname()
+#define        getsockname1    getsockname

 #endif
 #endif

-{
-       register struct a {
+
+/* ARGSUSED */
+getsockname1(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                caddr_t asa;
                int     *alen;
                int     fdes;
                caddr_t asa;
                int     *alen;

-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+#ifdef COMPAT_43
+               int     compat_43;
+#endif
+       } *uap;
+       int *retval;
+{
+       struct file *fp;

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

-       int len;
-
-       fp = getsock(uap->fdes);
-       if (fp == 0)
-               return;
-       u.u_error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len));
-       if (u.u_error)
-               return;
+       int len, error;
+
+       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);
        so = (struct socket *)fp->f_data;
        m = m_getclr(M_WAIT, MT_SONAME);

-       if (m == NULL) {
-               u.u_error = ENOBUFS;
-               return;
-       }
-       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;
        if (len > m->m_len)
                len = m->m_len;
 #ifdef COMPAT_43
                goto bad;
        if (len > m->m_len)
                len = m->m_len;
 #ifdef COMPAT_43

-       if (compat_43)
+       if (uap->compat_43)

                mtod(m, struct osockaddr *)->sa_family =
                    mtod(m, struct sockaddr *)->sa_family;
 #endif
                mtod(m, struct osockaddr *)->sa_family =
                    mtod(m, struct sockaddr *)->sa_family;
 #endif

-       u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
-       if (u.u_error == 0)
-               u.u_error = copyout((caddr_t)&len, (caddr_t)uap->alen,
+       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);
                    sizeof (len));
 bad:
        m_freem(m);

+       return (error);

 }
 
 /*
  * Get name of peer for connected socket.
  */
 #ifdef COMPAT_43
 }
 
 /*
  * Get name of peer for connected socket.
  */
 #ifdef COMPAT_43

-getpeername()
+getpeername(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       getpeername1(0);
+
+       uap->compat_43 = 0;
+       return (getpeername1(p, uap, retval));

 }
 
 }
 

-ogetpeername()
+ogetpeername(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       getpeername1(1);
+
+       uap->compat_43 = 1;
+       return (getpeername1(p, uap, retval));

 }
 }

+#else /* COMPAT_43 */

 
 

-getpeername1(compat_43)
-#else
-getpeername()
+#define        getpeername1    getpeername

 #endif
 #endif

-{
-       register struct a {
+
+/* ARGSUSED */
+getpeername1(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                caddr_t asa;
                int     *alen;
                int     fdes;
                caddr_t asa;
                int     *alen;

-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+#ifdef COMPAT_43
+               int     compat_43;
+#endif
+       } *uap;
+       int *retval;
+{
+       struct file *fp;

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

-       int len;
+       int len, error;

 
 

-       fp = getsock(uap->fdes);
-       if (fp == 0)
-               return;
+       if (error = getsock(p->p_fd, uap->fdes, &fp))
+               return (error);

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

-       if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0) {
-               u.u_error = ENOTCONN;
-               return;
-       }
+       if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0)
+               return (ENOTCONN);

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

-       if (m == NULL) {
-               u.u_error = ENOBUFS;
-               return;
-       }
-       u.u_error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len));
-       if (u.u_error)
-               return;
-       u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_PEERADDR, 0, m, 0);
-       if (u.u_error)
+       if (m == NULL)
+               return (ENOBUFS);
+       if (error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len)))
+               return (error);
+       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_43
                goto bad;
        if (len > m->m_len)
                len = m->m_len;
 #ifdef COMPAT_43

-       if (compat_43)
+       if (uap->compat_43)

                mtod(m, struct osockaddr *)->sa_family =
                    mtod(m, struct sockaddr *)->sa_family;
 #endif
                mtod(m, struct osockaddr *)->sa_family =
                    mtod(m, struct sockaddr *)->sa_family;
 #endif

-       u.u_error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len);
-       if (u.u_error)
+       if (error = copyout(mtod(m, caddr_t), (caddr_t)uap->asa, (u_int)len))

                goto bad;
                goto bad;

-       u.u_error = copyout((caddr_t)&len, (caddr_t)uap->alen, sizeof (len));
+       error = copyout((caddr_t)&len, (caddr_t)uap->alen, sizeof (len));

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

+       return (error);

 }
 
 }
 

-sockargs(aname, name, namelen, type)
-       struct mbuf **aname;
-       caddr_t name;
-       int namelen, type;
+sockargs(mp, buf, buflen, type)
+       struct mbuf **mp;
+       caddr_t buf;
+       int buflen, type;

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

-       if ((u_int)namelen > MLEN) {
+       if ((u_int)buflen > MLEN) {

 #ifdef COMPAT_43
 #ifdef COMPAT_43

-               if (type == MT_SONAME && (u_int)namelen <= 112)
-                       namelen = MLEN;         /* unix domain compat. hack */
+               if (type == MT_SONAME && (u_int)buflen <= 112)
+                       buflen = MLEN;          /* unix domain compat. hack */

                else
 #endif
                return (EINVAL);
                else
 #endif
                return (EINVAL);


@@ -1017,36 +1164,36 @@ sockargs(aname, name, namelen, type)
        m = m_get(M_WAIT, type);
        if (m == NULL)
                return (ENOBUFS);
        m = m_get(M_WAIT, type);
        if (m == NULL)
                return (ENOBUFS);

-       m->m_len = namelen;
-       error = copyin(name, mtod(m, caddr_t), (u_int)namelen);
+       m->m_len = buflen;
+       error = copyin(buf, mtod(m, caddr_t), (u_int)buflen);

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

-               *aname = m;
+               *mp = m;

        if (type == MT_SONAME) {
                register struct sockaddr *sa = mtod(m, struct sockaddr *);
        if (type == MT_SONAME) {
                register struct sockaddr *sa = mtod(m, struct sockaddr *);

+

 #if defined(COMPAT_43) && BYTE_ORDER != BIG_ENDIAN
                if (sa->sa_family == 0 && sa->sa_len < AF_MAX)
                        sa->sa_family = sa->sa_len;
 #endif
 #if defined(COMPAT_43) && BYTE_ORDER != BIG_ENDIAN
                if (sa->sa_family == 0 && sa->sa_len < AF_MAX)
                        sa->sa_family = sa->sa_len;
 #endif

-               sa->sa_len = namelen;
+               sa->sa_len = buflen;

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

-struct file *
-getsock(fdes)
+getsock(fdp, fdes, fpp)
+       struct filedesc *fdp;

        int fdes;
        int fdes;

+       struct file **fpp;

 {
        register struct file *fp;
 
 {
        register struct file *fp;
 

-       if ((unsigned)fdes >= NOFILE || (fp = u.u_ofile[fdes]) == NULL) {
-               u.u_error = EBADF;
-               return (0);
-       }
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return (0);
-       }
-       return (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);

 }
 }