date and time created 88/12/14 15:30:11 by sklower

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

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 9fdf3c3..0ad4bc8 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,25 +1,33 @@
-/*     uipc_socket.c   6.13    85/06/03        */
+/*
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * 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_socket.c       7.12 (Berkeley) %G%
+ */

 
 #include "param.h"
 
 #include "param.h"

-#include "systm.h"

 #include "dir.h"
 #include "user.h"
 #include "proc.h"
 #include "file.h"
 #include "dir.h"
 #include "user.h"
 #include "proc.h"
 #include "file.h"

-#include "inode.h"
-#include "buf.h"
+#include "malloc.h"

 #include "mbuf.h"
 #include "mbuf.h"

-#include "un.h"

 #include "domain.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"
 #include "domain.h"
 #include "protosw.h"
 #include "socket.h"
 #include "socketvar.h"

-#include "stat.h"
-#include "ioctl.h"
-#include "uio.h"
-#include "../net/route.h"
-#include "../netinet/in.h"
-#include "../net/if.h"

 
 /*
  * Socket operation routines.
 
 /*
  * Socket operation routines.


@@ -106,7 +114,7 @@ solisten(so, backlog)
        }
        if (backlog < 0)
                backlog = 0;
        }
        if (backlog < 0)
                backlog = 0;

-       so->so_qlimit = MIN(backlog, SOMAXCONN);
+       so->so_qlimit = min(backlog, SOMAXCONN);

        splx(s);
        return (0);
 }
        splx(s);
        return (0);
 }


@@ -115,13 +123,13 @@ sofree(so)
        register 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);
        sorflush(so);
        (void) m_free(dtom(so));
        sbrelease(&so->so_snd);
        sorflush(so);
        (void) m_free(dtom(so));


@@ -136,7 +144,7 @@ soclose(so)
        register struct socket *so;
 {
        int s = splnet();               /* conservative */
        register struct socket *so;
 {
        int s = splnet();               /* conservative */

-       int error;
+       int error = 0;

 
        if (so->so_options & SO_ACCEPTCONN) {
                while (so->so_q0 != so)
 
        if (so->so_options & SO_ACCEPTCONN) {
                while (so->so_q0 != so)


@@ -148,7 +156,7 @@ soclose(so)
                goto discard;
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {
                goto discard;
        if (so->so_state & SS_ISCONNECTED) {
                if ((so->so_state & SS_ISDISCONNECTING) == 0) {

-                       error = sodisconnect(so, (struct mbuf *)0);
+                       error = sodisconnect(so);

                        if (error)
                                goto drop;
                }
                        if (error)
                                goto drop;
                }


@@ -209,16 +217,25 @@ soconnect(so, nam)
        register struct socket *so;
        struct mbuf *nam;
 {
        register struct socket *so;
        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, (struct mbuf *)0);
-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);
 }


@@ -236,9 +253,8 @@ soconnect2(so1, so2)
        return (error);
 }
 
        return (error);
 }
 

-sodisconnect(so, nam)
+sodisconnect(so)

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

