BSD 4_4_Lite2 release
[unix-history] / usr / src / sys / kern / uipc_socket.c
index 99a3503..a9c5453 100644 (file)
@@ -1,21 +1,50 @@
-/*     uipc_socket.c   4.71    83/01/22        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/stat.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
-#include "../net/route.h"
+/*
+ * Copyright (c) 1982, 1986, 1988, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)uipc_socket.c       8.6 (Berkeley) 5/2/95
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/domain.h>
+#include <sys/kernel.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/resourcevar.h>
 
 /*
  * Socket operation routines.
 
 /*
  * Socket operation routines.
  * implement the semantics of socket operations by
  * switching out to the protocol specific routines.
  */
  * implement the semantics of socket operations by
  * switching out to the protocol specific routines.
  */
-
 /*ARGSUSED*/
 /*ARGSUSED*/
+int
 socreate(dom, aso, type, proto)
 socreate(dom, aso, type, proto)
+       int dom;
        struct socket **aso;
        struct socket **aso;
-       int type, proto;
+       register int type;
+       int proto;
 {
 {
+       struct proc *p = curproc;               /* XXX */
        register struct protosw *prp;
        register struct socket *so;
        register struct protosw *prp;
        register struct socket *so;
-       struct mbuf *m;
-       int error;
+       register int error;
 
        if (proto)
 
        if (proto)
-               prp = pffindproto(dom, proto);
+               prp = pffindproto(dom, proto, type);
        else
                prp = pffindtype(dom, type);
        else
                prp = pffindtype(dom, type);
-       if (prp == 0)
+       if (prp == 0 || prp->pr_usrreq == 0)
                return (EPROTONOSUPPORT);
        if (prp->pr_type != type)
                return (EPROTOTYPE);
                return (EPROTONOSUPPORT);
        if (prp->pr_type != type)
                return (EPROTOTYPE);
-       m = m_getclr(M_WAIT, MT_SOCKET);
-       if (m == 0)
-               return (ENOBUFS);
-       so = mtod(m, struct socket *);
-       so->so_options = SO_LINGER;
-       so->so_state = 0;
+       MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
+       bzero((caddr_t)so, sizeof(*so));
        so->so_type = type;
        so->so_type = type;
-       if (u.u_uid == 0)
+       if (p->p_ucred->cr_uid == 0)
                so->so_state = SS_PRIV;
        so->so_proto = prp;
                so->so_state = SS_PRIV;
        so->so_proto = prp;
-       error = (*prp->pr_usrreq)(so, PRU_ATTACH,
-           (struct mbuf *)0, (struct mbuf *)0);
+       error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0,
+           (struct mbuf *)(long)proto, (struct mbuf *)0);
        if (error) {
                so->so_state |= SS_NOFDREF;
                sofree(so);
        if (error) {
                so->so_state |= SS_NOFDREF;
                sofree(so);
@@ -64,6 +91,7 @@ socreate(dom, aso, type, proto)
        return (0);
 }
 
        return (0);
 }
 
+int
 sobind(so, nam)
        struct socket *so;
        struct mbuf *nam;
 sobind(so, nam)
        struct socket *so;
        struct mbuf *nam;
@@ -72,51 +100,50 @@ sobind(so, nam)
        int error;
 
        error =
        int error;
 
        error =
-           (*so->so_proto->pr_usrreq)(so, PRU_BIND, (struct mbuf *)0, nam);
+           (*so->so_proto->pr_usrreq)(so, PRU_BIND,
+               (struct mbuf *)0, nam, (struct mbuf *)0);
        splx(s);
        return (error);
 }
 
        splx(s);
        return (error);
 }
 
+int
 solisten(so, backlog)
 solisten(so, backlog)
