pass rw flags to d_stop indicating which queues were flushed

[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 a21ce63..28af1c3 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*     uipc_socket.c   4.13    81/11/22        */
+/*     uipc_socket.c   4.25    82/01/17        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -13,8 +13,9 @@
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/stat.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/stat.h"

-#include "../net/inet.h"
-#include "../net/inet_systm.h"
+#include "../h/ioctl.h"
+#include "../net/in.h"
+#include "../net/in_systm.h"

 
 /*
  * Socket support routines.
 
 /*
  * Socket support routines.


@@ -117,14 +118,17 @@ COUNT(SOCLOSE);
                                return;
                        }
                }
                                return;
                        }
                }

-               if ((so->so_state & SS_ISDISCONNECTING) &&
-                   (so->so_options & SO_NBIO)) {
-                       u.u_error = EINPROGRESS;
-                       splx(s);
-                       return;
+               if ((so->so_options & SO_DONTLINGER) == 0) {
+                       if ((so->so_state & SS_ISDISCONNECTING) &&
+                           (so->so_options & SO_NONBLOCKING)) {
+                               u.u_error = EINPROGRESS;
+                               splx(s);
+                               return;
+                       }
+                       /* should use tsleep here */
+                       while (so->so_state & SS_ISCONNECTED)
+                               sleep((caddr_t)&so->so_timeo, PZERO+1);

                }
                }

-               while (so->so_state & SS_ISCONNECTED)
-                       sleep((caddr_t)&so->so_timeo, PZERO+1);

        }
        u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, 0, 0);
 discard:
        }
        u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, 0, 0);
 discard:


@@ -138,11 +142,11 @@ sosplice(pso, so)
 {
 
 COUNT(SOSPLICE);
 {
 
 COUNT(SOSPLICE);

-       if (pso->so_proto->pr_family != PF_LOCAL) {
+       if (pso->so_proto->pr_family != PF_UNIX) {

                struct socket *tso;
                tso = pso; pso = so; so = tso;
        }
                struct socket *tso;
                tso = pso; pso = so; so = tso;
        }

-       if (pso->so_proto->pr_family != PF_LOCAL)
+       if (pso->so_proto->pr_family != PF_UNIX)

                return (EOPNOTSUPP);
        /* check types and buffer space */
        /* merge buffers */
                return (EOPNOTSUPP);
        /* check types and buffer space */
        /* merge buffers */


@@ -156,7 +160,8 @@ sostat(so, sb)
 {
 
 COUNT(SOSTAT);
 {
 
 COUNT(SOSTAT);

-       return (EOPNOTSUPP);
+       bzero((caddr_t)sb, sizeof (*sb));               /* XXX */
+       return (0);                                     /* XXX */

 }
 
 /*
 }
 
 /*


@@ -170,14 +175,15 @@ soaccept(so, asa)
        int error;
 
 COUNT(SOACCEPT);
        int error;
 
 COUNT(SOACCEPT);

-       if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) {
-               error = EISCONN;
-               goto bad;
-       }

        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                error = EINVAL;                 /* XXX */
                goto bad;
        }
        if ((so->so_options & SO_ACCEPTCONN) == 0) {
                error = EINVAL;                 /* XXX */
                goto bad;
        }

+       if ((so->so_state & SS_CONNAWAITING) == 0) {
+               error = ENOTCONN;
+               goto bad;
+       }
+       so->so_state &= ~SS_CONNAWAITING;

        error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT, 0, (caddr_t)asa);
 bad:
        splx(s);
        error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT, 0, (caddr_t)asa);
 bad:
        splx(s);


@@ -257,25 +263,27 @@ COUNT(SOSEND);
                return (EPIPE);
        if (sosendallatonce(so) && u.u_count > so->so_snd.sb_hiwat)
                return (EMSGSIZE);
                return (EPIPE);
        if (sosendallatonce(so) && u.u_count > so->so_snd.sb_hiwat)
                return (EMSGSIZE);

