BSD 4_4_Lite2 release

[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 7919e5c..a9c5453 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -2,9 +2,35 @@
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)uipc_socket.c       8.3 (Berkeley) %G%
+ * 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/param.h>


@@ -28,6 +54,7 @@
  * switching out to the protocol specific routines.
  */
 /*ARGSUSED*/
  * switching out to the protocol specific routines.
  */
 /*ARGSUSED*/

+int

 socreate(dom, aso, type, proto)
        int dom;
        struct socket **aso;
 socreate(dom, aso, type, proto)
        int dom;
        struct socket **aso;


@@ -53,9 +80,8 @@ socreate(dom, aso, type, proto)
        if (p->p_ucred->cr_uid == 0)
                so->so_state = SS_PRIV;
        so->so_proto = prp;
        if (p->p_ucred->cr_uid == 0)
                so->so_state = SS_PRIV;
        so->so_proto = prp;

-       error =
-           (*prp->pr_usrreq)(so, PRU_ATTACH,
-               (struct mbuf *)0, (struct mbuf *)proto, (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);


@@ -65,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;


@@ -79,6 +106,7 @@ sobind(so, nam)
        return (error);
 }
 
        return (error);
 }
 

+int

 solisten(so, backlog)
        register struct socket *so;
        int backlog;
 solisten(so, backlog)
        register struct socket *so;
        int backlog;


@@ -101,6 +129,7 @@ solisten(so, backlog)
        return (0);
 }
 
        return (0);
 }
 

+int

 sofree(so)
        register struct socket *so;
 {
 sofree(so)
        register struct socket *so;
 {


@@ -122,6 +151,7 @@ sofree(so)
  * Initiate disconnect if connected.
  * Free socket when disconnect complete.
  */
  * Initiate disconnect if connected.
  * Free socket when disconnect complete.
  */

+int

 soclose(so)
        register struct socket *so;
 {
 soclose(so)
        register struct socket *so;
 {


@@ -148,7 +178,7 @@ soclose(so)
                                goto drop;
                        while (so->so_state & SS_ISCONNECTED)
                                if (error = tsleep((caddr_t)&so->so_timeo,
                                goto drop;
                        while (so->so_state & SS_ISCONNECTED)
                                if (error = tsleep((caddr_t)&so->so_timeo,

-                                   PSOCK | PCATCH, netcls, so->so_linger))
+                                   PSOCK | PCATCH, netcls, so->so_linger * hz))

                                        break;
                }
        }
                                        break;
                }
        }


@@ -172,6 +202,7 @@ discard:
 /*
  * Must be called at splnet...
  */
 /*
  * Must be called at splnet...
  */

+int

 soabort(so)
        struct socket *so;
 {
 soabort(so)
        struct socket *so;
 {


@@ -181,6 +212,7 @@ soabort(so)
                (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0));
 }
 
                (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0));
 }
 

+int

 soaccept(so, nam)
        register struct socket *so;
        struct mbuf *nam;
 soaccept(so, nam)
        register struct socket *so;
        struct mbuf *nam;


@@ -197,6 +229,7 @@ soaccept(so, nam)
        return (error);
 }
 
        return (error);
 }
 

+int

 soconnect(so, nam)
        register struct socket *so;
        struct mbuf *nam;
 soconnect(so, nam)
        register struct socket *so;
        struct mbuf *nam;


@@ -224,6 +257,7 @@ soconnect(so, nam)
        return (error);
 }
 
        return (error);
 }
 

+int

 soconnect2(so1, so2)
        register struct socket *so1;
        struct socket *so2;
 soconnect2(so1, so2)
        register struct socket *so1;
        struct socket *so2;


@@ -237,6 +271,7 @@ soconnect2(so1, so2)
        return (error);
 }
 
        return (error);
 }
 