-       struct socket *so;
+       register struct socket *so;
        int backlog;
 {
        int backlog;
 {
-       int s = splnet();
-       int error;
+       int s = splnet(), error;
 
 
-       error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN,
-           (struct mbuf *)0, (struct mbuf *)0);
+       error =
+           (*so->so_proto->pr_usrreq)(so, PRU_LISTEN,
+               (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
        if (error) {
                splx(s);
                return (error);
        }
        if (error) {
                splx(s);
                return (error);
        }
-       if (so->so_q == 0) {
-               so->so_q = so;
-               so->so_q0 = so;
+       if (so->so_q == 0)
                so->so_options |= SO_ACCEPTCONN;
                so->so_options |= SO_ACCEPTCONN;
-       }
        if (backlog < 0)
                backlog = 0;
        if (backlog < 0)
                backlog = 0;
-#define        SOMAXCONN       5
-       so->so_qlimit = MIN(backlog, SOMAXCONN);
-       so->so_options |= SO_NEWFDONCONN;
+       so->so_qlimit = min(backlog, SOMAXCONN);
+       splx(s);
        return (0);
 }
 
        return (0);
 }
 
+int
 sofree(so)
 sofree(so)
-       struct socket *so;
+       register struct socket *so;
 {
 
 {
 
+       if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
+               return;
        if (so->so_head) {
                if (!soqremque(so, 0) && !soqremque(so, 1))
                        panic("sofree dq");
                so->so_head = 0;
        }
        if (so->so_head) {
                if (!soqremque(so, 0) && !soqremque(so, 1))
                        panic("sofree dq");
                so->so_head = 0;
        }
-       if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
-               return;
        sbrelease(&so->so_snd);
        sbrelease(&so->so_snd);
-       sbrelease(&so->so_rcv);
-       (void) m_free(dtom(so));
+       sorflush(so);
+       FREE(so, M_SOCKET);
 }
 
 /*
 }
 
 /*
@@ -124,51 +151,44 @@ sofree(so)
  * Initiate disconnect if connected.
  * Free socket when disconnect complete.
  */
  * Initiate disconnect if connected.
  * Free socket when disconnect complete.
  */
-soclose(so, exiting)
+int
+soclose(so)
        register struct socket *so;
        register struct socket *so;
-       int exiting;
 {
        int s = splnet();               /* conservative */
 {
        int s = splnet();               /* conservative */
-       int error;
+       int error = 0;
 
        if (so->so_options & SO_ACCEPTCONN) {
 
        if (so->so_options & SO_ACCEPTCONN) {
-               while (so->so_q0 != so)
+               while (so->so_q0)
                        (void) soabort(so->so_q0);
                        (void) soabort(so->so_q0);
-               while (so->so_q != so)
+               while (so->so_q)
                        (void) soabort(so->so_q);
        }
        if (so->so_pcb == 0)
                goto discard;
                        (void) soabort(so->so_q);
        }
        if (so->so_pcb == 0)
                goto discard;
-       if (exiting)
-               so->so_options |= SO_KEEPALIVE;
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {
-                       error = sodisconnect(so, (struct mbuf *)0);
-                       if (error) {
-                               if (exiting)
-                                       goto drop;
-                               splx(s);
-                               return (error);
-                       }
+                       error = sodisconnect(so);
+                       if (error)
+                               goto drop;
                }
                if (so->so_options & SO_LINGER) {
                        if ((so->so_state & SS_ISDISCONNECTING) &&
                }
                if (so->so_options & SO_LINGER) {
                        if ((so->so_state & SS_ISDISCONNECTING) &&
-                           (so->so_state & SS_NBIO) &&
-                           exiting == 0)
-                               return (EINPROGRESS);
-                       /* should use tsleep here, for at most linger */
+                           (so->so_state & SS_NBIO))
+                               goto drop;
                        while (so->so_state & SS_ISCONNECTED)
                        while (so->so_state & SS_ISCONNECTED)
-                               sleep((caddr_t)&so->so_timeo, PZERO+1);
+                               if (error = tsleep((caddr_t)&so->so_timeo,
+                                   PSOCK | PCATCH, netcls, so->so_linger * hz))
+                                       break;
                }
        }
 drop:
        if (so->so_pcb) {
                }
        }
 drop:
        if (so->so_pcb) {
-               error = (*so->so_proto->pr_usrreq)(so, PRU_DETACH,
-                   (struct mbuf *)0, (struct mbuf *)0);
-               if (exiting == 0 && error) {
-                       splx(s);
-                       return (error);
-               }
+               int error2 =
+                   (*so->so_proto->pr_usrreq)(so, PRU_DETACH,
+                       (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
+               if (error == 0)
+                       error = error2;
        }
 discard:
        if (so->so_state & SS_NOFDREF)
        }
 discard:
        if (so->so_state & SS_NOFDREF)
@@ -176,36 +196,25 @@ discard:
        so->so_state |= SS_NOFDREF;
        sofree(so);
        splx(s);
        so->so_state |= SS_NOFDREF;
        sofree(so);
        splx(s);
-       return (0);
+       return (error);
 }
 
 /*
  * Must be called at splnet...
  */
 }
 
 /*
  * Must be called at splnet...
  */
+int
 soabort(so)
        struct socket *so;
 {
 soabort(so)
        struct socket *so;
 {
-       int error;
-
-       error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT,
-          (struct mbuf *)0, (struct mbuf *)0);
-       return (error);
-}
-
-/*ARGSUSED*/
-sostat(so, ub)
-       struct socket *so;
-       struct stat *ub;
-{
-       struct stat sb;
 
 
-       bzero((caddr_t)&sb, sizeof (sb));               /* XXX */
-       (void) copyout((caddr_t)&sb, (caddr_t)ub, sizeof (sb));/* XXX */
-       return (0);                                     /* XXX */
+       return (
+           (*so->so_proto->pr_usrreq)(so, PRU_ABORT,
+               (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0));
 }
 
 }
 
+int
 soaccept(so, nam)
 soaccept(so, nam)
-       struct socket *so;
+       register struct socket *so;
        struct mbuf *nam;
 {
        int s = splnet();
        struct mbuf *nam;
 {
        int s = splnet();
@@ -215,32 +224,56 @@ soaccept(so, nam)
                panic("soaccept: !NOFDREF");
        so->so_state &= ~SS_NOFDREF;
        error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT,
                panic("soaccept: !NOFDREF");
        so->so_state &= ~SS_NOFDREF;
        error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT,
-           (struct mbuf *)0, nam);
+           (struct mbuf *)0, nam, (struct mbuf *)0);
        splx(s);
        return (error);
 }
 
        splx(s);
        return (error);
 }
 
+int
 soconnect(so, nam)
 soconnect(so, nam)
-       struct socket *so;
+       register struct socket *so;
        struct mbuf *nam;
 {
        struct mbuf *nam;
 {
-       int s = splnet();
+       int s;
        int error;
 
        int error;
 
-       if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) {
+       if (so->so_options & SO_ACCEPTCONN)
+               return (EOPNOTSUPP);
+       s = splnet();
+       /*
+        * If protocol is connection-based, can only connect once.
+        * Otherwise, if connected, try to disconnect first.
+        * This allows user to disconnect by connecting to, e.g.,
+        * a null address.
+        */
+       if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
+           ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
+           (error = sodisconnect(so))))
                error = EISCONN;
                error = EISCONN;
-               goto bad;
-       }
-       error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
-           (struct mbuf *)0, nam);
-bad:
+       else
+               error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
+                   (struct mbuf *)0, nam, (struct mbuf *)0);
        splx(s);
        return (error);
 }
 
        splx(s);
        return (error);
 }
 
-sodisconnect(so, nam)
-       struct socket *so;
-       struct mbuf *nam;
+int
+soconnect2(so1, so2)
+       register struct socket *so1;
+       struct socket *so2;
+{
+       int s = splnet();
+       int error;
+
+       error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2,
+           (struct mbuf *)0, (struct mbuf *)so2, (struct mbuf *)0);
+       splx(s);
+       return (error);
+}
+
+int
+sodisconnect(so)
+       register struct socket *so;
 {
        int s = splnet();
        int error;
 {
        int s = splnet();
        int error;
@@ -254,12 +287,13 @@ sodisconnect(so, nam)
                goto bad;
        }
        error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT,
                goto bad;
        }
        error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT,
-           (struct mbuf *)0, nam);
+           (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
 bad:
        splx(s);
        return (error);
 }
 
 bad:
        splx(s);
        return (error);
 }
 
