convert VOP_UNLOCK and vrele into vput's; add proc parameter to union_dircache

[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 5c863fb..b81f6ee 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,22 +1,34 @@
-/*     uipc_socket2.c  6.8     85/06/02        */
-
-#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 "mbuf.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
+/*
+ * Copyright (c) 1982, 1986, 1988, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)uipc_socket2.c      8.2 (Berkeley) %G%
+ */
+
+#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


@@ -47,34 +59,35 @@
  * cause software-interrupt process scheduling.
  */
 
  * cause software-interrupt process scheduling.
  */
 

+void

 soisconnecting(so)
        register struct socket *so;
 {
 
        so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTING;
 soisconnecting(so)
        register struct socket *so;
 {
 
        so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTING;

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

 }
 
 }
 

+void

 soisconnected(so)
        register struct socket *so;
 {
        register struct socket *head = so->so_head;
 
 soisconnected(so)
        register struct socket *so;
 {
        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);

 }
 
 }
 

+void

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


@@ -86,6 +99,7 @@ soisdisconnecting(so)
        sorwakeup(so);
 }
 
        sorwakeup(so);
 }
 

+void

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


@@ -103,56 +117,71 @@ 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_state = head->so_state | SS_NOFDREF;
        so->so_proto = head->so_proto;
        so->so_timeo = head->so_timeo;
        so->so_type = head->so_type;
        so->so_options = head->so_options &~ SO_ACCEPTCONN;
        so->so_linger = head->so_linger;
        so->so_state = head->so_state | SS_NOFDREF;
        so->so_proto = head->so_proto;
        so->so_timeo = head->so_timeo;

-       so->so_pgrp = head->so_pgrp;
-       soqinsque(head, so, 0);
+       so->so_pgid = head->so_pgid;
+       (void) soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat);
+       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);

 }
 
 }
 

+void

 soqinsque(head, so, q)
        register struct socket *head, *so;
        int q;
 {
 
 soqinsque(head, so, q)
        register struct socket *head, *so;
        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;

 }
 
 }
 

+int

 soqremque(so, q)
        register struct socket *so;
        int q;
 soqremque(so, q)
        register struct socket *so;
        int q;


@@ -165,7 +194,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;
        }


@@ -191,6 +220,7 @@ soqremque(so, q)
  * Data queued for reading in the socket may yet be read.
  */
 
  * Data queued for reading in the socket may yet be read.
  */
 

+void

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


@@ -199,6 +229,7 @@ socantsendmore(so)
        sowwakeup(so);
 }
 
        sowwakeup(so);
 }
 

+void

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


@@ -207,71 +238,63 @@ socantrcvmore(so)
        sorwakeup(so);
 }
 
        sorwakeup(so);
 }
 

-/*
- * Socket select/wakeup routines.
- */
-
-/*
- * Queue a process for a select on a socket buffer.
- */
-sbselqueue(sb)
-       struct sockbuf *sb;
-{
-       register 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;
-}
-

 /*
  * Wait for data to arrive at/drain from a socket buffer.
  */
 /*
  * Wait for data to arrive at/drain from a socket buffer.
  */

+int

 sbwait(sb)
        struct sockbuf *sb;
 {
 
        sb->sb_flags |= SB_WAIT;
 sbwait(sb)
        struct sockbuf *sb;
 {
 
        sb->sb_flags |= SB_WAIT;

-       sleep((caddr_t)&sb->sb_cc, PZERO+1);
+       return (tsleep((caddr_t)&sb->sb_cc,
+           (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, netio,
+           sb->sb_timeo));

 }
 
 }
 

-/*
- * Wakeup processes waiting on a socket buffer.
+/* 
+ * Lock a sockbuf already known to be locked;
+ * return any error returned from sleep (EINTR).

  */
  */

-sbwakeup(sb)
+int
+sb_lock(sb)

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

-
-       if (sb->sb_sel) {
-               selwakeup(sb->sb_sel, sb->sb_flags & SB_COLL);
-               sb->sb_sel = 0;
-               sb->sb_flags &= ~SB_COLL;
-       }
-       if (sb->sb_flags & SB_WAIT) {
-               sb->sb_flags &= ~SB_WAIT;
-               wakeup((caddr_t)&sb->sb_cc);
+       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);

 }
 
 /*
 }
 
 /*

- * Wakeup socket readers and writers.
+ * Wakeup processes waiting on a socket buffer.

  * Do asynchronous notification via SIGIO
  * if the socket has the SS_ASYNC flag set.
  */
  * Do asynchronous notification via SIGIO
  * if the socket has the SS_ASYNC flag set.
  */

