missing return value

[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 d88be06..b0ae663 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,188 +1,203 @@
-/*     uipc_syscalls.c 4.28    82/10/05        */
-
-#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 "../net/in.h"
-#include "../net/in_systm.h"
-#include "../h/descrip.h"
-#include "../h/uio.h"
+/*
+ *
+ * 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.
+ *
+ *     @(#)uipc_syscalls.c     7.17 (Berkeley) %G%
+ */
+
+#include "param.h"
+/* #include "user.h" */
+#include "syscontext.h" /* XXX */
+#include "proc.h"
+#include "file.h"
+#include "buf.h"
+#include "malloc.h"
+#include "mbuf.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.
  */
 

-socket()
-{
-       register struct a {
+struct file *getsock();
+extern struct fileops socketops;
+
+/* ARGSUSED */
+socket(p, uap, retval)
+       struct proc *p;
+       register struct args {

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

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

        struct socket *so;
        struct socket *so;

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

 
 

-       u.u_error = sockopt(&aopt, uap->opt);
-       if (u.u_error)
-               return;
-       if ((fp = falloc()) == NULL)
-               goto freeopt;
+       if (error = falloc(&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(0, &so, uap->type, uap->protocol, &aopt);
-       if (u.u_error)
-               goto bad;
-       fp->f_socket = so;
-freeopt:
-       if (uap->opt)
-               m_free(dtom(aopt.so_optdata));
-       return;
-bad:
-       u.u_ofile[u.u_r.r_val1] = 0;
-       fp->f_count = 0;
-       goto freeopt;
+       fp->f_ops = &socketops;
+       if (error = socreate(uap->domain, &so, uap->type, uap->protocol)) {
+               u.u_ofile[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;

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

        register struct file *fp;
        struct mbuf *nam;
        register struct file *fp;
        struct mbuf *nam;

-       struct socketopt aopt;
+       int error;

 
 

-       fp = getf(uap->s);
+       fp = getsock(uap->s, &error);

        if (fp == 0)
        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 = sockopt(&aopt, uap->opt);
-       if (u.u_error) {
-               m_freem(nam);
-               return;
-       }
-       u.u_error = sobind(fp->f_socket, nam, &aopt);
+               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);

-       if (uap->opt)
-               m_free(dtom(aopt.so_optdata));
+       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;
+       } *uap;
+       int *retval;
+{

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

+       int error;

 
 

-       fp = getf(uap->s);
+       fp = getsock(uap->s, &error);

        if (fp == 0)
        if (fp == 0)

-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       u.u_error = solisten(fp->f_socket, uap->backlog);
+               RETURN (error);
+       RETURN (solisten((struct socket *)fp->f_data, uap->backlog));

 }
 
 }
 

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

 {
 {

-       register struct a {
+
+       uap->compat_43 = 0;
+       RETURN (accept1(p, uap, retval));
+}
+
+oaccept(p, uap, retval)
+       struct proc *p;
+       struct args {

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

-               struct  socketopt *opt;
-       } *uap = (struct a *)u.u_ap;
-       register struct file *fp;
+               int     compat_43;
+       } *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       RETURN (accept1(p, uap, retval));
+}
+#else /* COMPAT_43 */
+
+#define        accept1 accept
+#endif
+
+/* ARGSUSED */
+accept1(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               caddr_t name;
+               int     *anamelen;
+#ifdef COMPAT_43
+               int     compat_43;
+#endif
+       } *uap;
+       int *retval;
+{
+       struct file *fp;

        struct mbuf *nam;
        struct mbuf *nam;

-       struct socketopt aopt;
-       int namelen;
-       int s;
+       int namelen, error, s;

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

-       if (uap->name == 0)
-               goto noname;
-       if (copyin((caddr_t)uap->anamelen, (caddr_t)&namelen, sizeof (namelen))) {
-               u.u_error = EFAULT;
-               return;
-       }
-       if (useracc((caddr_t)uap->name, namelen, B_WRITE) == 0) {
-               u.u_error = EFAULT;
-               return;
-       }
-noname:
-       u.u_error = sockopt(&aopt, uap->opt);
-       if (u.u_error)
-               return;
-       fp = getf(uap->s);
+       if (uap->name && (error = copyin((caddr_t)uap->anamelen,
+           (caddr_t)&namelen, sizeof (namelen))))
+               RETURN (error);
+       fp = getsock(uap->s, &error);

        if (fp == 0)
        if (fp == 0)

-               goto bad;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               goto bad;
-       }
+               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);

-               goto bad;
+               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);

-               goto bad;
+               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);

-               goto bad;
+               RETURN (error);

        }
        }