-       if ((so->so_snd.sb_flags & SB_LOCK) && (so->so_options & SO_NBIO))
+       if ((so->so_snd.sb_flags & SB_LOCK) && (so->so_options & SO_NONBLOCKING))

                return (EWOULDBLOCK);
        sblock(&so->so_snd);
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
        s = splnet();
                return (EWOULDBLOCK);
        sblock(&so->so_snd);
 #define        snderr(errno)   { error = errno; splx(s); goto release; }
 
        s = splnet();

-       nullchk("sosend in", so->so_snd.sb_mb);

 again:
 again:

+       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 (asa == 0)
                        snderr(EDESTADDRREQ);
        }
        if ((so->so_state & SS_ISCONNECTED) == 0) {
                if (so->so_proto->pr_flags & PR_CONNREQUIRED)
                        snderr(ENOTCONN);
                if (asa == 0)
                        snderr(EDESTADDRREQ);
        }

-       if (so->so_error)
-               snderr(so->so_error);

        if (top) {
                error = (*so->so_proto->pr_usrreq)(so, PRU_SEND, top, asa);
        if (top) {
                error = (*so->so_proto->pr_usrreq)(so, PRU_SEND, top, asa);

-               nullchk("sosend after PRU_SEND", so->so_snd.sb_mb);

                if (error) {
                        splx(s);
                        goto release;
                if (error) {
                        splx(s);
                        goto release;


@@ -289,7 +297,7 @@ again:
        }
        space = sbspace(&so->so_snd);
        if (space == 0 || sosendallatonce(so) && space < u.u_count) {
        }
        space = sbspace(&so->so_snd);
        if (space == 0 || sosendallatonce(so) && space < u.u_count) {

-               if (so->so_options & SO_NBIO)
+               if (so->so_options & SO_NONBLOCKING)

                        snderr(EWOULDBLOCK);
                sbunlock(&so->so_snd);
                sbwait(&so->so_snd);
                        snderr(EWOULDBLOCK);
                sbunlock(&so->so_snd);
                sbwait(&so->so_snd);


@@ -304,26 +312,24 @@ again:
                        m_freem(top);
                        goto release;
                }
                        m_freem(top);
                        goto release;
                }

-               if (u.u_count >= PGSIZE && space >= NMBPG) {
+               if (u.u_count >= CLBYTES && space >= CLBYTES) {

                        register struct mbuf *p;
                        register struct mbuf *p;

-                       MPGET(p, 1);
+                       MCLGET(p, 1);

                        if (p == 0)
                                goto nopages;
                        m->m_off = (int)p - (int)m;
                        if (p == 0)
                                goto nopages;
                        m->m_off = (int)p - (int)m;

-                       len = PGSIZE;
+                       len = CLBYTES;

                } else {
 nopages:
                        m->m_off = MMINOFF;
                        len = MIN(MLEN, u.u_count);
                }
                iomove(mtod(m, caddr_t), len, B_WRITE);
                } else {
 nopages:
                        m->m_off = MMINOFF;
                        len = MIN(MLEN, u.u_count);
                }
                iomove(mtod(m, caddr_t), len, B_WRITE);

-               nullblk("sosend", m, len);

                m->m_len = len;
                *mp = m;
                mp = &m->m_next;
                space = sbspace(&so->so_snd);
        }
                m->m_len = len;
                *mp = m;
                mp = &m->m_next;
                space = sbspace(&so->so_snd);
        }

-       nullchk("sosend top", top);

        s = splnet();
        goto again;
 
        s = splnet();
        goto again;
 