+void

 sowakeup(so, sb)
        register struct socket *so;
 sowakeup(so, sb)
        register struct socket *so;

-       struct sockbuf *sb;
+       register struct sockbuf *sb;

 {
 {

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

 
 

-       sbwakeup(sb);
+       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 (so->so_state & SS_ASYNC) {
        if (so->so_state & SS_ASYNC) {

-               if (so->so_pgrp == 0)
-                       return;
-               else if (so->so_pgrp > 0)
-                       gsignal(so->so_pgrp, SIGIO);
-               else if ((p = pfind(-so->so_pgrp)) != 0)
+               if (so->so_pgid < 0)
+                       gsignal(-so->so_pgid, SIGIO);
+               else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)

                        psignal(p, SIGIO);
        }
 }
                        psignal(p, SIGIO);
        }
 }


@@ -287,7 +310,7 @@ sowakeup(so, sb)
  *
  * Data stored in a socket buffer is maintained as a list of records.
  * Each record is a list of mbufs chained together with the m_next
  *
  * Data stored in a socket buffer is maintained as a list of records.
  * Each record is a list of mbufs chained together with the m_next

- * field.  Records are chained together with the m_act field. The upper
+ * field.  Records are chained together with the m_nextpkt field. The upper

  * level routine soreceive() expects the following conventions to be
  * observed when placing information in the receive buffer:
  *
  * level routine soreceive() expects the following conventions to be
  * observed when placing information in the receive buffer:
  *


@@ -302,40 +325,28 @@ sowakeup(so, sb)
  *    a data record, perhaps of zero length.
  *
  * Before using a new socket structure it is first necessary to reserve
  *    a data record, perhaps of zero length.
  *
  * Before using a new socket structure it is first necessary to reserve

- * buffer space to the socket, by calling sbreserve().  This commits
+ * buffer space to the socket, by calling sbreserve().  This should commit

  * some of the available buffer space in the system buffer pool for the
  * some of the available buffer space in the system buffer pool for the

- * socket.  The space should be released by calling sbrelease() when the
- * socket is destroyed.
- *
- * The routines sbappend() or sbappendrecord() are normally called to
- * append new mbufs to a socket buffer, after checking that adequate
- * space is available, comparing the function sbspace() with the amount
- * of data to be added.  sbappendrecord() differs from sbappend() in
- * that data supplied is treated as the beginning of a new record.
- * Data is normally removed from a socket buffer in a protocol by
- * first calling m_copy on the socket buffer mbuf chain and sending this
- * to a peer, and then removing the data from the socket buffer with
- * sbdrop() or sbdroprecord() when the data is acknowledged by the peer
- * (or immediately in the case of unreliable protocols.)
- *
- * To place a sender's name, optionally, access rights, and data in a
- * socket buffer sbappendaddr() should be used.  To place access rights
- * and data in a socket buffer sbappendrights() should be used.  Note
- * that unlike sbappend() and sbappendrecord(), these routines check
- * for the caller that there will be enough space to store the data.
- * Each fails if there is not enough space, or if it cannot find mbufs
- * to store additional information in.
+ * socket (currently, it does nothing but enforce limits).  The space
+ * should be released by calling sbrelease() when the socket is destroyed.

  */
 
  */
 

+int

 soreserve(so, sndcc, rcvcc)
        register struct socket *so;
 soreserve(so, sndcc, rcvcc)
        register struct socket *so;