-       if ((so->so_options & SO_NEWFDONCONN) == 0) {
-               struct socket *nso = so->so_q;
-               (void) soqremque(nso, 1);
-               soclose(so, 1);
-               fp->f_socket = nso;
-               nso->so_q = 0;
-               so = nso;
-               goto ret;
-       }
-       if (ufalloc() < 0) {
-               splx(s);
-               goto bad;
-       }
-       fp = falloc();
-       if (fp == 0) {
-               u.u_ofile[u.u_r.r_val1] = 0;
+       if (error = falloc(&fp, retval)) {

                splx(s);
                splx(s);

-               goto bad;
+               RETURN (error);

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


@@ -191,395 +206,1021 @@ 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:
-       nam = m_get(M_WAIT);
-       nam->m_off = MMINOFF;
-       soaccept(so, nam, &aopt);
+       fp->f_ops = &socketops;
+       fp->f_data = (caddr_t)so;
+       nam = m_get(M_WAIT, MT_SONAME);
+       (void) soaccept(so, nam);

        if (uap->name) {
        if (uap->name) {

+#ifdef 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 */
                if (namelen > nam->m_len)
                        namelen = nam->m_len;
                /* SHOULD COPY OUT A CHAIN HERE */

-               (void) copyout(mtod(nam, caddr_t), uap->name, namelen);
-               (void) copyout((caddr_t)&namelen, 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);

-bad:
-       if (uap->opt)
-               m_free(dtom(aopt.so_optdata));
+       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;

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

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

-       struct socketopt aopt;
-       int s;
+       int error, s;

 
 

-       fp = getf(uap->s);
+       fp = getsock(uap->s, &error);

        if (fp == 0)
        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 = sockopt(&aopt, uap->opt);
-       if (u.u_error) {
+               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;
+       if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {

                m_freem(nam);
                m_freem(nam);

-               return;
+               RETURN (EINPROGRESS);

        }
        }

-       u.u_error = soconnect(so, nam, &aopt);
-       if (u.u_error)
-               goto bad;

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

-       if ((so->so_state & SS_NBIO) &&
-           (so->so_state & SS_ISCONNECTING)) {
-               u.u_error = EINPROGRESS;
-               splx(s);
-               goto bad;
-       }

        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 (uap->opt)
-               m_free(dtom(aopt.so_optdata));
-       return;
+       if (error == ERESTART)
+               error = EINTR;
+       RETURN (error);

 }
 
 }
 

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

 {
 {

+       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(&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(&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:
+       crfree(fp2->f_cred);
+       fp2->f_count = 0;
+       u.u_ofile[sv[1]] = 0;
+free3:
+       crfree(fp1->f_cred);
+       fp1->f_count = 0;
+       u.u_ofile[sv[0]] = 0;
+free2:
+       (void)soclose(so2);
+free1:
+       (void)soclose(so1);
+       RETURN (error);

 }
 
 }
 

-sendto()
-{
-       register struct a {
+/* ARGSUSED */
+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;
-       register struct file *fp;
-       struct uio auio;
+       } *uap;
+       int *retval;
+{
+       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_43
+       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, 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);
-bad:
-       m_freem(to);
+       RETURN (sendit(uap->s, &msg, uap->flags, retval));

 }
 
 }
 

-send()
-{
-       register struct a {
+#ifdef COMPAT_43
+/* ARGSUSED */
+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;
-       register struct file *fp;
-       struct uio auio;
+       } *uap;
+       int *retval;
+{
+       struct msghdr msg;

        struct iovec aiov;
        struct iovec aiov;

-       struct mbuf *nam;

 
 

-       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, 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);
+       msg.msg_control = 0;
+       msg.msg_flags = 0;
+       RETURN (sendit(uap->s, &msg, uap->flags, retval));

 }
 
 }
 

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

 {
 {

-       register struct a {
+       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(uap->s, &msg, uap->flags, retval);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       RETURN (error);
+}
+#endif
+
+/* ARGSUSED */
+sendmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     s;
                int     s;

-               caddr_t buf;
-               int     len;
+               caddr_t msg;

                int     flags;
                int     flags;

-               caddr_t from;
-               int     *fromlenaddr;
-       } *uap = (struct a *)u.u_ap;
+       } *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_43
+       msg.msg_flags = 0;
+#endif
+       error = sendit(uap->s, &msg, uap->flags, retval);
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       RETURN (error);
+}
+
+sendit(s, mp, flags, retsize)
+       int s;
+       register struct msghdr *mp;
+       int flags, *retsize;
+{

        register struct file *fp;
        struct uio auio;
        register struct file *fp;
        struct uio auio;

-       struct iovec aiov;
-       struct mbuf *from;
-       int fromlen;
-
-       if (copyin((caddr_t)uap->fromlenaddr, (caddr_t)&fromlen, sizeof (fromlen))) {
-               u.u_error = EFAULT;
-               return;
-       }
-       fp = getf(uap->s);
+       register struct iovec *iov;
+       register int i;
+       struct mbuf *to, *control;
+       int len, error;
+#ifdef KTRACE
+       struct iovec *ktriov = NULL;
+#endif
+       
+       fp = getsock(s, &error);

        if (fp == 0)
        if (fp == 0)

-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       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, uap->len, B_WRITE) == 0)  {
-               u.u_error = EFAULT;
-               return;
+               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_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)
+                       return (EINVAL);
+               if ((auio.uio_resid += iov->iov_len) < 0)
+                       return (EINVAL);

        }
        }