+#define        SBLOCKWAIT(f)   (((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK)
 /*
  * Send on a socket.
  * If send must go all at once and message is larger than
 /*
  * Send on a socket.
  * If send must go all at once and message is larger than
@@ -267,148 +301,226 @@ bad:
  * Lock against other senders.
  * If must go all at once and not enough room now, then
  * inform user that this would block and do nothing.
  * Lock against other senders.
  * If must go all at once and not enough room now, then
  * inform user that this would block and do nothing.
+ * Otherwise, if nonblocking, send as much as possible.
+ * The data to be sent is described by "uio" if nonzero,
+ * otherwise by the mbuf chain "top" (which must be null
+ * if uio is not).  Data provided in mbuf chain must be small
+ * enough to send all at once.
+ *
+ * Returns nonzero on error, timeout or signal; callers
+ * must check for short counts if EINTR/ERESTART are returned.
+ * Data and control buffers are freed on return.
  */
  */
-sosend(so, nam, uio, flags)
+int
+sosend(so, addr, uio, top, control, flags)
        register struct socket *so;
        register struct socket *so;
-       struct mbuf *nam;
+       struct mbuf *addr;
        struct uio *uio;
        struct uio *uio;
+       struct mbuf *top;
+       struct mbuf *control;
        int flags;
 {
        int flags;
 {
-       struct mbuf *top = 0;
-       register struct mbuf *m, **mp = &top;
-       register int len;
-       int error = 0, space, s, dontroute;
-
-       if (sosendallatonce(so) && uio->uio_resid > so->so_snd.sb_hiwat)
-               return (EMSGSIZE);
-       dontroute = (flags & SOF_DONTROUTE) &&
-               (so->so_options & SO_DONTROUTE) == 0 &&
-               (so->so_proto->pr_flags & PR_ATOMIC);
-restart:
-       sblock(&so->so_snd);
+       struct proc *p = curproc;               /* XXX */
+       struct mbuf **mp;
+       register struct mbuf *m;
+       register long space, len, resid;
+       int clen = 0, error, s, dontroute, mlen;
+       int atomic = sosendallatonce(so) || top;
+
+       if (uio)
+               resid = uio->uio_resid;
+       else
+               resid = top->m_pkthdr.len;
+       /*
+        * In theory resid should be unsigned.
+        * However, space must be signed, as it might be less than 0
+        * if we over-committed, and we must use a signed comparison
+        * of space and resid.  On the other hand, a negative resid
+        * causes us to loop sending 0-length segments to the protocol.
+        */
+       if (resid < 0)
+               return (EINVAL);
+       dontroute =
+           (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
+           (so->so_proto->pr_flags & PR_ATOMIC);
+       p->p_stats->p_ru.ru_msgsnd++;
+       if (control)
+               clen = control->m_len;
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
-       u.u_ru.ru_msgsnd++;
-again:
-       s = splnet();
-       if (so->so_state & SS_CANTSENDMORE) {
-               psignal(u.u_procp, SIGPIPE);
-               snderr(EPIPE);
-       }
-       if (so->so_error) {
-               error = so->so_error;
-               so->so_error = 0;                               /* ??? */
-               splx(s);
-               goto release;
-       }
-       if ((so->so_state & SS_ISCONNECTED) == 0) {
-               if (so->so_proto->pr_flags & PR_CONNREQUIRED)
-                       snderr(ENOTCONN);
-               if (nam == 0)
-                       snderr(EDESTADDRREQ);
-       }
-       if (top) {
-               if (dontroute)
-                       so->so_options |= SO_DONTROUTE;
-               error = (*so->so_proto->pr_usrreq)(so,
-                   (flags & SOF_OOB) ? PRU_SENDOOB : PRU_SEND,
-                   top, (caddr_t)nam);
-               if (dontroute)
-                       so->so_options &= ~SO_DONTROUTE;
-               top = 0;
-               if (error) {
-                       splx(s);
-                       goto release;
+restart:
+       if (error = sblock(&so->so_snd, SBLOCKWAIT(flags)))
+               goto out;
+       do {
+               s = splnet();
+               if (so->so_state & SS_CANTSENDMORE)
+                       snderr(EPIPE);
+               if (so->so_error)
+                       snderr(so->so_error);
+               if ((so->so_state & SS_ISCONNECTED) == 0) {
+                       if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
+                               if ((so->so_state & SS_ISCONFIRMING) == 0 &&
+                                   !(resid == 0 && clen != 0))
+                                       snderr(ENOTCONN);
+                       } else if (addr == 0)
+                               snderr(EDESTADDRREQ);
                }
                }
-               mp = &top;
-       }
-       if (uio->uio_resid == 0) {
-               splx(s);
-               goto release;
-       }
-       if (flags & SOF_OOB)
-               space = 1024;
-       else {
                space = sbspace(&so->so_snd);
                space = sbspace(&so->so_snd);
-               if (space <= 0 ||
-                   sosendallatonce(so) && space < uio->uio_resid) {
+               if (flags & MSG_OOB)
+                       space += 1024;
+               if (atomic && resid > so->so_snd.sb_hiwat ||
+                   clen > so->so_snd.sb_hiwat)
+                       snderr(EMSGSIZE);
+               if (space < resid + clen && uio &&
+                   (atomic || space < so->so_snd.sb_lowat || space < clen)) {
                        if (so->so_state & SS_NBIO)
                                snderr(EWOULDBLOCK);
                        sbunlock(&so->so_snd);
                        if (so->so_state & SS_NBIO)
                                snderr(EWOULDBLOCK);
                        sbunlock(&so->so_snd);
-                       sbwait(&so->so_snd);
+                       error = sbwait(&so->so_snd);
                        splx(s);
                        splx(s);
+                       if (error)
+                               goto out;
                        goto restart;
                }
                        goto restart;
                }
-       }
-       splx(s);
-       while (uio->uio_resid > 0 && space > 0) {
-               register struct iovec *iov = uio->uio_iov;
-
-               if (iov->iov_len == 0) {
-                       uio->uio_iov++;
-                       uio->uio_iovcnt--;
-                       if (uio->uio_iovcnt < 0)
-                               panic("sosend");
-                       continue;
-               }
-               MGET(m, M_WAIT, MT_DATA);
-               if (m == NULL) {
-                       error = ENOBUFS;                        /* SIGPIPE? */
-                       goto release;
-               }
-               if (iov->iov_len >= CLBYTES && space >= CLBYTES) {
-                       register struct mbuf *p;
-                       MCLGET(p, 1);
-                       if (p == 0)
-                               goto nopages;
-                       m->m_off = (int)p - (int)m;
-                       len = CLBYTES;
-               } else {
+               splx(s);
+               mp = &top;
+               space -= clen;
+               do {
+                   if (uio == NULL) {
+                       /*
+                        * Data is prepackaged in "top".
+                        */
+                       resid = 0;
+                       if (flags & MSG_EOR)
+                               top->m_flags |= M_EOR;
+                   } else do {
+                       if (top == 0) {
+                               MGETHDR(m, M_WAIT, MT_DATA);
+                               mlen = MHLEN;
+                               m->m_pkthdr.len = 0;
+                               m->m_pkthdr.rcvif = (struct ifnet *)0;
+                       } else {
+                               MGET(m, M_WAIT, MT_DATA);
+                               mlen = MLEN;
+                       }
+                       if (resid >= MINCLSIZE && space >= MCLBYTES) {
+                               MCLGET(m, M_WAIT);
+                               if ((m->m_flags & M_EXT) == 0)
+                                       goto nopages;
+                               mlen = MCLBYTES;
+#ifdef MAPPED_MBUFS
+                               len = min(MCLBYTES, resid);
+#else
+                               if (atomic && top == 0) {
+                                       len = min(MCLBYTES - max_hdr, resid);
+                                       m->m_data += max_hdr;
+                               } else
+                                       len = min(MCLBYTES, resid);
+#endif
+                               space -= MCLBYTES;
+                       } else {
 nopages:
 nopages:
-                       len = MIN(MLEN, iov->iov_len);
-               }
-               (void) uiomove(mtod(m, caddr_t), len, UIO_WRITE, uio);
-               m->m_len = len;
-               *mp = m;
-               mp = &m->m_next;
-               if (flags & SOF_OOB)
-                       space -= len;
-               else
-                       space = sbspace(&so->so_snd);
-       }
-       goto again;
+                               len = min(min(mlen, resid), space);
+                               space -= len;
+                               /*
+                                * For datagram protocols, leave room
+                                * for protocol headers in first mbuf.
+                                */
+                               if (atomic && top == 0 && len < mlen)
+                                       MH_ALIGN(m, len);
+                       }
+                       error = uiomove(mtod(m, caddr_t), (int)len, uio);
+                       resid = uio->uio_resid;
+                       m->m_len = len;
+                       *mp = m;
+                       top->m_pkthdr.len += len;
+                       if (error)
+                               goto release;
+                       mp = &m->m_next;
+                       if (resid <= 0) {
+                               if (flags & MSG_EOR)
+                                       top->m_flags |= M_EOR;
+                               break;
+                       }
+                   } while (space > 0 && atomic);
+                   if (dontroute)
+                           so->so_options |= SO_DONTROUTE;
+                   s = splnet();                               /* XXX */
+                   error = (*so->so_proto->pr_usrreq)(so,
+                       (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
+                       top, addr, control);
+                   splx(s);
+                   if (dontroute)
+                           so->so_options &= ~SO_DONTROUTE;
+                   clen = 0;
+                   control = 0;
+                   top = 0;
+                   mp = &top;
+                   if (error)
+                       goto release;
+               } while (resid && space > 0);
+       } while (resid);
 
 release:
        sbunlock(&so->so_snd);
 
 release:
        sbunlock(&so->so_snd);
+out:
        if (top)
                m_freem(top);
        if (top)
                m_freem(top);
+       if (control)
+               m_freem(control);
        return (error);
 }
 
        return (error);
 }
 
-soreceive(so, aname, uio, flags)
+/*
+ * Implement receive operations on a socket.
+ * We depend on the way that records are added to the sockbuf
+ * by sbappend*.  In particular, each record (mbufs linked through m_next)
+ * must begin with an address if the protocol so specifies,
+ * followed by an optional mbuf or mbufs containing ancillary data,
+ * and then zero or more mbufs of data.
+ * In order to avoid blocking network interrupts for the entire time here,
+ * we splx() while doing the actual copy to user space.
+ * Although the sockbuf is locked, new data may still be appended,
+ * and thus we must maintain consistency of the sockbuf during that time.
+ *
+ * The caller may receive the data as a single mbuf chain by supplying
+ * an mbuf **mp0 for use in returning the chain.  The uio is then used
+ * only for the count in uio_resid.
+ */
+int
+soreceive(so, paddr, uio, mp0, controlp, flagsp)
        register struct socket *so;
        register struct socket *so;
-       struct mbuf **aname;
+       struct mbuf **paddr;
        struct uio *uio;
        struct uio *uio;
-       int flags;
+       struct mbuf **mp0;
+       struct mbuf **controlp;
+       int *flagsp;
 {
 {
-       register struct mbuf *m, *n;
-       int len;
-       int eor, s, error = 0, moff, tomark;
+       register struct mbuf *m, **mp;
+       register int flags, len, error, s, offset;
+       struct protosw *pr = so->so_proto;
+       struct mbuf *nextrecord;
+       int moff, type;
+       int orig_resid = uio->uio_resid;
 
 
-       if (flags & SOF_OOB) {
+       mp = mp0;
+       if (paddr)
+               *paddr = 0;
+       if (controlp)
+               *controlp = 0;
+       if (flagsp)
+               flags = *flagsp &~ MSG_EOR;
+       else
+               flags = 0;
+       if (flags & MSG_OOB) {
                m = m_get(M_WAIT, MT_DATA);
                m = m_get(M_WAIT, MT_DATA);
-               if (m == NULL)
-                       return (ENOBUFS);
-               error = (*so->so_proto->pr_usrreq)(so, PRU_RCVOOB,
-                   m, (struct mbuf *)0);
+               error = (*pr->pr_usrreq)(so, PRU_RCVOOB, m,
+                   (struct mbuf *)(long)(flags & MSG_PEEK), (struct mbuf *)0);
                if (error)
                        goto bad;
                do {
                if (error)
                        goto bad;
                do {
-                       len = uio->uio_resid;
-                       if (len > m->m_len)
-                               len = m->m_len;
-                       error =
-                           uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio);
+                       error = uiomove(mtod(m, caddr_t),
+                           (int) min(uio->uio_resid, m->m_len), uio);
                        m = m_free(m);
                } while (uio->uio_resid && error == 0 && m);
 bad:
                        m = m_free(m);
                } while (uio->uio_resid && error == 0 && m);
 bad:
@@ -416,283 +528,513 @@ bad:
                        m_freem(m);
                return (error);
        }
                        m_freem(m);
                return (error);
        }
+       if (mp)
+               *mp = (struct mbuf *)0;
+       if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
+               (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
+                   (struct mbuf *)0, (struct mbuf *)0);
 
 restart:
 
 restart:
-       sblock(&so->so_rcv);
+       if (error = sblock(&so->so_rcv, SBLOCKWAIT(flags)))
+               return (error);
        s = splnet();
 
        s = splnet();
 
-#define        rcverr(errno)   { error = errno; splx(s); goto release; }
-       if (so->so_rcv.sb_cc == 0) {
+       m = so->so_rcv.sb_mb;
+       /*
+        * If we have less data than requested, block awaiting more
+        * (subject to any timeout) if:
+        *   1. the current count is less than the low water mark, or
+        *   2. MSG_WAITALL is set, and it is possible to do the entire
+        *      receive operation at once if we block (resid <= hiwat), or
+        *   3. MSG_DONTWAIT is not set.
+        * If MSG_WAITALL is set but resid is larger than the receive buffer,
+        * we have to do the receive in sections, and thus risk returning
+        * a short count if a timeout or signal occurs after we start.
+        */
+       if (m == 0 || ((flags & MSG_DONTWAIT) == 0 &&
+           so->so_rcv.sb_cc < uio->uio_resid) &&
+           (so->so_rcv.sb_cc < so->so_rcv.sb_lowat ||
+           ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) &&
+           m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0) {
+#ifdef DIAGNOSTIC
+               if (m == 0 && so->so_rcv.sb_cc)
+                       panic("receive 1");
+#endif
                if (so->so_error) {
                if (so->so_error) {
+                       if (m)
+                               goto dontblock;
                        error = so->so_error;
                        error = so->so_error;
-                       so->so_error = 0;
-                       splx(s);
+                       if ((flags & MSG_PEEK) == 0)
+                               so->so_error = 0;
                        goto release;
                }
                if (so->so_state & SS_CANTRCVMORE) {
                        goto release;
                }
                if (so->so_state & SS_CANTRCVMORE) {
-                       splx(s);
+                       if (m)
+                               goto dontblock;
+                       else
+                               goto release;
+               }
+               for (; m; m = m->m_next)
+                       if (m->m_type == MT_OOBDATA  || (m->m_flags & M_EOR)) {
+                               m = so->so_rcv.sb_mb;
+                               goto dontblock;
+                       }
+               if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
+                   (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
+                       error = ENOTCONN;
+                       goto release;
+               }
+               if (uio->uio_resid == 0)
+                       goto release;
+               if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) {
+                       error = EWOULDBLOCK;
                        goto release;
                }
                        goto release;
                }
-               if ((so->so_state & SS_ISCONNECTED) == 0 &&
-                   (so->so_proto->pr_flags & PR_CONNREQUIRED))
-                       rcverr(ENOTCONN);
-               if (so->so_state & SS_NBIO)
-                       rcverr(EWOULDBLOCK);
                sbunlock(&so->so_rcv);
                sbunlock(&so->so_rcv);
-               sbwait(&so->so_rcv);
+               error = sbwait(&so->so_rcv);
                splx(s);
                splx(s);
+               if (error)
+                       return (error);
                goto restart;
        }
                goto restart;
        }
-       u.u_ru.ru_msgrcv++;
-       m = so->so_rcv.sb_mb;
-       if (m == 0)
-               panic("receive");
-       if (so->so_proto->pr_flags & PR_ADDR) {
-               if ((flags & SOF_PREVIEW) == 0) {
-                       so->so_rcv.sb_cc -= m->m_len;
-                       so->so_rcv.sb_mbcnt -= MSIZE;
+dontblock:
+       if (uio->uio_procp)
+               uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
+       nextrecord = m->m_nextpkt;
+       if (pr->pr_flags & PR_ADDR) {
+#ifdef DIAGNOSTIC
+               if (m->m_type != MT_SONAME)
+                       panic("receive 1a");
+#endif
+               orig_resid = 0;
+               if (flags & MSG_PEEK) {
+                       if (paddr)
+                               *paddr = m_copy(m, 0, m->m_len);
+                       m = m->m_next;
+               } else {
+                       sbfree(&so->so_rcv, m);
+                       if (paddr) {
+                               *paddr = m;
+                               so->so_rcv.sb_mb = m->m_next;
+                               m->m_next = 0;
+                               m = so->so_rcv.sb_mb;
+                       } else {
+                               MFREE(m, so->so_rcv.sb_mb);
+                               m = so->so_rcv.sb_mb;
+                       }
                }
                }
-               if (aname) {
-                       if (flags & SOF_PREVIEW) {
-                               *aname = m_copy(m, 0, m->m_len);
-                               if (*aname == NULL)
-                                       panic("receive 2");
-                       } else
-                               *aname = m;
+       }
+       while (m && m->m_type == MT_CONTROL && error == 0) {
+               if (flags & MSG_PEEK) {
+                       if (controlp)
+                               *controlp = m_copy(m, 0, m->m_len);
                        m = m->m_next;
                        m = m->m_next;
-                       (*aname)->m_next = 0;
-               } else
-                       if (flags & SOF_PREVIEW)
-                               m = m->m_next;
-                       else
-                               m = m_free(m);
-               if (m == 0)
-                       panic("receive 3");
-               if ((flags & SOF_PREVIEW) == 0)
-                       so->so_rcv.sb_mb = m;
+               } else {
+                       sbfree(&so->so_rcv, m);
+                       if (controlp) {
+                               if (pr->pr_domain->dom_externalize &&
+                                   mtod(m, struct cmsghdr *)->cmsg_type ==
+                                   SCM_RIGHTS)
+                                  error = (*pr->pr_domain->dom_externalize)(m);
+                               *controlp = m;
+                               so->so_rcv.sb_mb = m->m_next;
+                               m->m_next = 0;
+                               m = so->so_rcv.sb_mb;
+                       } else {
+                               MFREE(m, so->so_rcv.sb_mb);
+                               m = so->so_rcv.sb_mb;
+                       }
+               }
+               if (controlp) {
+                       orig_resid = 0;
+                       controlp = &(*controlp)->m_next;
+               }
+       }
+       if (m) {
+               if ((flags & MSG_PEEK) == 0)
+                       m->m_nextpkt = nextrecord;
+               type = m->m_type;
+               if (type == MT_OOBDATA)
+                       flags |= MSG_OOB;
        }
        }
-       eor = 0;
        moff = 0;
        moff = 0;
-       tomark = so->so_oobmark;
-       do {
-               if (uio->uio_resid <= 0)
+       offset = 0;
+       while (m && uio->uio_resid > 0 && error == 0) {
+               if (m->m_type == MT_OOBDATA) {
+                       if (type != MT_OOBDATA)
+                               break;
+               } else if (type == MT_OOBDATA)
                        break;
                        break;
-               len = uio->uio_resid;
+#ifdef DIAGNOSTIC
+               else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
+                       panic("receive 3");
+#endif
                so->so_state &= ~SS_RCVATMARK;
                so->so_state &= ~SS_RCVATMARK;
-               if (tomark && len > tomark)
-                       len = tomark;
-               if (moff+len > m->m_len - moff)
+               len = uio->uio_resid;
+               if (so->so_oobmark && len > so->so_oobmark - offset)
+                       len = so->so_oobmark - offset;
+               if (len > m->m_len - moff)
                        len = m->m_len - moff;
                        len = m->m_len - moff;
-               splx(s);
-               error =
-                   uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);
-               s = splnet();
-               if (len == m->m_len) {
-                       eor = (int)m->m_act;
-                       if (flags & SOF_PREVIEW)
+               /*
+                * If mp is set, just pass back the mbufs.
+                * Otherwise copy them out via the uio, then free.
+                * Sockbuf must be consistent here (points to current mbuf,
+                * it points to next record) when we drop priority;
+                * we must note any additions to the sockbuf when we
+                * block interrupts again.
+                */
+               if (mp == 0) {
+                       splx(s);
+                       error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
+                       s = splnet();
+               } else
+                       uio->uio_resid -= len;
+               if (len == m->m_len - moff) {
+                       if (m->m_flags & M_EOR)
+                               flags |= MSG_EOR;
+                       if (flags & MSG_PEEK) {
                                m = m->m_next;
                                m = m->m_next;
-                       else {
+                               moff = 0;
+                       } else {
+                               nextrecord = m->m_nextpkt;
                                sbfree(&so->so_rcv, m);
                                sbfree(&so->so_rcv, m);
-                               MFREE(m, n);
-                               m = n;
-                               so->so_rcv.sb_mb = m;
+                               if (mp) {
+                                       *mp = m;
+                                       mp = &m->m_next;
+                                       so->so_rcv.sb_mb = m = m->m_next;
+                                       *mp = (struct mbuf *)0;
+                               } else {
+                                       MFREE(m, so->so_rcv.sb_mb);
+                                       m = so->so_rcv.sb_mb;
+                               }
+                               if (m)
+                                       m->m_nextpkt = nextrecord;
                        }
                        }
-                       moff = 0;
                } else {
                } else {
-                       if (flags & SOF_PREVIEW)
+                       if (flags & MSG_PEEK)
                                moff += len;
                        else {
                                moff += len;
                        else {
-                               m->m_off += len;
+                               if (mp)
+                                       *mp = m_copym(m, 0, len, M_WAIT);
+                               m->m_data += len;
                                m->m_len -= len;
                                so->so_rcv.sb_cc -= len;
                        }
                }
                                m->m_len -= len;
                                so->so_rcv.sb_cc -= len;
                        }
                }
-               if ((flags & SOF_PREVIEW) == 0 && so->so_oobmark) {
-                       so->so_oobmark -= len;
-                       if (so->so_oobmark == 0) {
-                               so->so_state |= SS_RCVATMARK;
-                               break;
+               if (so->so_oobmark) {
+                       if ((flags & MSG_PEEK) == 0) {
+                               so->so_oobmark -= len;
+                               if (so->so_oobmark == 0) {
+                                       so->so_state |= SS_RCVATMARK;
+                                       break;
+                               }
+                       } else {
+                               offset += len;
+                               if (offset == so->so_oobmark)
+                                       break;
                        }
                }
                        }
                }
-               if (tomark) {
-                       tomark -= len;
-                       if (tomark == 0)
+               if (flags & MSG_EOR)
+                       break;
+               /*
+                * If the MSG_WAITALL flag is set (for non-atomic socket),
+                * we must not quit until "uio->uio_resid == 0" or an error
+                * termination.  If a signal/timeout occurs, return
+                * with a short count but without error.
+                * Keep sockbuf locked against other readers.
+                */
+               while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&
+                   !sosendallatonce(so) && !nextrecord) {
+                       if (so->so_error || so->so_state & SS_CANTRCVMORE)
                                break;
                                break;
+                       error = sbwait(&so->so_rcv);
+                       if (error) {
+                               sbunlock(&so->so_rcv);
+                               splx(s);
+                               return (0);
+                       }
+                       if (m = so->so_rcv.sb_mb)
+                               nextrecord = m->m_nextpkt;
                }
                }
-       } while (m && error == 0 && !eor);
-       if (flags & SOF_PREVIEW)
-               goto release;
-       if ((so->so_proto->pr_flags & PR_ATOMIC) && eor == 0)
-               do {
-                       if (m == 0)
-                               panic("receive 4");
-                       sbfree(&so->so_rcv, m);
-                       eor = (int)m->m_act;
-                       so->so_rcv.sb_mb = m->m_next;
-                       MFREE(m, n);
-                       m = n;
-               } while (eor == 0);
-       if ((so->so_proto->pr_flags & PR_WANTRCVD) && so->so_pcb)
-               (*so->so_proto->pr_usrreq)(so, PRU_RCVD,
-                   (struct mbuf *)0, (struct mbuf *)0);
+       }
+
+       if (m && pr->pr_flags & PR_ATOMIC) {
+               flags |= MSG_TRUNC;
+               if ((flags & MSG_PEEK) == 0)
+                       (void) sbdroprecord(&so->so_rcv);
+       }
+       if ((flags & MSG_PEEK) == 0) {
+               if (m == 0)
+                       so->so_rcv.sb_mb = nextrecord;
+               if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
+                       (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
+                           (struct mbuf *)(long)flags, (struct mbuf *)0,
+                           (struct mbuf *)0);
+       }
+       if (orig_resid == uio->uio_resid && orig_resid &&
+           (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) {
+               sbunlock(&so->so_rcv);
+               splx(s);
+               goto restart;
+       }
+               
+       if (flagsp)
+               *flagsp |= flags;
 release:
        sbunlock(&so->so_rcv);
        splx(s);
        return (error);
 }
 
 release:
        sbunlock(&so->so_rcv);
        splx(s);
        return (error);
 }
 