-       struct mbuf *nam;

 {
        int s = splnet();
        int error;
 {
        int s = splnet();
        int error;


@@ -252,7 +268,7 @@ 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, (struct mbuf *)0);

 bad:
        splx(s);
        return (error);
 bad:
        splx(s);
        return (error);


@@ -267,24 +283,27 @@ bad:
  * inform user that this would block and do nothing.
  * Otherwise, if nonblocking, send as much as possible.
  */
  * inform user that this would block and do nothing.
  * Otherwise, if nonblocking, send as much as possible.
  */

-sosend(so, nam, uio, flags, rights)
+sosend(so, nam, uio, flags, rights, control)

        register struct socket *so;
        struct mbuf *nam;
        register struct uio *uio;
        int flags;
        register struct socket *so;
        struct mbuf *nam;
        register struct uio *uio;
        int flags;

-       struct mbuf *rights;
+       struct mbuf *rights, *control;

 {
 {

-       struct mbuf *top = 0;
-       register struct mbuf *m, **mp;
-       register int space;
-       int len, error = 0, s, dontroute, first = 1;
+       struct mbuf *top = 0, **mp;
+       register struct mbuf *m;
+       register int space, len;
+       int rlen = 0, error = 0, s, dontroute, first = 1, mlen;
+       int atomic = sosendallatonce(so);

 
 

-       if (sosendallatonce(so) && uio->uio_resid > so->so_snd.sb_hiwat)
+       if (atomic && uio->uio_resid > so->so_snd.sb_hiwat)

                return (EMSGSIZE);
        dontroute =
            (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
            (so->so_proto->pr_flags & PR_ATOMIC);
        u.u_ru.ru_msgsnd++;
                return (EMSGSIZE);
        dontroute =
            (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
            (so->so_proto->pr_flags & PR_ATOMIC);
        u.u_ru.ru_msgsnd++;

+       if (rights)
+               rlen = rights->m_len;

 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
 restart:
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
 restart:


@@ -309,10 +328,10 @@ restart:
                        space = 1024;
                else {
                        space = sbspace(&so->so_snd);
                        space = 1024;
                else {
                        space = sbspace(&so->so_snd);

-                       if (space <= 0 ||
-                          (sosendallatonce(so) && space < uio->uio_resid) ||
-                          (uio->uio_resid >= CLBYTES && space < CLBYTES &&
-                          so->so_snd.sb_cc >= CLBYTES &&
+                       if (space <= rlen ||
+                          (atomic && space < uio->uio_resid + rlen) ||
+                          (uio->uio_resid >= MCLBYTES && space < MCLBYTES &&
+                          so->so_snd.sb_cc >= MCLBYTES &&

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


@@ -328,52 +347,73 @@ restart:
                }
                splx(s);
                mp = &top;
                }
                splx(s);
                mp = &top;

-               while (space > 0) {
-                       register struct iovec *iov = uio->uio_iov;
-
-                       MGET(m, M_WAIT, MT_DATA);
-                       if (iov->iov_len >= NBPG && space >= CLBYTES) {
-                               register struct mbuf *p;
-                               MCLGET(p, 1);
-                               if (p == 0)
+               space -= rlen;
+               do {
+                  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 (uio->uio_resid >= MINCLSIZE && space >= MCLBYTES) {
+                               MCLGET(m, M_WAIT);
+                               if ((m->m_flags & M_EXT) == 0)

                                        goto nopages;
                                        goto nopages;

-                               m->m_off = (int)p - (int)m;
-                               len = min(CLBYTES, iov->iov_len);
-                               space -= CLBYTES;
+                               mlen = MCLBYTES;
+#ifdef MAPPED_MBUFS
+                               len = min(MCLBYTES, uio->uio_resid);
+                               if (len < mlen - max_hdr)
+                                       m->m_data += max_hdr;
+#else
+                               len = min(MCLBYTES - max_hdr, uio->uio_resid);
+                               m->m_data += max_hdr;
+#endif
+                               space -= MCLBYTES;

                        } else {
 nopages:
                        } else {
 nopages:

-                               len = MIN(MLEN, iov->iov_len);
+                               len = min(min(mlen, uio->uio_resid), space);

                                space -= len;
                                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), len, UIO_WRITE, uio);
                        m->m_len = len;
                        *mp = m;
                        }
                        error = uiomove(mtod(m, caddr_t), len, UIO_WRITE, uio);
                        m->m_len = len;
                        *mp = m;

+                       top->m_pkthdr.len += len;

                        if (error)
                                goto release;
                        mp = &m->m_next;
                        if (error)
                                goto release;
                        mp = &m->m_next;

-                       if (uio->uio_resid <= 0)
+                       if (uio->uio_resid <= 0) {
+                               if ((flags & MSG_EOR) && top)
+                                       top->m_flags |= M_EOR;

                                break;
                                break;

-                       while (uio->uio_iov->iov_len == 0) {
-                               uio->uio_iov++;
-                               uio->uio_iovcnt--;
-                               if (uio->uio_iovcnt <= 0)
-                                       panic("sosend");

                        }
                        }

-               }
-               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, (caddr_t)nam, rights);
-               splx(s);
-               if (dontroute)
-                       so->so_options &= ~SO_DONTROUTE;
-               rights = 0;
-               top = 0;
-               first = 0;
-               if (error)
-                       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, (caddr_t)nam, rights, control);
+                   splx(s);
+                   if (dontroute)
+                           so->so_options &= ~SO_DONTROUTE;
+                   rights = 0;
+                   rlen = 0;
+                   top = 0;
+                   mp = &top;
+                   first = 0;
+                   if (error)
+                       goto release;
+               } while (uio->uio_resid && space > 0);

        } while (uio->uio_resid);
 
 release:
        } while (uio->uio_resid);
 
 release:


@@ -385,15 +425,27 @@ release:
        return (error);
 }
 
        return (error);
 }
 

-soreceive(so, aname, uio, flags, rightsp)
+/*
+ * 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 containing access rights if supported
+ * by the protocol, 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.
+ */
+soreceive(so, aname, uio, flagsp, rightsp, controlp)

        register struct socket *so;
        struct mbuf **aname;
        register struct uio *uio;
        register struct socket *so;
        struct mbuf **aname;
        register struct uio *uio;

-       int flags;
-       struct mbuf **rightsp;
+       int *flagsp;
+       struct mbuf **rightsp, **controlp;

 {
 {

-       register struct mbuf *m, *n;
-       register int len, error = 0, s, tomark;
+       register struct mbuf *m;
+       register int flags, len, error = 0, s, offset;

        struct protosw *pr = so->so_proto;
        struct mbuf *nextrecord;
        int moff;
        struct protosw *pr = so->so_proto;
        struct mbuf *nextrecord;
        int moff;


@@ -402,10 +454,16 @@ soreceive(so, aname, uio, flags, rightsp)
                *rightsp = 0;
        if (aname)
                *aname = 0;
                *rightsp = 0;
        if (aname)
                *aname = 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);
                error = (*pr->pr_usrreq)(so, PRU_RCVOOB,
        if (flags & MSG_OOB) {
                m = m_get(M_WAIT, MT_DATA);
                error = (*pr->pr_usrreq)(so, PRU_RCVOOB,

-                   m, (struct mbuf *)0, (struct mbuf *)0);
+                   m, (struct mbuf *)(flags & MSG_PEEK), (struct mbuf *)0);

                if (error)
                        goto bad;
                do {
                if (error)
                        goto bad;
                do {


@@ -421,28 +479,33 @@ bad:
                        m_freem(m);
                return (error);
        }
                        m_freem(m);
                return (error);
        }

+       if (so->so_state & SS_ISCONFIRMING)
+               (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
+                   (struct mbuf *)0, (struct mbuf *)0);

 
 restart:
        sblock(&so->so_rcv);
        s = splnet();
 
 
 restart:
        sblock(&so->so_rcv);
        s = splnet();
 

-#define        rcverr(errno)   { error = errno; splx(s); goto release; }

        if (so->so_rcv.sb_cc == 0) {
                if (so->so_error) {
                        error = so->so_error;
                        so->so_error = 0;
        if (so->so_rcv.sb_cc == 0) {
                if (so->so_error) {
                        error = so->so_error;
                        so->so_error = 0;

-                       splx(s);

                        goto release;
                }
                        goto release;
                }

-               if (so->so_state & SS_CANTRCVMORE) {
-                       splx(s);
+               if (so->so_state & SS_CANTRCVMORE)

                        goto release;
                        goto release;

-               }

                if ((so->so_state & SS_ISCONNECTED) == 0 &&
                if ((so->so_state & SS_ISCONNECTED) == 0 &&

-                   (so->so_proto->pr_flags & PR_CONNREQUIRED))
-                       rcverr(ENOTCONN);
-               if (so->so_state & SS_NBIO)
-                       rcverr(EWOULDBLOCK);
+                   (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
+                       error = ENOTCONN;
+                       goto release;
+               }
+               if (uio->uio_resid == 0)
+                       goto release;
+               if (so->so_state & SS_NBIO) {
+                       error = EWOULDBLOCK;
+                       goto release;
+               }

                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);
                splx(s);
                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);
                splx(s);


@@ -450,51 +513,84 @@ restart:
        }
        u.u_ru.ru_msgrcv++;
        m = so->so_rcv.sb_mb;
        }
        u.u_ru.ru_msgrcv++;
        m = so->so_rcv.sb_mb;

+       if (m == 0)
+               panic("receive 1");
+if (m->m_type == 0)
+panic("receive 3a");
+       nextrecord = m->m_nextpkt;

        if (pr->pr_flags & PR_ADDR) {
        if (pr->pr_flags & PR_ADDR) {

-               if (m == 0 || m->m_type != MT_SONAME)
+               if (m->m_type != MT_SONAME)

                        panic("receive 1a");
                if (flags & MSG_PEEK) {
                        if (aname)
                                *aname = m_copy(m, 0, m->m_len);
                        panic("receive 1a");
                if (flags & MSG_PEEK) {
                        if (aname)
                                *aname = m_copy(m, 0, m->m_len);

-                       else
-                               m = m->m_act;
+                       m = m->m_next;

                } else {
                } else {

+                       sbfree(&so->so_rcv, m);

                        if (aname) {
                                *aname = m;
                        if (aname) {
                                *aname = m;

-                               sbfree(&so->so_rcv, m);
-if(m->m_next) panic("receive 1b");
-                               so->so_rcv.sb_mb = m = m->m_act;
-                       } else
-                               m = sbdroprecord(&so->so_rcv);
+                               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 (m && m->m_type == MT_RIGHTS) {
                if ((pr->pr_flags & PR_RIGHTS) == 0)
                }
        }
        if (m && m->m_type == MT_RIGHTS) {
                if ((pr->pr_flags & PR_RIGHTS) == 0)

-                       panic("receive 2a");
+                       panic("receive 2");

                if (flags & MSG_PEEK) {
                        if (rightsp)
                                *rightsp = m_copy(m, 0, m->m_len);
                if (flags & MSG_PEEK) {
                        if (rightsp)
                                *rightsp = m_copy(m, 0, m->m_len);

-                       else
-                               m = m->m_act;
+                       m = m->m_next;

                } else {
                } else {

+                       sbfree(&so->so_rcv, m);

                        if (rightsp) {
                                *rightsp = m;
                        if (rightsp) {
                                *rightsp = m;

-                               sbfree(&so->so_rcv, m);
-if(m->m_next) panic("receive 2b");
-                               so->so_rcv.sb_mb = m = m->m_act;
-                       } else
-                               m = sbdroprecord(&so->so_rcv);
+                               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 (m && m->m_type == MT_CONTROL) {
+               if (flags & MSG_PEEK) {
+                       if (controlp)
+                               *controlp = m_copy(m, 0, m->m_len);
+                       m = m->m_next;
+               } else {
+                       sbfree(&so->so_rcv, m);
+                       if (controlp) {
+                               *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 (m == 0 || (m->m_type != MT_DATA && m->m_type != MT_HEADER))
-               panic("receive 3");
+       if (m)
+               m->m_nextpkt = nextrecord;

        moff = 0;
        moff = 0;

-       tomark = so->so_oobmark;
+       offset = 0;

        while (m && uio->uio_resid > 0 && error == 0) {
        while (m && uio->uio_resid > 0 && error == 0) {

+               if (m->m_type == MT_OOBDATA)
+                       flags |= MSG_OOB;
+               else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
+                       panic("receive 3");
+               if (m->m_flags & M_EOR)
+                       flags |= MSG_EOR;

                len = uio->uio_resid;
                so->so_state &= ~SS_RCVATMARK;
                len = uio->uio_resid;
                so->so_state &= ~SS_RCVATMARK;

-               if (tomark && len > tomark)
-                       len = tomark;
+               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;
                splx(s);
                if (len > m->m_len - moff)
                        len = m->m_len - moff;
                splx(s);


@@ -502,51 +598,60 @@ if(m->m_next) panic("receive 2b");
                    uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);
                s = splnet();
                if (len == m->m_len - moff) {
                    uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);
                s = splnet();
                if (len == m->m_len - moff) {

-                       if ((flags & MSG_PEEK) == 0) {
-                               nextrecord = m->m_act;
-                               sbfree(&so->so_rcv, m);
-                               MFREE(m, n);
-                               if (m = n)
-                                       m->m_act = nextrecord;
-                               so->so_rcv.sb_mb = m;
-                       } else
+                       if (flags & MSG_PEEK) {

                                m = m->m_next;
                                m = m->m_next;

-                       moff = 0;
+                               moff = 0;
+                       } else {
+                               nextrecord = m->m_nextpkt;
+                               sbfree(&so->so_rcv, m);
+                               MFREE(m, so->so_rcv.sb_mb);
+                               m = so->so_rcv.sb_mb;
+                               if (m)
+                                       m->m_nextpkt = nextrecord;
+                       }

                } else {
                        if (flags & MSG_PEEK)
                                moff += len;
                        else {
                } else {
                        if (flags & MSG_PEEK)
                                moff += len;
                        else {

-                               m->m_off += len;
+                               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 & MSG_PEEK) == 0 && so->so_oobmark) {
-                       so->so_oobmark -= len;
-                       if (so->so_oobmark == 0) {
-                               so->so_state |= SS_RCVATMARK;
-                               break;
-                       }
-               }
-               if (tomark) {
-                       tomark -= len;
-                       if (tomark == 0)
-                               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 (m && (flags & MSG_EOR)) {
+               flags &= ~MSG_EOR;
+               if ((flags & MSG_PEEK) == 0)
+                       m->m_flags |= M_EOR;
+       }

        if ((flags & MSG_PEEK) == 0) {
                if (m == 0)
                        so->so_rcv.sb_mb = nextrecord;
        if ((flags & MSG_PEEK) == 0) {
                if (m == 0)
                        so->so_rcv.sb_mb = nextrecord;

-               else if (pr->pr_flags & PR_ATOMIC)
+               else if (pr->pr_flags & PR_ATOMIC) {
+                       flags |= MSG_TRUNC;

                        (void) sbdroprecord(&so->so_rcv);
                        (void) sbdroprecord(&so->so_rcv);

+               }

                if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
                        (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
                            (struct mbuf *)0, (struct mbuf *)0);
                if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
                        (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
                            (struct mbuf *)0, (struct mbuf *)0);

+               if (error == 0 && rightsp && *rightsp &&
+                   pr->pr_domain->dom_externalize)
+                       error = (*pr->pr_domain->dom_externalize)(*rightsp);

        }
        }

+       if (flagsp)
+               *flagsp |= flags;

 release:
        sbunlock(&so->so_rcv);
 release:
        sbunlock(&so->so_rcv);

-       if (error == 0 && rightsp && *rightsp && pr->pr_domain->dom_externalize)
-               error = (*pr->pr_domain->dom_externalize)(*rightsp);

        splx(s);
        return (error);
 }
        splx(s);
        return (error);
 }


@@ -616,6 +721,7 @@ sosetopt(so, level, optname, m0)
                case SO_USELOOPBACK:
                case SO_BROADCAST:
                case SO_REUSEADDR:
                case SO_USELOOPBACK:
                case SO_BROADCAST:
                case SO_REUSEADDR:

+               case SO_OOBINLINE:

                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;
                                goto bad;
                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;
                                goto bad;


@@ -640,8 +746,9 @@ sosetopt(so, level, optname, m0)
 
                        case SO_SNDBUF:
                        case SO_RCVBUF:
 
                        case SO_SNDBUF:
                        case SO_RCVBUF:

-                               if (sbreserve(optname == SO_SNDBUF ? &so->so_snd :
-                                   &so->so_rcv, *mtod(m, int *)) == 0) {
+                               if (sbreserve(optname == SO_SNDBUF ?
+                                   &so->so_snd : &so->so_rcv,
+                                   (u_long) *mtod(m, int *)) == 0) {

                                        error = ENOBUFS;
                                        goto bad;
                                }
                                        error = ENOBUFS;
                                        goto bad;
                                }


@@ -688,6 +795,8 @@ sogetopt(so, level, optname, mp)
                        return (ENOPROTOOPT);
        } else {
                m = m_get(M_WAIT, MT_SOOPTS);
                        return (ENOPROTOOPT);
        } else {
                m = m_get(M_WAIT, MT_SOOPTS);

+               m->m_len = sizeof (int);
+

                switch (optname) {
 
                case SO_LINGER:
                switch (optname) {
 
                case SO_LINGER:


@@ -703,10 +812,19 @@ sogetopt(so, level, optname, mp)
                case SO_KEEPALIVE:
                case SO_REUSEADDR:
                case SO_BROADCAST:
                case SO_KEEPALIVE:
                case SO_REUSEADDR:
                case SO_BROADCAST:

-                       m->m_len = sizeof (int);
+               case SO_OOBINLINE:

                        *mtod(m, int *) = so->so_options & optname;
                        break;
 
                        *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_SNDBUF:
                        *mtod(m, int *) = so->so_snd.sb_hiwat;
                        break;


@@ -732,7 +850,7 @@ sogetopt(so, level, optname, mp)
                        break;
 
                default:
                        break;
 
                default:

-                       m_free(m);
+                       (void)m_free(m);

                        return (ENOPROTOOPT);
                }
                *mp = m;
                        return (ENOPROTOOPT);
                }
                *mp = m;


@@ -743,15 +861,15 @@ sogetopt(so, level, optname, mp)
 sohasoutofband(so)
        register struct socket *so;
 {
 sohasoutofband(so)
        register struct socket *so;
 {

-
-       if (so->so_pgrp == 0)
-               return;
-       if (so->so_pgrp > 0)
-               gsignal(so->so_pgrp, SIGURG);
-       else {
-               struct proc *p = pfind(-so->so_pgrp);
-
-               if (p)
-                       psignal(p, SIGURG);
+       struct proc *p;
+
+       if (so->so_pgrp < 0)
+               gsignal(-so->so_pgrp, SIGURG);
+       else if (so->so_pgrp > 0 && (p = pfind(so->so_pgrp)) != 0)
+               psignal(p, SIGURG);
+       if (so->so_rcv.sb_sel) {
+               selwakeup(so->so_rcv.sb_sel, so->so_rcv.sb_flags & SB_COLL);
+               so->so_rcv.sb_sel = 0;
+               so->so_rcv.sb_flags &= ~SB_COLL;

        }
 }
        }
 }