@@ -338,19 +344,22 @@ soreceive(so, asa)
 {
        register struct mbuf *m, *n;
        u_int len;
 {
        register struct mbuf *m, *n;
        u_int len;

-       int eor, s, error = 0;
+       int eor, s, error = 0, cnt = u.u_count;
+       caddr_t base = u.u_base;

 
 COUNT(SORECEIVE);
 restart:
 
 COUNT(SORECEIVE);
 restart:

-       nullchk("soreceive restart", so->so_rcv.sb_mb);
-       for (m = so->so_rcv.sb_mb; m; m = m->m_next)
-               printf("%d ", m->m_len);
-       printf("\n");

        sblock(&so->so_rcv);
        s = splnet();
 
 #define        rcverr(errno)   { error = errno; splx(s); goto release; }
        if (so->so_rcv.sb_cc == 0) {
        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;
+                       splx(s);
+                       goto release;
+               }

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


@@ -358,26 +367,21 @@ restart:
                if ((so->so_state & SS_ISCONNECTED) == 0 &&
                    (so->so_proto->pr_flags & PR_CONNREQUIRED))
                        rcverr(ENOTCONN);
                if ((so->so_state & SS_ISCONNECTED) == 0 &&
                    (so->so_proto->pr_flags & PR_CONNREQUIRED))
                        rcverr(ENOTCONN);

-               if (so->so_options & SO_NBIO)
-                       rcverr (EWOULDBLOCK);
+               if (so->so_options & SO_NONBLOCKING)
+                       rcverr(EWOULDBLOCK);

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

-       printf("soreceive about to\n");
-       psndrcv(&so->so_snd, &so->so_rcv);

        m = so->so_rcv.sb_mb;
        if (m == 0)
                panic("receive");
        if (so->so_proto->pr_flags & PR_ADDR) {
        m = so->so_rcv.sb_mb;
        if (m == 0)
                panic("receive");
        if (so->so_proto->pr_flags & PR_ADDR) {

-               printf("m_len %d\n", m->m_len);

                if (m->m_len != sizeof (struct sockaddr))
                        panic("soreceive addr");
                if (asa)
                        bcopy(mtod(m, caddr_t), (caddr_t)asa, sizeof (*asa));
                if (m->m_len != sizeof (struct sockaddr))
                        panic("soreceive addr");
                if (asa)
                        bcopy(mtod(m, caddr_t), (caddr_t)asa, sizeof (*asa));

-               else
-                       bzero((caddr_t)asa, sizeof (*asa));

                so->so_rcv.sb_cc -= m->m_len;
                so->so_rcv.sb_mbcnt -= MSIZE;
                m = m_free(m);
                so->so_rcv.sb_cc -= m->m_len;
                so->so_rcv.sb_mbcnt -= MSIZE;
                m = m_free(m);


@@ -385,32 +389,29 @@ restart:
                        panic("receive 2");
                so->so_rcv.sb_mb = m;
        }
                        panic("receive 2");
                so->so_rcv.sb_mb = m;
        }

+       so->so_state &= ~SS_RCVATMARK;
+       if (so->so_oobmark && cnt > so->so_oobmark)
+               cnt = so->so_oobmark;

        eor = 0;
        eor = 0;

-       printf("soreceive before receive loop\n");
-       psndrcv(&so->so_snd, &so->so_rcv);

        do {
        do {

-               len = MIN(m->m_len, u.u_count);
+               len = MIN(m->m_len, cnt);

                if (len == m->m_len) {
                        eor = (int)m->m_act;
                        sbfree(&so->so_rcv, m);
                if (len == m->m_len) {
                        eor = (int)m->m_act;
                        sbfree(&so->so_rcv, m);

+                       so->so_rcv.sb_mb = m->m_next;

                }
                splx(s);
                }
                splx(s);

-               nullblk("soreceive", m, len);
-               if (len)
-               printf("%o\n", *mtod(m, caddr_t));

                iomove(mtod(m, caddr_t), len, B_READ);
                iomove(mtod(m, caddr_t), len, B_READ);

+               cnt -= len;

                s = splnet();
                if (len == m->m_len) {
                        MFREE(m, n);
                s = splnet();
                if (len == m->m_len) {
                        MFREE(m, n);

-                       so->so_rcv.sb_mb = n;

                } else {
                        m->m_off += len;
                        m->m_len -= len;
                        so->so_rcv.sb_cc -= len;
                }
                } else {
                        m->m_off += len;
                        m->m_len -= len;
                        so->so_rcv.sb_cc -= len;
                }

-       } while ((m = so->so_rcv.sb_mb) && u.u_count && !eor);
-       printf("after receive loop\n");
-       psndrcv(&so->so_snd, &so->so_rcv);
+       } while ((m = so->so_rcv.sb_mb) && cnt && !eor);

        if ((so->so_proto->pr_flags & PR_ATOMIC) && eor == 0)
                do {
                        if (m == 0)
        if ((so->so_proto->pr_flags & PR_ATOMIC) && eor == 0)
                do {
                        if (m == 0)


@@ -421,17 +422,31 @@ restart:
                        MFREE(m, n);
                        m = n;
                } while (eor == 0);
                        MFREE(m, n);
                        m = n;
                } while (eor == 0);

-       printf("soreceive after drop remnants\n");
-       psndrcv(&so->so_snd, &so->so_rcv);

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

-       nullchk("receive after PRU_RCVD", so->so_rcv.sb_mb);
+       if (so->so_oobmark) {
+               so->so_oobmark -= u.u_base - base;
+               if (so->so_oobmark == 0)
+                       so->so_state |= SS_RCVATMARK;
+       }

 release:
        sbunlock(&so->so_rcv);
        splx(s);
        return (error);
 }
 
 release:
        sbunlock(&so->so_rcv);
        splx(s);
        return (error);
 }
 