+int
 soshutdown(so, how)
 soshutdown(so, how)
-       struct socket *so;
-       int how;
+       register struct socket *so;
+       register int how;
 {
 {
+       register struct protosw *pr = so->so_proto;
 
        how++;
 
        how++;
-       if (how & FREAD) {
-               int s = splimp();
-               socantrcvmore(so);
-               sbflush(&so->so_rcv);
-               splx(s);
-       }
+       if (how & FREAD)
+               sorflush(so);
        if (how & FWRITE)
        if (how & FWRITE)
-               return ((*so->so_proto->pr_usrreq)(so, PRU_SHUTDOWN,
-                   (struct mbuf *)0, (struct mbuf *)0));
+               return ((*pr->pr_usrreq)(so, PRU_SHUTDOWN,
+                   (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0));
        return (0);
 }
 
        return (0);
 }
 
-sosetopt(so, level, optname, m)
-       struct socket *so;
+void
+sorflush(so)
+       register struct socket *so;
+{
+       register struct sockbuf *sb = &so->so_rcv;
+       register struct protosw *pr = so->so_proto;
+       register int s;
+       struct sockbuf asb;
+
+       sb->sb_flags |= SB_NOINTR;
+       (void) sblock(sb, M_WAITOK);
+       s = splimp();
+       socantrcvmore(so);
+       sbunlock(sb);
+       asb = *sb;
+       bzero((caddr_t)sb, sizeof (*sb));
+       splx(s);
+       if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
+               (*pr->pr_domain->dom_dispose)(asb.sb_mb);
+       sbrelease(&asb);
+}
+
+int
+sosetopt(so, level, optname, m0)
+       register struct socket *so;
        int level, optname;
        int level, optname;
-       struct mbuf *m;
+       struct mbuf *m0;
 {
 {
+       int error = 0;
+       register struct mbuf *m = m0;
+
+       if (level != SOL_SOCKET) {
+               if (so->so_proto && so->so_proto->pr_ctloutput)
+                       return ((*so->so_proto->pr_ctloutput)
+                                 (PRCO_SETOPT, so, level, optname, &m0));
+               error = ENOPROTOOPT;
+       } else {
+               switch (optname) {
+
+               case SO_LINGER:
+                       if (m == NULL || m->m_len != sizeof (struct linger)) {
+                               error = EINVAL;
+                               goto bad;
+                       }
+                       so->so_linger = mtod(m, struct linger *)->l_linger;
+                       /* fall thru... */
+
+               case SO_DEBUG:
+               case SO_KEEPALIVE:
+               case SO_DONTROUTE:
+               case SO_USELOOPBACK:
+               case SO_BROADCAST:
+               case SO_REUSEADDR:
+               case SO_REUSEPORT:
+               case SO_OOBINLINE:
+                       if (m == NULL || m->m_len < sizeof (int)) {
+                               error = EINVAL;
+                               goto bad;
+                       }
+                       if (*mtod(m, int *))
+                               so->so_options |= optname;
+                       else
+                               so->so_options &= ~optname;
+                       break;
 
 
-       if (level != SOL_SOCKET)
-               return (EINVAL);        /* XXX */
-       switch (optname) {
+               case SO_SNDBUF:
+               case SO_RCVBUF:
+               case SO_SNDLOWAT:
+               case SO_RCVLOWAT:
+                       if (m == NULL || m->m_len < sizeof (int)) {
+                               error = EINVAL;
+                               goto bad;
+                       }
+                       switch (optname) {
 
 
-       case SO_DEBUG:
-               so->so_options |= SO_DEBUG;
-               break;
+                       case SO_SNDBUF:
+                       case SO_RCVBUF:
+                               if (sbreserve(optname == SO_SNDBUF ?
+                                   &so->so_snd : &so->so_rcv,
+                                   (u_long) *mtod(m, int *)) == 0) {
+                                       error = ENOBUFS;
+                                       goto bad;
+                               }
+                               break;
 
 
-       case SO_KEEPALIVE:
-               so->so_options |= SO_KEEPALIVE;
-               break;
+                       case SO_SNDLOWAT:
+                               so->so_snd.sb_lowat = *mtod(m, int *);
+                               break;
+                       case SO_RCVLOWAT:
+                               so->so_rcv.sb_lowat = *mtod(m, int *);
+                               break;
+                       }
+                       break;
 
 
-       case SO_LINGER:
-               if (m == NULL || m->m_len != sizeof (int))
-                       return (EINVAL);
-               so->so_options |= SO_LINGER;
-               so->so_linger = *mtod(m, int *);
-               break;
+               case SO_SNDTIMEO:
+               case SO_RCVTIMEO:
+                   {
+                       struct timeval *tv;
+                       short val;
 
 
-       case SO_DONTLINGER:
-               so->so_options &= ~SO_LINGER;
-               so->so_linger = 0;
-               break;
+                       if (m == NULL || m->m_len < sizeof (*tv)) {
+                               error = EINVAL;
+                               goto bad;
+                       }
+                       tv = mtod(m, struct timeval *);
+                       if (tv->tv_sec * hz + tv->tv_usec / tick > SHRT_MAX) {
+                               error = EDOM;
+                               goto bad;
+                       }
+                       val = tv->tv_sec * hz + tv->tv_usec / tick;
 
 
-       case SO_DONTROUTE:
-               so->so_options |= SO_DONTROUTE;
-               break;
+                       switch (optname) {
 
 
-       case SO_USELOOPBACK:
-               so->so_options |= SO_USELOOPBACK;
-               break;
+                       case SO_SNDTIMEO:
+                               so->so_snd.sb_timeo = val;
+                               break;
+                       case SO_RCVTIMEO:
+                               so->so_rcv.sb_timeo = val;
+                               break;
+                       }
+                       break;
+                   }
 
 
-       default:
-               return (EINVAL);
+               default:
+                       error = ENOPROTOOPT;
+                       break;
+               }
+               if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) {
+                       (void) ((*so->so_proto->pr_ctloutput)
+                                 (PRCO_SETOPT, so, level, optname, &m0));
+                       m = NULL;       /* freed by protocol */
+               }
        }
        }
-       return (0);
+bad:
+       if (m)
+               (void) m_free(m);
+       return (error);
 }
 
 }
 
