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 0b41c15..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.20    81/12/21        */
+/*     uipc_socket.c   4.25    82/01/17        */

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


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

-               if (so->so_options & SO_LETDATADRAIN) {
+               if ((so->so_options & SO_DONTLINGER) == 0) {

                        if ((so->so_state & SS_ISDISCONNECTING) &&
                        if ((so->so_state & SS_ISDISCONNECTING) &&

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

                                u.u_error = EINPROGRESS;
                                splx(s);
                                return;
                        }
                                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);
                }


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

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

 }
 
 /*
 }
 
 /*


@@ -261,7 +263,7 @@ 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; }
                return (EWOULDBLOCK);
        sblock(&so->so_snd);
 #define        snderr(errno)   { error = errno; splx(s); goto release; }


@@ -295,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);


@@ -342,7 +344,8 @@ 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:


@@ -364,7 +367,7 @@ 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)
+               if (so->so_options & SO_NONBLOCKING)

                        rcverr(EWOULDBLOCK);
                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);
                        rcverr(EWOULDBLOCK);
                sbunlock(&so->so_rcv);
                sbwait(&so->so_rcv);


@@ -386,25 +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;
        do {
        eor = 0;
        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);
                iomove(mtod(m, caddr_t), len, B_READ);
                }
                splx(s);
                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);
+       } 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)


@@ -417,12 +424,29 @@ restart:
                } while (eor == 0);
        if ((so->so_proto->pr_flags & PR_WANTRCVD) && so->so_pcb)
                (*so->so_proto->pr_usrreq)(so, PRU_RCVD, 0, 0);
                } while (eor == 0);
        if ((so->so_proto->pr_flags & PR_WANTRCVD) && so->so_pcb)
                (*so->so_proto->pr_usrreq)(so, PRU_RCVD, 0, 0);

+       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;


@@ -431,7 +455,92 @@ 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;
 
        case SIOCDONE: {
                int flags;


@@ -439,16 +548,60 @@ COUNT(SOIOCTL);
                        u.u_error = EFAULT;
                        return;
                }
                        u.u_error = EFAULT;
                        return;
                }

+               flags++;

                if (flags & FREAD) {
                        int s = splimp();
                        socantrcvmore(so);
                        sbflush(&so->so_rcv);
                }
                if (flags & FWRITE)
                if (flags & FREAD) {
                        int s = splimp();
                        socantrcvmore(so);
                        sbflush(&so->so_rcv);
                }
                if (flags & FWRITE)

-                       (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, (struct mbuf *)0, 0);
+                       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;
        }
 
                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) {
 


@@ -463,6 +616,5 @@ COUNT(SOIOCTL);
 
        case SOCK_RAW:
                break;
 
        case SOCK_RAW:
                break;

-

        }
 }
        }
 }