-       from = 0;
-       u.u_error = soreceive(fp->f_socket, &from, &auio);
-       if (u.u_error)
-               goto bad;
-       if (from == 0)
-               fromlen = 0;
-       else {
-               if (fromlen > from->m_len)
-                       fromlen = from->m_len;
-               if (copyout(mtod(from, caddr_t), uap->from, fromlen)) {
-                       u.u_error = EFAULT;
+       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_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;
                        goto bad;

+#ifdef COMPAT_43
+               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(u.u_procp, 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);

        }
        }

-       if (copyout((caddr_t)&fromlen, (caddr_t)uap->fromlenaddr,
-           sizeof (fromlen))) {
-               u.u_error = EFAULT;
-               goto bad;
+#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(u.u_procp, SIGPIPE);
+       }
+       if (error == 0)
+               *retsize = len - auio.uio_resid;
+#ifdef KTRACE
+       if (ktriov != NULL) {
+               if (error == 0)
+                       ktrgenio(u.u_procp->p_tracep, s, UIO_WRITE,
+                               ktriov, *retsize);
+               FREE(ktriov, M_TEMP);

        }
        }

-       u.u_r.r_val1 = uap->len - auio.uio_resid;
+#endif

 bad:
 bad:

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

 }
 
 }
 

-recv()
+#ifdef COMPAT_43
+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;

 {
 {

-       register struct a {
+
+       uap->flags |= MSG_COMPAT;
+       RETURN (recvfrom(p, uap, retval));
+}
+#endif
+
+/* ARGSUSED */
+recvfrom(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;
-       register struct file *fp;
-       struct uio auio;
+               caddr_t from;
+               int     *fromlenaddr;
+       } *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, uap->len, B_WRITE) == 0)  {
-               u.u_error = EFAULT;
-               return;
+       msg.msg_control = 0;
+       msg.msg_flags = uap->flags;
+       RETURN (recvit(uap->s, &msg, (caddr_t)uap->fromlenaddr, retval));
+}
+
+#ifdef COMPAT_43
+/* ARGSUSED */
+orecv(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               caddr_t buf;
+               int     len;
+               int     flags;
+       } *uap;
+       int *retval;
+{
+       struct msghdr msg;
+       struct iovec aiov;
+
+       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(uap->s, &msg, (caddr_t)0, retval));
+}
+
+/*
+ * 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.
+ */
+/* ARGSUSED */
+orecvmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               struct  omsghdr *msg;
+               int     flags;
+       } *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(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
+
+/* ARGSUSED */
+recvmsg(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               struct  msghdr *msg;
+               int     flags;
+       } *uap;
+       int *retval;
+{
+       struct msghdr msg;
+       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;
+#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(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 = soreceive(fp->f_socket, (struct mbuf *)0, &auio);
-       u.u_r.r_val1 = uap->len - auio.uio_resid;
+done:
+       if (iov != aiov)
+               FREE(iov, M_IOV);
+       RETURN (error);

 }
 
 }
 

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

 {
 {

+       register struct file *fp;
+       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
+       
+       fp = getsock(s, &error);
+       if (fp == 0)
+               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_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)
+                       return (EINVAL);
+               if ((auio.uio_resid += iov->iov_len) < 0)
+                       return (EINVAL);
+       }
+#ifdef KTRACE
+       if (KTRPOINT(u.u_procp, KTR_GENIO)) {
+               int iovlen = auio.uio_iovcnt * sizeof (struct iovec);

 
 

-       u.u_error = EINVAL;
+               MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK);
+               bcopy((caddr_t)auio.uio_iov, (caddr_t)ktriov, iovlen);
+       }
+#endif
+       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(u.u_procp->p_tracep, s, UIO_READ,
+                               ktriov, len - auio.uio_resid);
+               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_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_43
+                       if (mp->msg_flags & MSG_COMPAT)
+                               error = 0;      /* old recvfrom didn't check */
+                       else
+#endif
+                       goto out;
+               }
+       }
+       if (mp->msg_control) {
+#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->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);

 }
 
 }
 