-       int sndcc, rcvcc;
+       u_long sndcc, rcvcc;

 {
 
        if (sbreserve(&so->so_snd, sndcc) == 0)
                goto bad;
        if (sbreserve(&so->so_rcv, rcvcc) == 0)
                goto bad2;
 {
 
        if (sbreserve(&so->so_snd, sndcc) == 0)
                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);


@@ -345,23 +356,28 @@ bad:
 
 /*
  * Allot mbufs to a sockbuf.
 
 /*
  * Allot mbufs to a sockbuf.

+ * Attempt to scale mbmax so that mbcnt doesn't become limiting
+ * if buffering efficiency is near the normal case.

  */
  */

+int

 sbreserve(sb, cc)
        struct sockbuf *sb;
 sbreserve(sb, cc)
        struct sockbuf *sb;

+       u_long cc;

 {
 
 {
 

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

                return (0);
                return (0);

-       /* someday maybe this routine will fail... */

        sb->sb_hiwat = cc;
        sb->sb_hiwat = cc;

-       /* * 2 implies names can be no more than 1 mbuf each */
-       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);
 }
 
 /*
  * Free mbufs held by a socket, and reserved mbuf space.
  */
        return (1);
 }
 
 /*
  * Free mbufs held by a socket, and reserved mbuf space.
  */