+sohasoutofband(so)
+       struct socket *so;
+{
+
+       if (so->so_pgrp == 0)
+               return;
+       if (so->so_pgrp > 0)
+               gsignal(so->so_pgrp, SIGURG);
+       else 
+               psignal(-so->so_pgrp, SIGURG);
+}
+

 /*ARGSUSED*/
 soioctl(so, cmd, cmdp)
        register struct socket *so;
 /*ARGSUSED*/
 soioctl(so, cmd, cmdp)
        register struct socket *so;


@@ -440,8 +455,153 @@ soioctl(so, cmd, cmdp)
 {
 
 COUNT(SOIOCTL);
 {
 
 COUNT(SOIOCTL);

-       switch (cmdp) {
+       switch (cmd) {

 
 

+       case FIONBIO: {
+               int nbio;
+               if (copyin(cmdp, (caddr_t)&nbio, sizeof (nbio))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               if (nbio)
+                       so->so_options |= SO_NONBLOCKING;
+               else
+                       so->so_options &= ~SO_NONBLOCKING;
+               return;
+       }
+
+       case FIOASYNC: {
+               int async;
+               if (copyin(cmdp, (caddr_t)&async, sizeof (async))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               if (async)
+                       ;
+               else
+                       ;
+               return;
+       }
+
+       case SIOCSKEEP: {
+               int keep;
+               if (copyin(cmdp, (caddr_t)&keep, sizeof (keep))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               if (keep)
+                       so->so_options &= ~SO_NOKEEPALIVE;
+               else
+                       so->so_options |= SO_NOKEEPALIVE;
+               return;
+       }
+
+       case SIOCGKEEP: {
+               int keep = (so->so_options & SO_NOKEEPALIVE) == 0;
+               if (copyout((caddr_t)&keep, cmdp, sizeof (keep)))
+                       u.u_error = EFAULT;
+               return;
+       }
+
+       case SIOCSLINGER: {
+               int linger;
+               if (copyin(cmdp, (caddr_t)&linger, sizeof (linger))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               so->so_linger = linger;
+               if (so->so_linger)
+                       so->so_options &= ~SO_DONTLINGER;
+               else
+                       so->so_options |= SO_DONTLINGER;
+               return;
+       }
+
+       case SIOCGLINGER: {
+               int linger = so->so_linger;
+               if (copyout((caddr_t)&linger, cmdp, sizeof (linger))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+       }
+       case SIOCSPGRP: {
+               int pgrp;
+               if (copyin(cmdp, (caddr_t)&pgrp, sizeof (pgrp))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               so->so_pgrp = pgrp;
+               return;
+       }
+
+       case SIOCGPGRP: {
+               int pgrp = so->so_pgrp;
+               if (copyout((caddr_t)&pgrp, cmdp, sizeof (pgrp))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+       }
+
+       case SIOCDONE: {
+               int flags;
+               if (copyin(cmdp, (caddr_t)&flags, sizeof (flags))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               flags++;
+               if (flags & FREAD) {
+                       int s = splimp();
+                       socantrcvmore(so);
+                       sbflush(&so->so_rcv);
+               }
+               if (flags & FWRITE)
+                       u.u_error = (*so->so_proto->pr_usrreq)(so, PRU_SHUTDOWN, (struct mbuf *)0, 0);
+               return;
+       }
+
+       case SIOCSENDOOB: {
+               char oob;
+               struct mbuf *m;
+               if (copyin(cmdp, (caddr_t)&oob, sizeof (oob))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               m = m_get(M_DONTWAIT);
+               if (m == 0) {
+                       u.u_error = ENOBUFS;
+                       return;
+               }
+               m->m_off = MMINOFF;
+               m->m_len = 1;
+               *mtod(m, caddr_t) = oob;
+               (*so->so_proto->pr_usrreq)(so, PRU_SENDOOB, m, 0);
+               return;
+       }
+
+       case SIOCRCVOOB: {
+               struct mbuf *m = m_get(M_DONTWAIT);
+               if (m == 0) {
+                       u.u_error = ENOBUFS;
+                       return;
+               }
+               m->m_off = MMINOFF; *mtod(m, caddr_t) = 0;
+               (*so->so_proto->pr_usrreq)(so, PRU_RCVOOB, m, 0);
+               if (copyout(mtod(m, caddr_t), cmdp, sizeof (char))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               m_free(m);
+               return;
+       }
+
+       case SIOCATMARK: {
+               int atmark = (so->so_state&SS_RCVATMARK) != 0;
+               if (copyout((caddr_t)&atmark, cmdp, sizeof (atmark))) {
+                       u.u_error = EFAULT;
+                       return;
+               }
+               return;
+       }

        }
        switch (so->so_type) {
 
        }
        switch (so->so_type) {
 


@@ -456,43 +616,5 @@ COUNT(SOIOCTL);
 
        case SOCK_RAW:
                break;
 
        case SOCK_RAW:
                break;

-

        }
 }
        }
 }

-
-nullchk(where, m0)
-       char *where;
-       struct mbuf *m0;
-{
-       register struct mbuf *m;
-
-       for (m = m0; m; m = m->m_next)
-               if (nullany(mtod(m, caddr_t), m->m_len))
-                       goto bad;
-       return;
-bad:
-       printf("nullchk: %s\n", where);
-       for (m = m0; m; m = m->m_next)
-               printf("\t%x len %d: %s\n", m, m->m_len,
-                   nullany(mtod(m, caddr_t), m->m_len) ? "BAD" : "OK");
-}
-
-nullblk(where, m, len)
-       char *where;
-       struct mbuf *m;
-       int len;
-{
-
-       if (nullany(mtod(m, caddr_t), len))
-               printf("nullblk: %s m=%x len=%d\n", where, m, len);
-}
-
-nullany(cp, len)
-       char *cp;
-       int len;
-{
-       for (; len > 0; len--)
-               if (*cp++ == 0)
-                       return (0);             /* XXX */
-       return (0);
-}