Cleanups for 4.4BSD-Lite

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

diff --git a/usr/src/sys/kern/uipc_socket2.c b/usr/src/sys/kern/uipc_socket2.c
index 21cca21..1b22cbc 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,40 +1,34 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1988 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.

  *
  *

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

  *
  *

- *     @(#)uipc_socket2.c      7.7 (Berkeley) %G%
+ *     @(#)uipc_socket2.c      8.1 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.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 "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>

 
 /*
  * Primitive routines for operating on sockets and socket buffers
  */
 
 
 /*
  * Primitive routines for operating on sockets and socket buffers
  */
 

+/* strings for sleep message: */
+char   netio[] = "netio";
+char   netcon[] = "netcon";
+char   netcls[] = "netcls";
+
+u_long sb_max = SB_MAX;                /* patchable */
+

 /*
  * Procedures to manipulate state flags of socket
  * and do appropriate wakeups.  Normal sequence from the
 /*
  * Procedures to manipulate state flags of socket
  * and do appropriate wakeups.  Normal sequence from the


@@ -71,7 +65,6 @@ soisconnecting(so)
 
        so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTING;
 
        so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTING;

-       wakeup((caddr_t)&so->so_timeo);

 }
 
 soisconnected(so)
 }
 
 soisconnected(so)


@@ -79,18 +72,17 @@ soisconnected(so)
 {
        register struct socket *head = so->so_head;
 
 {
        register struct socket *head = so->so_head;
 

-       if (head) {
-               if (soqremque(so, 0) == 0)
-                       panic("soisconnected");
+       so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING|SS_ISCONFIRMING);
+       so->so_state |= SS_ISCONNECTED;
+       if (head && soqremque(so, 0)) {

                soqinsque(head, so, 1);
                sorwakeup(head);
                wakeup((caddr_t)&head->so_timeo);
                soqinsque(head, so, 1);
                sorwakeup(head);
                wakeup((caddr_t)&head->so_timeo);

+       } else {
+               wakeup((caddr_t)&so->so_timeo);
+               sorwakeup(so);
+               sowwakeup(so);

        }
        }

-       so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING);
-       so->so_state |= SS_ISCONNECTED;
-       wakeup((caddr_t)&so->so_timeo);
-       sorwakeup(so);
-       sowwakeup(so);

 }
 
 soisdisconnecting(so)
 }
 
 soisdisconnecting(so)


@@ -121,20 +113,25 @@ soisdisconnected(so)
  * connection is possible (subject to space constraints, etc.)
  * then we allocate a new structure, propoerly linked into the
  * data structure of the original socket, and return this.
  * connection is possible (subject to space constraints, etc.)
  * then we allocate a new structure, propoerly linked into the
  * data structure of the original socket, and return this.

+ * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED.
+ *
+ * Currently, sonewconn() is defined as sonewconn1() in socketvar.h
+ * to catch calls that are missing the (new) second parameter.

  */
 struct socket *
  */
 struct socket *

-sonewconn(head)
+sonewconn1(head, connstatus)

        register struct socket *head;
        register struct socket *head;

+       int connstatus;

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

-       register struct mbuf *m;
+       int soqueue = connstatus ? 1 : 0;

 
        if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)
 
        if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)

-               goto bad;
-       m = m_getclr(M_DONTWAIT, MT_SOCKET);
-       if (m == NULL)
-               goto bad;
-       so = mtod(m, struct socket *);
+               return ((struct socket *)0);
+       MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_DONTWAIT);
+       if (so == NULL) 
+               return ((struct socket *)0);
+       bzero((caddr_t)so, sizeof(*so));

        so->so_type = head->so_type;
        so->so_options = head->so_options &~ SO_ACCEPTCONN;
        so->so_linger = head->so_linger;
        so->so_type = head->so_type;
        so->so_options = head->so_options &~ SO_ACCEPTCONN;
        so->so_linger = head->so_linger;


@@ -143,16 +140,19 @@ sonewconn(head)
        so->so_timeo = head->so_timeo;
        so->so_pgid = head->so_pgid;
        (void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);
        so->so_timeo = head->so_timeo;
        so->so_pgid = head->so_pgid;
        (void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);