+int

 sodisconnect(so)
        register struct socket *so;
 {
 sodisconnect(so)
        register struct socket *so;
 {


@@ -276,6 +311,7 @@ bad:
  * must check for short counts if EINTR/ERESTART are returned.
  * Data and control buffers are freed on return.
  */
  * must check for short counts if EINTR/ERESTART are returned.
  * Data and control buffers are freed on return.
  */

+int

 sosend(so, addr, uio, top, control, flags)
        register struct socket *so;
        struct mbuf *addr;
 sosend(so, addr, uio, top, control, flags)
        register struct socket *so;
        struct mbuf *addr;


@@ -451,6 +487,7 @@ out:
  * an mbuf **mp0 for use in returning the chain.  The uio is then used
  * only for the count in uio_resid.
  */
  * 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;
        struct mbuf **paddr;
 soreceive(so, paddr, uio, mp0, controlp, flagsp)
        register struct socket *so;
        struct mbuf **paddr;


@@ -477,8 +514,8 @@ soreceive(so, paddr, uio, mp0, controlp, flagsp)
                flags = 0;
        if (flags & MSG_OOB) {
                m = m_get(M_WAIT, MT_DATA);
                flags = 0;
        if (flags & MSG_OOB) {
                m = m_get(M_WAIT, MT_DATA);

-               error = (*pr->pr_usrreq)(so, PRU_RCVOOB,
-                   m, (struct mbuf *)(flags & MSG_PEEK), (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 {


@@ -508,8 +545,8 @@ restart:
         * (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
         * (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).
-        *   3. MSG_DONTWAIT is not set
+        *      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 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.


@@ -517,10 +554,8 @@ restart:
        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 ||
        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)))
-               if (m && (m->m_nextpkt || (m->m_flags & M_EOR) ||
-                         m->m_type == MT_OOBDATA || m->m_type == MT_CONTROL))
-                       break;
+           ((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");
 #ifdef DIAGNOSTIC
                if (m == 0 && so->so_rcv.sb_cc)
                        panic("receive 1");


@@ -539,6 +574,11 @@ restart:
                        else
                                goto release;
                }
                        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;
                if ((so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) == 0 &&
                    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
                        error = ENOTCONN;


@@ -557,10 +597,10 @@ restart:
                        return (error);
                goto restart;
        }
                        return (error);
                goto restart;
        }

+dontblock:

        if (uio->uio_procp)
                uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
        nextrecord = m->m_nextpkt;
        if (uio->uio_procp)
                uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
        nextrecord = m->m_nextpkt;

-       record_eor = m->m_flags & M_EOR;

        if (pr->pr_flags & PR_ADDR) {
 #ifdef DIAGNOSTIC
                if (m->m_type != MT_SONAME)
        if (pr->pr_flags & PR_ADDR) {
 #ifdef DIAGNOSTIC
                if (m->m_type != MT_SONAME)


@@ -650,6 +690,8 @@ restart:
                } else
                        uio->uio_resid -= len;
                if (len == m->m_len - moff) {
                } 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;
                                moff = 0;
                        if (flags & MSG_PEEK) {
                                m = m->m_next;
                                moff = 0;


@@ -692,10 +734,8 @@ restart:
                                        break;
                        }
                }
                                        break;
                        }
                }

-               if (m == 0 && record_eor) {
-                       flags |= record_eor;
+               if (flags & MSG_EOR)

                        break;
                        break;

-               }

                /*
                 * If the MSG_WAITALL flag is set (for non-atomic socket),
                 * we must not quit until "uio->uio_resid == 0" or an error
                /*
                 * If the MSG_WAITALL flag is set (for non-atomic socket),
                 * we must not quit until "uio->uio_resid == 0" or an error


@@ -704,7 +744,7 @@ restart:
                 * Keep sockbuf locked against other readers.
                 */
                while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&
                 * Keep sockbuf locked against other readers.
                 */
                while (flags & MSG_WAITALL && m == 0 && uio->uio_resid > 0 &&

-                  !(flags & MSG_OOB) && !sosendallatonce(so)) {
+                   !sosendallatonce(so) && !nextrecord) {

                        if (so->so_error || so->so_state & SS_CANTRCVMORE)
                                break;
                        error = sbwait(&so->so_rcv);
                        if (so->so_error || so->so_state & SS_CANTRCVMORE)
                                break;
                        error = sbwait(&so->so_rcv);


@@ -713,10 +753,8 @@ restart:
                                splx(s);
                                return (0);
                        }
                                splx(s);
                                return (0);
                        }

-                       if (m = so->so_rcv.sb_mb) {
+                       if (m = so->so_rcv.sb_mb)

                                nextrecord = m->m_nextpkt;
                                nextrecord = m->m_nextpkt;

-                               record_eor |= m->m_flags & M_EOR;
-                       }

                }
        }
 
                }
        }
 