+void

 sbrelease(sb)
        struct sockbuf *sb;
 {
 sbrelease(sb)
        struct sockbuf *sb;
 {


@@ -373,6 +389,26 @@ sbrelease(sb)
 /*
  * Routines to add and remove
  * data from an mbuf queue.
 /*
  * Routines to add and remove
  * data from an mbuf queue.

+ *
+ * The routines sbappend() or sbappendrecord() are normally called to
+ * append new mbufs to a socket buffer, after checking that adequate
+ * space is available, comparing the function sbspace() with the amount
+ * of data to be added.  sbappendrecord() differs from sbappend() in
+ * that data supplied is treated as the beginning of a new record.
+ * To place a sender's address, optional access rights, and data in a
+ * socket receive buffer, sbappendaddr() should be used.  To place
+ * access rights and data in a socket receive buffer, sbappendrights()
+ * should be used.  In either case, the new data begins a new record.
+ * Note that unlike sbappend() and sbappendrecord(), these routines check
+ * for the caller that there will be enough space to store the data.
+ * Each fails if there is not enough space, or if it cannot find mbufs
+ * to store additional information in.
+ *
+ * Reliable protocols may use the socket send buffer to hold data
+ * awaiting acknowledgement.  Data is normally copied from a socket
+ * send buffer in a protocol with m_copy for output to a peer,
+ * and then removing the data from the socket buffer with sbdrop()
+ * or sbdroprecord() when the data is acknowledged by the peer.

  */
 
 /*
  */
 
 /*


@@ -381,27 +417,51 @@ sbrelease(sb)
  * the mbuf chain is recorded in sb.  Empty mbufs are
  * discarded and mbufs are compacted where possible.
  */
  * the mbuf chain is recorded in sb.  Empty mbufs are
  * discarded and mbufs are compacted where possible.
  */

+void

 sbappend(sb, m)
        struct sockbuf *sb;
        struct mbuf *m;
 {
 sbappend(sb, 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) {
 
        if (m == 0)
                return;
        if (n = sb->sb_mb) {

-               while (n->m_act)
-                       n = n->m_act;
-               while (n->m_next)
-                       n = n->m_next;
+               while (n->m_nextpkt)
+                       n = n->m_nextpkt;

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

+#ifdef SOCKBUF_DEBUG
+void
+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.
  */

+void

 sbappendrecord(sb, m0)
        register struct sockbuf *sb;
        register struct mbuf *m0;
 sbappendrecord(sb, m0)
        register struct sockbuf *sb;
        register struct mbuf *m0;


@@ -411,15 +471,15 @@ sbappendrecord(sb, m0)
        if (m0 == 0)
                return;
        if (m = sb->sb_mb)
        if (m0 == 0)
                return;
        if (m = sb->sb_mb)

-               while (m->m_act)
-                       m = m->m_act;
+               while (m->m_nextpkt)
+                       m = m->m_nextpkt;

        /*
         * Put the first mbuf on the queue.
         * Note this permits zero length records.
         */
        sballoc(sb, m0);
        if (m)
        /*
         * Put the first mbuf on the queue.
         * Note this permits zero length records.
         */
        sballoc(sb, m0);
        if (m)

-               m->m_act = m0;
+               m->m_nextpkt = m0;

        else
                sb->sb_mb = m0;
        m = m0->m_next;
        else
                sb->sb_mb = m0;
        m = m0->m_next;


@@ -428,114 +488,161 @@ sbappendrecord(sb, m0)
 }
 
 /*
 }
 
 /*

- * Append address and data, and optionally, rights
- * to the receive queue of a socket.  Return 0 if
- * no space in sockbuf or insufficient mbufs.
+ * As above except that OOB data
+ * is inserted at the beginning of the sockbuf,
+ * but after any other OOB data.

  */
  */

-sbappendaddr(sb, asa, m0, rights0)             /* XXX */
+void
+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,
+ * m0 must include a packet header with total length.
+ * Returns 0 if no space in sockbuf or insufficient mbufs.
+ */
+int
+sbappendaddr(sb, asa, m0, control)

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

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

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

-       int space = sizeof (*asa);
-
-       m = m0;
-       if (m == 0)
-               panic("sbappendaddr");
-       do {
-               space += m->m_len;
-               m = m->m_next;
-       } while (m);
-       if (rights0)
-               space += rights0->m_len;
+       int space = asa->sa_len, eor = 0;
+
+if (m0 && (m0->m_flags & M_PKTHDR) == 0)
+panic("sbappendaddr");
+       if (m0)
+               space += m0->m_pkthdr.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);

-       m = m_get(M_DONTWAIT, MT_SONAME);
+       if (asa->sa_len > MLEN)
+               return (0);
+       MGET(m, M_DONTWAIT, MT_SONAME);

        if (m == 0)
                return (0);
        if (m == 0)
                return (0);

-       *mtod(m, struct sockaddr *) = *asa;
-       m->m_len = sizeof (*asa);
-       if (rights0) {
-               m->m_act = m_copy(rights0, 0, rights0->m_len);
-               if (m->m_act == 0) {
-                       m_freem(m);
-                       return (0);
-               }
-               sballoc(sb, m);
-               sballoc(sb, m->m_act);
-       } else
-               sballoc(sb, m);
+       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);
+       }
+       m->m_flags |= eor;

        if (n = sb->sb_mb) {
        if (n = sb->sb_mb) {

-               while (n->m_act)
-                       n = n->m_act;
-               n->m_act = m;
+               while (n->m_nextpkt)
+                       n = n->m_nextpkt;
+               n->m_nextpkt = m;

        } else
                sb->sb_mb = m;
        } else
                sb->sb_mb = m;

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

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

-#ifdef notdef
-sbappendrights(sb, rights, m0)
+int
+sbappendcontrol(sb, m0, control)

        struct sockbuf *sb;
        struct sockbuf *sb;

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

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

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

 
 

-       m = m0;
-       if (m == 0 || rights == 0)
-               panic("sbappendrights");
-       do {
+       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;
                space += m->m_len;

-               m = m->m_next;
-       } while (m);
-       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) {
        if (n = sb->sb_mb) {

-               while (n->m_act)
-                       n = n->m_act;
-               n->m_act = m;
+               while (n->m_nextpkt)
+                       n = n->m_nextpkt;
+               n->m_nextpkt = control;

        } else
        } else

-               n->m_act = m;
-       sballoc(sb, m0);
-       m->m_act = m0;
-       m = m0->m_next;
-       m0->m_next = 0;
-       sbcompress(sb, m, m0);
+               sb->sb_mb = control;

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

-#endif

 
 /*
  * Compress mbuf chain m into the socket
  * buffer sb following mbuf n.  If n
  * is null, the buffer is presumed empty.
  */
 
 /*
  * Compress mbuf chain m into the socket
  * buffer sb following mbuf n.  If n
  * is null, the buffer is presumed empty.
  */