-sogetopt(so, level, optname, m)
-       struct socket *so;
+int
+sogetopt(so, level, optname, mp)
+       register struct socket *so;
        int level, optname;
        int level, optname;
-       struct mbuf *m;
+       struct mbuf **mp;
 {
 {
+       register struct mbuf *m;
 
 
-       if (level != SOL_SOCKET)
-               return (EINVAL);        /* XXX */
-       switch (optname) {
-
-       case SO_USELOOPBACK:
-       case SO_DONTROUTE:
-       case SO_DEBUG:
-       case SO_KEEPALIVE:
-       case SO_LINGER:
-               if ((so->so_options & optname) == 0)
+       if (level != SOL_SOCKET) {
+               if (so->so_proto && so->so_proto->pr_ctloutput) {
+                       return ((*so->so_proto->pr_ctloutput)
+                                 (PRCO_GETOPT, so, level, optname, mp));
+               } else
                        return (ENOPROTOOPT);
                        return (ENOPROTOOPT);
-               if (optname == SO_LINGER && m != NULL) {
-                       *mtod(m, int *) = so->so_linger;
-                       m->m_len = sizeof (so->so_linger);
-               }
-               break;
+       } else {
+               m = m_get(M_WAIT, MT_SOOPTS);
+               m->m_len = sizeof (int);
 
 
-       default:
-               return (EINVAL);
-       }
-       return (0);
-}
+               switch (optname) {
 
 
-sohasoutofband(so)
-       struct socket *so;
-{
+               case SO_LINGER:
+                       m->m_len = sizeof (struct linger);
+                       mtod(m, struct linger *)->l_onoff =
+                               so->so_options & SO_LINGER;
+                       mtod(m, struct linger *)->l_linger = so->so_linger;
+                       break;
 
 
-       if (so->so_pgrp == 0)
-               return;
-       if (so->so_pgrp > 0)
-               gsignal(so->so_pgrp, SIGURG);
-       else {
-               struct proc *p = pfind(-so->so_pgrp);
+               case SO_USELOOPBACK:
+               case SO_DONTROUTE:
+               case SO_DEBUG:
+               case SO_KEEPALIVE:
+               case SO_REUSEADDR:
+               case SO_REUSEPORT:
+               case SO_BROADCAST:
+               case SO_OOBINLINE:
+                       *mtod(m, int *) = so->so_options & optname;
+                       break;
+
+               case SO_TYPE:
+                       *mtod(m, int *) = so->so_type;
+                       break;
+
+               case SO_ERROR:
+                       *mtod(m, int *) = so->so_error;
+                       so->so_error = 0;
+                       break;
+
+               case SO_SNDBUF:
+                       *mtod(m, int *) = so->so_snd.sb_hiwat;
+                       break;
+
+               case SO_RCVBUF:
+                       *mtod(m, int *) = so->so_rcv.sb_hiwat;
+                       break;
 
 
-               if (p)
-                       psignal(p, SIGURG);
+               case SO_SNDLOWAT:
+                       *mtod(m, int *) = so->so_snd.sb_lowat;
+                       break;
+
+               case SO_RCVLOWAT:
+                       *mtod(m, int *) = so->so_rcv.sb_lowat;
+                       break;
+
+               case SO_SNDTIMEO:
+               case SO_RCVTIMEO:
+                   {
+                       int val = (optname == SO_SNDTIMEO ?
+                            so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
+
+                       m->m_len = sizeof(struct timeval);
+                       mtod(m, struct timeval *)->tv_sec = val / hz;
+                       mtod(m, struct timeval *)->tv_usec =
+                           (val % hz) * tick;
+                       break;
+                   }
+
+               default:
+                       (void)m_free(m);
+                       return (ENOPROTOOPT);
+               }
+               *mp = m;
+               return (0);
        }
 }
 
        }
 }
 
-/*ARGSUSED*/
-soioctl(so, cmd, data)
+void
+sohasoutofband(so)
        register struct socket *so;
        register struct socket *so;
-       int cmd;
-       register char *data;
 {
 {
+       struct proc *p;
 
 
-       switch (cmd) {
-
-       case FIONBIO:
-               if (*(int *)data)
-                       so->so_state |= SS_NBIO;
-               else
-                       so->so_state &= ~SS_NBIO;
-               break;
-
-       case FIOASYNC:
-               if (*(int *)data)
-                       so->so_state |= SS_ASYNC;
-               else
-                       so->so_state &= ~SS_ASYNC;
-               break;
-
-       case SIOCSPGRP:
-               so->so_pgrp = *(int *)data;
-               break;
-
-       case SIOCGPGRP:
-               *(int *)data = so->so_pgrp;
-               break;
-
-       case SIOCATMARK:
-               *(int *)data = (so->so_state&SS_RCVATMARK) != 0;
-               break;
-
-       /* routing table update calls */
-       case SIOCADDRT:
-       case SIOCDELRT:
-               if (!suser())
-                       return (u.u_error);
-               return (rtrequest(cmd, (struct rtentry *)data));
-
-       /* type/protocol specific ioctls */
-       default:
-               return (ENOTTY);                /* XXX */
-       }
-       return (0);
+       if (so->so_pgid < 0)
+               gsignal(-so->so_pgid, SIGURG);
+       else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
+               psignal(p, SIGURG);
+       selwakeup(&so->so_rcv.sb_sel);
 }
 }