-recvmsg()
+/* ARGSUSED */
+shutdown(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               int     how;
+       } *uap;
+       int *retval;

 {
 {

+       struct file *fp;
+       int error;

 
 

-       u.u_error = EINVAL;
+       fp = getsock(uap->s, &error);
+       if (fp == 0)
+               RETURN (error);
+       RETURN (soshutdown((struct socket *)fp->f_data, uap->how));
+}
+
+/* ARGSUSED */
+setsockopt(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               int     level;
+               int     name;
+               caddr_t val;
+               int     valsize;
+       } *uap;
+       int *retval;
+{
+       struct file *fp;
+       struct mbuf *m = NULL;
+       int error;
+
+       fp = getsock(uap->s, &error);
+       if (fp == 0)
+               RETURN (error);
+       if (uap->valsize > MLEN)
+               RETURN (EINVAL);
+       if (uap->val) {
+               m = m_get(M_WAIT, MT_SOOPTS);
+               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;
+       }
+       RETURN (sosetopt((struct socket *)fp->f_data, uap->level,
+           uap->name, m));

 }
 
 }
 

-shutdown()
+/* ARGSUSED */
+getsockopt(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     s;
+               int     level;
+               int     name;
+               caddr_t val;
+               int     *avalsize;
+       } *uap;
+       int *retval;

 {
 {

+       struct file *fp;
+       struct mbuf *m = NULL;
+       int valsize, error;

 
 

-       u.u_error = EINVAL;
+       fp = getsock(uap->s, &error);
+       if (fp == 0)
+               RETURN (error);
+       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;
+               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));
+       }
+       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 file *rf, *wf;
+       struct file *rf, *wf;

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