-       soqinsque(head, so, 0);
+       soqinsque(head, so, soqueue);

        if ((*so->so_proto->pr_usrreq)(so, PRU_ATTACH,
            (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)) {
        if ((*so->so_proto->pr_usrreq)(so, PRU_ATTACH,
            (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0)) {

-               (void) soqremque(so, 0);
-               (void) m_free(m);
-               goto bad;
+               (void) soqremque(so, soqueue);
+               (void) free((caddr_t)so, M_SOCKET);
+               return ((struct socket *)0);
+       }
+       if (connstatus) {
+               sorwakeup(head);
+               wakeup((caddr_t)&head->so_timeo);
+               so->so_state |= connstatus;

        }
        return (so);
        }
        return (so);

-bad:
-       return ((struct socket *)0);

 }
 
 soqinsque(head, so, q)
 }
 
 soqinsque(head, so, q)


@@ -160,16 +160,20 @@ soqinsque(head, so, q)
        int q;
 {
 
        int q;
 {
 

+       register struct socket **prev;

        so->so_head = head;
        if (q == 0) {
                head->so_q0len++;
        so->so_head = head;
        if (q == 0) {
                head->so_q0len++;

-               so->so_q0 = head->so_q0;
-               head->so_q0 = so;
+               so->so_q0 = 0;
+               for (prev = &(head->so_q0); *prev; )
+                       prev = &((*prev)->so_q0);

        } else {
                head->so_qlen++;
        } else {
                head->so_qlen++;

-               so->so_q = head->so_q;
-               head->so_q = so;
+               so->so_q = 0;
+               for (prev = &(head->so_q); *prev; )
+                       prev = &((*prev)->so_q);

        }
        }

+       *prev = so;

 }
 
 soqremque(so, q)
 }
 
 soqremque(so, q)


@@ -184,7 +188,7 @@ soqremque(so, q)
                next = q ? prev->so_q : prev->so_q0;
                if (next == so)
                        break;
                next = q ? prev->so_q : prev->so_q0;
                if (next == so)
                        break;

-               if (next == head)
+               if (next == 0)

                        return (0);
                prev = next;
        }
                        return (0);
                prev = next;
        }


@@ -227,32 +231,36 @@ socantrcvmore(so)
 }
 
 /*
 }
 
 /*

- * Socket select/wakeup routines.
- */
-
-/*
- * Queue a process for a select on a socket buffer.
+ * Wait for data to arrive at/drain from a socket buffer.

  */
  */