-sbcompress(sb, m, n)
+void
+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_off <= MMAXOFF && m->m_off <= MMAXOFF &&
-                   (n->m_off + n->m_len + m->m_len) <= MMAXOFF) {
+               if (n && (n->m_flags & M_EXT) == 0 &&
+                   (n->m_data + n->m_len + m->m_len) < &n->m_dat[MLEN] &&
+                   n->m_type == m->m_type) {

                        bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
                            (unsigned)m->m_len);
                        n->m_len += m->m_len;
                        bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
                            (unsigned)m->m_len);
                        n->m_len += m->m_len;


@@ -543,37 +650,49 @@ 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");
+       }

 }
 
 /*
  * Free all mbufs in a sockbuf.
  * Check that all resources are reclaimed.
  */
 }
 
 /*
  * Free all mbufs in a sockbuf.
  * Check that all resources are reclaimed.
  */

+void

 sbflush(sb)
        register struct sockbuf *sb;
 {
 
        if (sb->sb_flags & SB_LOCK)
                panic("sbflush");
 sbflush(sb)
        register struct sockbuf *sb;
 {
 
        if (sb->sb_flags & SB_LOCK)
                panic("sbflush");

-       if (sb->sb_cc)
-               sbdrop(sb, sb->sb_cc);
-       if (sb->sb_cc || sb->sb_mbcnt || sb->sb_mb)
+       while (sb->sb_mbcnt)
+               sbdrop(sb, (int)sb->sb_cc);
+       if (sb->sb_cc || sb->sb_mb)

                panic("sbflush 2");
 }
 
 /*
  * Drop data from (the front of) a sockbuf.
  */
                panic("sbflush 2");
 }
 
 /*
  * Drop data from (the front of) a sockbuf.
  */

-struct mbuf *
+void

 sbdrop(sb, len)
        register struct sockbuf *sb;
        register int len;
 sbdrop(sb, len)
        register struct sockbuf *sb;
        register int len;


@@ -581,18 +700,18 @@ sbdrop(sb, len)
        register struct mbuf *m, *mn;
        struct mbuf *next;
 
        register struct mbuf *m, *mn;
        struct mbuf *next;
 

-       next = (m = sb->sb_mb) ? m->m_act : 0;
+       next = (m = sb->sb_mb) ? m->m_nextpkt : 0;

        while (len > 0) {
                if (m == 0) {
                        if (next == 0)
                                panic("sbdrop");
                        m = next;
        while (len > 0) {
                if (m == 0) {
                        if (next == 0)
                                panic("sbdrop");
                        m = next;

-                       next = m->m_act;
+                       next = m->m_nextpkt;

                        continue;
                }
                if (m->m_len > len) {
                        m->m_len -= len;
                        continue;
                }
                if (m->m_len > len) {
                        m->m_len -= len;

-                       m->m_off += len;
+                       m->m_data += len;

                        sb->sb_cc -= len;
                        break;
                }
                        sb->sb_cc -= len;
                        break;
                }


@@ -608,17 +727,16 @@ sbdrop(sb, len)
        }
        if (m) {
                sb->sb_mb = m;
        }
        if (m) {
                sb->sb_mb = m;

-               m->m_act = next;
+               m->m_nextpkt = next;

        } else
                sb->sb_mb = next;
        } else
                sb->sb_mb = next;

-       return (sb->sb_mb);

 }
 
 /*
  * Drop a record off the front of a sockbuf
  * and move the next record to the front.
  */
 }
 
 /*
  * Drop a record off the front of a sockbuf
  * and move the next record to the front.
  */

-struct mbuf *
+void

 sbdroprecord(sb)
        register struct sockbuf *sb;
 {
 sbdroprecord(sb)
        register struct sockbuf *sb;
 {


@@ -626,11 +744,10 @@ sbdroprecord(sb)
 
        m = sb->sb_mb;
        if (m) {
 
        m = sb->sb_mb;
        if (m) {

-               sb->sb_mb = m->m_act;
+               sb->sb_mb = m->m_nextpkt;

                do {
                        sbfree(sb, m);
                        MFREE(m, mn);
                } while (m = mn);
        }
                do {
                        sbfree(sb, m);
                        MFREE(m, mn);
                } while (m = mn);
        }

-       return (sb->sb_mb);

 }
 }