-       int r;
-
-       u.u_error = socreate(1, &rso, SOCK_STREAM, 0, 0);
-       if (u.u_error)
-               return;
-       u.u_error = socreate(1, &wso, SOCK_STREAM, 0, 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(&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(&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:
        wf->f_count = 0;
 free4:
        wf->f_count = 0;

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

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

-       u.u_ofile[r] = 0;
+       u.u_ofile[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()
+#ifdef COMPAT_43
+getsockname(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;

 {
 {

-       register struct a {
+
+       uap->compat_43 = 0;
+       RETURN (getsockname1(p, uap, retval));
+}
+
+ogetsockname(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       RETURN (getsockname1(p, uap, retval));
+}
+#else /* COMPAT_43 */
+
+#define        getsockname1    getsockname
+#endif
+
+/* ARGSUSED */
+getsockname1(p, uap, retval)
+       struct proc *p;
+       register struct args {

                int     fdes;
                int     fdes;

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

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

+       int len, error;

 
 

-       fp = getf(uap->fdes);
+       fp = getsock(uap->fdes, &error);

        if (fp == 0)
        if (fp == 0)

-               return;
-       if (fp->f_type != DTYPE_SOCKET) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       so = fp->f_socket;
-       m = m_getclr(M_WAIT);
-       u.u_error =
-               (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0);
-       if (u.u_error)
+               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);
+       if (m == NULL)
+               RETURN (ENOBUFS);
+       if (error = (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0))

                goto bad;
                goto bad;

-       if (copyout(mtod(m, caddr_t), (caddr_t)uap->asa, sizeof (struct sockaddr)))
-               u.u_error = EFAULT;
+       if (len > m->m_len)
+               len = m->m_len;
+#ifdef COMPAT_43
+       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.
+ */
+#ifdef COMPAT_43
+getpeername(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 0;
+       RETURN (getpeername1(p, uap, retval));
+}
+
+ogetpeername(p, uap, retval)
+       struct proc *p;
+       struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+               int     compat_43;
+       } *uap;
+       int *retval;
+{
+
+       uap->compat_43 = 1;
+       RETURN (getpeername1(p, uap, retval));
+}
+#else /* COMPAT_43 */
+
+#define        getpeername1    getpeername
+#endif
+
+/* ARGSUSED */
+getpeername1(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     fdes;
+               caddr_t asa;
+               int     *alen;
+#ifdef COMPAT_43
+               int     compat_43;
+#endif
+       } *uap;
+       int *retval;
+{
+       register struct file *fp;
+       register struct socket *so;
+       struct mbuf *m;
+       int len, error;
+
+       fp = getsock(uap->fdes, &error);
+       if (fp == 0)
+               RETURN (error);
+       so = (struct socket *)fp->f_data;
+       if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0)
+               RETURN (ENOTCONN);
+       m = m_getclr(M_WAIT, MT_SONAME);
+       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
+       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 mbuf *m;
 {
        register struct mbuf *m;

+       int error;

 
 

-       if (namelen > MLEN)
+       if ((u_int)buflen > MLEN) {
+#ifdef COMPAT_43
+               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);
-       m->m_off = MMINOFF;
-       m->m_len = namelen;
-       if (copyin(name, mtod(m, caddr_t), 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);
                (void) m_free(m);

-               return (EFAULT);
+       else
+               *mp = m;
+       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
+               sa->sa_len = buflen;

        }
        }

-       *aname = m;
-       return (0);
+       return (error);

 }
 
 }
 

-sockopt(so, opt)
-       register struct socketopt *so;
-       caddr_t opt;
+struct file *
+getsock(fdes, errp)
+       int fdes, *errp;

 {
 {

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

 
 

-       if (opt == 0) {
-               so->so_optlen = 0;
-               so->so_optdata = 0;
+       if ((unsigned)fdes >= NOFILE || (fp = u.u_ofile[fdes]) == NULL) {
+               *errp = EBADF;

                return (0);
        }
                return (0);
        }

-       if (copyin((caddr_t)opt, (caddr_t)so, sizeof (struct socketopt)))
-               return (EFAULT);
-       if (so->so_optlen < 0 || so->so_optlen > MLEN)
-               return (EINVAL);
-       m = m_get(M_WAIT);
-       m->m_off = MMINOFF;
-       m->m_len = so->so_optlen;
-       if (copyin(so->so_optdata, mtod(m, caddr_t), m->m_len)) {
-               (void) m_free(m);
-               return (EFAULT);
+       if (fp->f_type != DTYPE_SOCKET) {
+               *errp = ENOTSOCK;
+               return (0);

        }
        }

-       so->so_optdata = mtod(m, caddr_t);
-       return (0);
+       return (fp);

 }
 }