-sbselqueue(sb)
+sbwait(sb)

        struct sockbuf *sb;
 {
        struct sockbuf *sb;
 {

-       struct proc *p;

 
 

-       if ((p = sb->sb_sel) && p->p_wchan == (caddr_t)&selwait)
-               sb->sb_flags |= SB_COLL;
-       else
-               sb->sb_sel = u.u_procp;
+       sb->sb_flags |= SB_WAIT;
+       return (tsleep((caddr_t)&sb->sb_cc,
+           (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, netio,
+           sb->sb_timeo));

 }
 
 }
 

-/*
- * Wait for data to arrive at/drain from a socket buffer.
+/* 
+ * Lock a sockbuf already known to be locked;
+ * return any error returned from sleep (EINTR).

  */
  */

-sbwait(sb)
-       struct sockbuf *sb;
+sb_lock(sb)
+       register struct sockbuf *sb;

 {
 {

-
-       sb->sb_flags |= SB_WAIT;
-       sleep((caddr_t)&sb->sb_cc, PZERO+1);
+       int error;
+
+       while (sb->sb_flags & SB_LOCK) {
+               sb->sb_flags |= SB_WANT;
+               if (error = tsleep((caddr_t)&sb->sb_flags, 
+                   (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH,
+                   netio, 0))
+                       return (error);
+       }
+       sb->sb_flags |= SB_LOCK;
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -264,13 +272,10 @@ sowakeup(so, sb)
        register struct socket *so;
        register struct sockbuf *sb;
 {
        register struct socket *so;
        register struct sockbuf *sb;
 {

-       register struct proc *p;
+       struct proc *p;

 
 

-       if (sb->sb_sel) {
-               selwakeup(sb->sb_sel, sb->sb_flags & SB_COLL);
-               sb->sb_sel = 0;
-               sb->sb_flags &= ~SB_COLL;
-       }
+       selwakeup(&sb->sb_sel);
+       sb->sb_flags &= ~SB_SEL;

        if (sb->sb_flags & SB_WAIT) {
                sb->sb_flags &= ~SB_WAIT;
                wakeup((caddr_t)&sb->sb_cc);
        if (sb->sb_flags & SB_WAIT) {
                sb->sb_flags &= ~SB_WAIT;
                wakeup((caddr_t)&sb->sb_cc);


@@ -324,6 +329,12 @@ soreserve(so, sndcc, rcvcc)
                goto bad;
        if (sbreserve(&so->so_rcv, rcvcc) == 0)
                goto bad2;
                goto bad;
        if (sbreserve(&so->so_rcv, rcvcc) == 0)
                goto bad2;

+       if (so->so_rcv.sb_lowat == 0)
+               so->so_rcv.sb_lowat = 1;
+       if (so->so_snd.sb_lowat == 0)
+               so->so_snd.sb_lowat = MCLBYTES;
+       if (so->so_snd.sb_lowat > so->so_snd.sb_hiwat)
+               so->so_snd.sb_lowat = so->so_snd.sb_hiwat;

        return (0);
 bad2:
        sbrelease(&so->so_snd);
        return (0);
 bad2:
        sbrelease(&so->so_snd);


@@ -333,7 +344,7 @@ bad:
 
 /*
  * Allot mbufs to a sockbuf.
 
 /*
  * Allot mbufs to a sockbuf.

- * Attempt to scale cc so that mbcnt doesn't become limiting
+ * Attempt to scale mbmax so that mbcnt doesn't become limiting

  * if buffering efficiency is near the normal case.
  */
 sbreserve(sb, cc)
  * if buffering efficiency is near the normal case.
  */
 sbreserve(sb, cc)


@@ -341,10 +352,12 @@ sbreserve(sb, cc)
        u_long cc;
 {
 
        u_long cc;
 {
 

-       if (cc > (u_long)SB_MAX * MCLBYTES / (2 * MSIZE + MCLBYTES))
+       if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES))

                return (0);
        sb->sb_hiwat = cc;
                return (0);
        sb->sb_hiwat = cc;

-       sb->sb_mbmax = MIN(cc * 2, SB_MAX);
+       sb->sb_mbmax = min(cc * 2, sb_max);
+       if (sb->sb_lowat > sb->sb_hiwat)
+               sb->sb_lowat = sb->sb_hiwat;

        return (1);
 }
 
        return (1);
 }
 


@@ -394,19 +407,40 @@ sbappend(sb, m)
        struct sockbuf *sb;
        struct mbuf *m;
 {
        struct sockbuf *sb;
        struct mbuf *m;
 {

-       register struct mbuf *n;
+       register struct mbuf *n, *n0;

 
        if (m == 0)
                return;
        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;
 
        if (m == 0)
                return;
        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;

-               while (n->m_next)
-                       n = n->m_next;

        }
        sbcompress(sb, m, n);
 }
 
        }
        sbcompress(sb, m, n);
 }
 

+#ifdef SOCKBUF_DEBUG
+sbcheck(sb)
+       register struct sockbuf *sb;
+{
+       register struct mbuf *m;
+       register int len = 0, mbcnt = 0;
+
+       for (m = sb->sb_mb; m; m = m->m_next) {
+               len += m->m_len;
+               mbcnt += MSIZE;
+               if (m->m_flags & M_EXT)
+                       mbcnt += m->m_ext.ext_size;
+               if (m->m_nextpkt)
+                       panic("sbcheck nextpkt");
+       }
+       if (len != sb->sb_cc || mbcnt != sb->sb_mbcnt) {
+               printf("cc %d != %d || mbcnt %d != %d\n", len, sb->sb_cc,
+                   mbcnt, sb->sb_mbcnt);
+               panic("sbcheck");
+       }
+}
+#endif
+

 /*
  * As above, except the mbuf chain
  * begins a new record.
 /*
  * As above, except the mbuf chain
  * begins a new record.


@@ -437,80 +471,124 @@ sbappendrecord(sb, m0)
 }
 
 /*
 }
 
 /*

- * Append address and data, and optionally, rights
+ * As above except that OOB data
+ * is inserted at the beginning of the sockbuf,
+ * but after any other OOB data.
+ */
+sbinsertoob(sb, m0)
+       register struct sockbuf *sb;
+       register struct mbuf *m0;
+{
+       register struct mbuf *m;
+       register struct mbuf **mp;
+
+       if (m0 == 0)
+               return;
+       for (mp = &sb->sb_mb; m = *mp; mp = &((*mp)->m_nextpkt)) {
+           again:
+               switch (m->m_type) {
+
+               case MT_OOBDATA:
+                       continue;               /* WANT next train */
+
+               case MT_CONTROL:
+                       if (m = m->m_next)
+                               goto again;     /* inspect THIS train further */
+               }
+               break;
+       }
+       /*
+        * Put the first mbuf on the queue.
+        * Note this permits zero length records.
+        */
+       m0->m_nextpkt = *mp;
+       *mp = m0;
+       for (m = m0; m; m = m->m_next)
+               sballoc(sb, m);
+}
+
+/*
+ * Append address and data, and optionally, control (ancillary) data

  * to the receive queue of a socket.  If present,
  * to the receive queue of a socket.  If present,

- * m0 Return 0 if
- * no space in sockbuf or insufficient mbufs.
+ * m0 must include a packet header with total length.
+ * Returns 0 if no space in sockbuf or insufficient mbufs.

  */
  */

-sbappendaddr(sb, asa, m0, rights0)
+sbappendaddr(sb, asa, m0, control)

        register struct sockbuf *sb;
        struct sockaddr *asa;
        register struct sockbuf *sb;
        struct sockaddr *asa;

-       struct mbuf *m0, *rights0;
+       struct mbuf *m0, *control;

 {
        register struct mbuf *m, *n;
 {
        register struct mbuf *m, *n;

-       int space = sizeof (*asa);
+       int space = asa->sa_len, eor = 0;

 
 if (m0 && (m0->m_flags & M_PKTHDR) == 0)
 panic("sbappendaddr");
        if (m0)
                space += m0->m_pkthdr.len;
 
 if (m0 && (m0->m_flags & M_PKTHDR) == 0)
 panic("sbappendaddr");
        if (m0)
                space += m0->m_pkthdr.len;

-       if (rights0)
-               space += rights0->m_len;
+       for (n = control; n; n = n->m_next) {
+               space += n->m_len;
+               if (n->m_next == 0)     /* keep pointer to last control buf */
+                       break;
+       }

        if (space > sbspace(sb))
                return (0);
        if (space > sbspace(sb))
                return (0);

+       if (asa->sa_len > MLEN)
+               return (0);

        MGET(m, M_DONTWAIT, MT_SONAME);
        if (m == 0)
                return (0);
        MGET(m, M_DONTWAIT, MT_SONAME);
        if (m == 0)
                return (0);

-       *mtod(m, struct sockaddr *) = *asa;
-       m->m_len = sizeof (*asa);
-       if (rights0 && rights0->m_len) {
-               m->m_next = m_copy(rights0, 0, rights0->m_len);
-               if (m->m_next == 0) {
-                       m_freem(m);
-                       return (0);
-               }
-               sballoc(sb, m->m_next);
+       m->m_len = asa->sa_len;
+       bcopy((caddr_t)asa, mtod(m, caddr_t), asa->sa_len);
+       if (n)
+               n->m_next = m0;         /* concatenate data to control */
+       else
+               control = m0;
+       m->m_next = control;
+       for (n = m; n; n = n->m_next) {
+               eor |= n->m_flags & M_EOR;
+               sballoc(sb, n);

        }
        }

-       sballoc(sb, m);
+       m->m_flags |= eor;

        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;
                n->m_nextpkt = m;
        } else
                sb->sb_mb = m;
        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;
                n->m_nextpkt = m;
        } else
                sb->sb_mb = m;

-       if (m->m_next)
-               m = m->m_next;
-       if (m0)
-               sbcompress(sb, m0, m);

        return (1);
 }
 
        return (1);
 }
 

-sbappendrights(sb, m0, rights)
+sbappendcontrol(sb, m0, control)

        struct sockbuf *sb;
        struct sockbuf *sb;

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

 {
        register struct mbuf *m, *n;
 {
        register struct mbuf *m, *n;

-       int space = 0;
+       int space = 0, eor = 0;

 
 

-       if (rights == 0)
-               panic("sbappendrights");
+       if (control == 0)
+               panic("sbappendcontrol");
+       for (m = control; ; m = m->m_next) {
+               space += m->m_len;
+               if (m->m_next == 0)
+                       break;
+       }
+       n = m;                  /* save pointer to last control buffer */

        for (m = m0; m; m = m->m_next)
                space += m->m_len;
        for (m = m0; m; m = m->m_next)
                space += m->m_len;

-       space += rights->m_len;

        if (space > sbspace(sb))
                return (0);
        if (space > sbspace(sb))
                return (0);

-       m = m_copy(rights, 0, rights->m_len);
-       if (m == 0)
-               return (0);
-       sballoc(sb, m);
+       n->m_next = m0;                 /* concatenate data to control */
+       for (m = control; m; m = m->m_next) {
+               eor |= m->m_flags & M_EOR;
+               sballoc(sb, m);
+       }
+       control->m_flags |= eor;

        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;
        if (n = sb->sb_mb) {
                while (n->m_nextpkt)
                        n = n->m_nextpkt;

-               n->m_nextpkt = m;
+               n->m_nextpkt = control;

        } else
        } else

-               sb->sb_mb = m;
-       if (m0)
-               sbcompress(sb, m0, m);
+               sb->sb_mb = control;

        return (1);
 }
 
        return (1);
 }
 


@@ -519,15 +597,27 @@ sbappendrights(sb, m0, rights)
  * buffer sb following mbuf n.  If n
  * is null, the buffer is presumed empty.
  */
  * buffer sb following mbuf n.  If n
  * is null, the buffer is presumed empty.
  */

-sbcompress(sb, m, n)
+sbcompress(sb, m, n0)

        register struct sockbuf *sb;
        register struct sockbuf *sb;

-       register struct mbuf *m, *n;
+       register struct mbuf *m;
+       struct mbuf *n0;

 {
 {

+       register struct mbuf *n = n0;
+       register int eor = 0;

 
 

+       if (n) {
+               if (n->m_flags & M_EOR)
+                       n = 0;
+               else while (n->m_next)
+                       n = n->m_next;
+       }

        while (m) {
        while (m) {

+               eor |= m->m_flags & M_EOR;

                if (m->m_len == 0) {
                if (m->m_len == 0) {

-                       m = m_free(m);
-                       continue;
+                       if (eor == 0 || m->m_next || n) {
+                               m = m_free(m);
+                               continue;
+                       }

                }
                if (n && (n->m_flags & M_EXT) == 0 &&
                    (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&
                }
                if (n && (n->m_flags & M_EXT) == 0 &&
                    (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&


@@ -539,15 +629,26 @@ sbcompress(sb, m, n)
                        m = m_free(m);
                        continue;
                }
                        m = m_free(m);
                        continue;
                }

-               sballoc(sb, m);
-               if (n)
+               if (n == 0) {
+                       if (n0)
+                               n0->m_nextpkt = m;
+                       else
+                               sb->sb_mb = m;
+                       n0 = m;
+               } else

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

-               else
-                       sb->sb_mb = m;
+               sballoc(sb, m);

                n = m;
                n = m;

+               /*m->m_flags &= ~M_EOR;*/

                m = m->m_next;
                n->m_next = 0;
        }
                m = m->m_next;
                n->m_next = 0;
        }

+       if (eor) {
+               if (n0)
+                       n0->m_flags |= eor;
+               else
+                       panic("sbcompress");
+       }

 }
 
 /*
 }
 
 /*


@@ -562,7 +663,7 @@ sbflush(sb)
                panic("sbflush");
        while (sb->sb_mbcnt)
                sbdrop(sb, (int)sb->sb_cc);
                panic("sbflush");
        while (sb->sb_mbcnt)
                sbdrop(sb, (int)sb->sb_cc);

-       if (sb->sb_cc || sb->sb_mbcnt || sb->sb_mb)
+       if (sb->sb_cc || sb->sb_mb)

                panic("sbflush 2");
 }
 
                panic("sbflush 2");
 }