@@ -730,7 +768,7 @@ restart:
                        so->so_rcv.sb_mb = nextrecord;
                if (pr->pr_flags & PR_WANTRCVD && so->so_pcb)
                        (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)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 *)flags, (struct mbuf *)0,
+                           (struct mbuf *)(long)flags, (struct mbuf *)0,

                            (struct mbuf *)0);
        }
        if (orig_resid == uio->uio_resid && orig_resid &&
                            (struct mbuf *)0);
        }
        if (orig_resid == uio->uio_resid && orig_resid &&


@@ -748,6 +786,7 @@ release:
        return (error);
 }
 
        return (error);
 }
 

+int

 soshutdown(so, how)
        register struct socket *so;
        register int how;
 soshutdown(so, how)
        register struct socket *so;
        register int how;


@@ -763,6 +802,7 @@ soshutdown(so, how)
        return (0);
 }
 
        return (0);
 }
 

+void

 sorflush(so)
        register struct socket *so;
 {
 sorflush(so)
        register struct socket *so;
 {


@@ -784,6 +824,7 @@ sorflush(so)
        sbrelease(&asb);
 }
 
        sbrelease(&asb);
 }
 

+int

 sosetopt(so, level, optname, m0)
        register struct socket *so;
        int level, optname;
 sosetopt(so, level, optname, m0)
        register struct socket *so;
        int level, optname;


@@ -866,7 +907,7 @@ sosetopt(so, level, optname, m0)
                                goto bad;
                        }
                        tv = mtod(m, struct timeval *);
                                goto bad;
                        }
                        tv = mtod(m, struct timeval *);

-                       if (tv->tv_sec > SHRT_MAX / hz - hz) {
+                       if (tv->tv_sec * hz + tv->tv_usec / tick > SHRT_MAX) {

                                error = EDOM;
                                goto bad;
                        }
                                error = EDOM;
                                goto bad;
                        }


@@ -900,6 +941,7 @@ bad:
        return (error);
 }
 
        return (error);
 }
 

+int

 sogetopt(so, level, optname, mp)
        register struct socket *so;
        int level, optname;
 sogetopt(so, level, optname, mp)
        register struct socket *so;
        int level, optname;


@@ -971,7 +1013,7 @@ sogetopt(so, level, optname, mp)
                        m->m_len = sizeof(struct timeval);
                        mtod(m, struct timeval *)->tv_sec = val / hz;
                        mtod(m, struct timeval *)->tv_usec =
                        m->m_len = sizeof(struct timeval);
                        mtod(m, struct timeval *)->tv_sec = val / hz;
                        mtod(m, struct timeval *)->tv_usec =

-                           (val % hz) / tick;
+                           (val % hz) * tick;

                        break;
                    }
 
                        break;
                    }
 


@@ -984,6 +1026,7 @@ sogetopt(so, level, optname, mp)
        }
 }
 
        }
 }
 

+void

 sohasoutofband(so)
        register struct socket *so;
 {
 sohasoutofband(so)
        register struct socket *so;
 {