new calling convension for system calls

[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 6885cfb..27e8792 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,19 +1,29 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986, 1988, 1990 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)uipc_socket2.c      6.13 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)uipc_socket2.c      7.12 (Berkeley) %G%

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

-#include "dir.h"

 #include "user.h"
 #include "proc.h"
 #include "file.h"
 #include "user.h"
 #include "proc.h"
 #include "file.h"

-#include "inode.h"

 #include "buf.h"
 #include "buf.h"

+#include "malloc.h"

 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"
 #include "mbuf.h"
 #include "protosw.h"
 #include "socket.h"


@@ -23,6 +33,13 @@
  * 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


@@ -59,7 +76,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)


@@ -67,18 +83,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)


@@ -109,37 +124,46 @@ 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);

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


@@ -147,16 +171,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)


@@ -171,7 +199,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;
        }


@@ -223,7 +251,7 @@ socantrcvmore(so)
 sbselqueue(sb)
        struct sockbuf *sb;
 {
 sbselqueue(sb)
        struct sockbuf *sb;
 {

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

 
        if ((p = sb->sb_sel) && p->p_wchan == (caddr_t)&selwait)
                sb->sb_flags |= SB_COLL;
 
        if ((p = sb->sb_sel) && p->p_wchan == (caddr_t)&selwait)
                sb->sb_flags |= SB_COLL;


@@ -239,15 +267,41 @@ sbwait(sb)
 {
 
        sb->sb_flags |= SB_WAIT;
 {
 
        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));
+}
+
+/* 
+ * Lock a sockbuf already known to be locked;
+ * return any error returned from sleep (EINTR).
+ */
+sb_lock(sb)
+       register struct sockbuf *sb;
+{
+       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 processes waiting on a socket buffer.
 }
 
 /*
  * Wakeup processes waiting on a socket buffer.

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

  */
  */

-sbwakeup(sb)
+sowakeup(so, sb)
+       register struct socket *so;

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

+       struct proc *p;

 
        if (sb->sb_sel) {
                selwakeup(sb->sb_sel, sb->sb_flags & SB_COLL);
 
        if (sb->sb_sel) {
                selwakeup(sb->sb_sel, sb->sb_flags & SB_COLL);


@@ -258,24 +312,10 @@ sbwakeup(sb)
                sb->sb_flags &= ~SB_WAIT;
                wakeup((caddr_t)&sb->sb_cc);
        }
                sb->sb_flags &= ~SB_WAIT;
                wakeup((caddr_t)&sb->sb_cc);
        }

-}
-
-/*
- * Wakeup socket readers and writers.
- * Do asynchronous notification via SIGIO
- * if the socket has the SS_ASYNC flag set.
- */
-sowakeup(so, sb)
-       register struct socket *so;
-       struct sockbuf *sb;
-{
-       register struct proc *p;
-
-       sbwakeup(sb);

        if (so->so_state & SS_ASYNC) {
        if (so->so_state & SS_ASYNC) {

-               if (so->so_pgrp < 0)
-                       gsignal(-so->so_pgrp, SIGIO);
-               else if (so->so_pgrp > 0 && (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);
        }
 }


@@ -291,7 +331,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:
  *


@@ -306,21 +346,27 @@ 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.
+ * socket (currently, it does nothing but enforce limits).  The space
+ * should be released by calling sbrelease() when the socket is destroyed.

  */
 
 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);


@@ -330,17 +376,20 @@ 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.

  */
 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);
 }
 
        return (1);
 }
 


@@ -395,10 +444,14 @@ sbappend(sb, m)
        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_nextpkt)
+                       n = n->m_nextpkt;

                while (n->m_next)
                while (n->m_next)

-                       n = n->m_next;
+                       if (n->m_flags & M_EOR) {
+                               sbappendrecord(sb, m); /* XXXXXX!!!! */
+                               return;
+                       } else
+                               n = n->m_next;

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


@@ -416,94 +469,145 @@ 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;
        m0->m_next = 0;
        else
                sb->sb_mb = m0;
        m = m0->m_next;
        m0->m_next = 0;

+       if (m && (m0->m_flags & M_EOR)) {
+               m0->m_flags &= ~M_EOR;
+               m->m_flags |= M_EOR;
+       }
+       sbcompress(sb, m, m0);
+}
+
+/*
+ * 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.
+        */
+       sballoc(sb, m0);
+       m0->m_nextpkt = *mp;
+       *mp = m0;
+       m = m0->m_next;
+       m0->m_next = 0;
+       if (m && (m0->m_flags & M_EOR)) {
+               m0->m_flags &= ~M_EOR;
+               m->m_flags |= M_EOR;
+       }

        sbcompress(sb, m, m0);
 }
 
 /*
        sbcompress(sb, m, 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.
+ * 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.

  */
  */

-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 *rights0, *m0;
+       struct mbuf *m0, *control;

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

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

 
 

-       for (m = m0; m; m = m->m_next)
-               space += m->m_len;
-       if (rights0)
-               space += rights0->m_len;
+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);

+       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);
-       }
-       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)
+               sballoc(sb, n);

        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_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;
        int space = 0;
 
 {
        register struct mbuf *m, *n;
        int space = 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)
+               sballoc(sb, m);

        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

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

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


@@ -516,14 +620,16 @@ sbcompress(sb, m, n)
        register struct sockbuf *sb;
        register struct mbuf *m, *n;
 {
        register struct sockbuf *sb;
        register struct mbuf *m, *n;
 {

+       register int eor = 0;

 
        while (m) {
 
        while (m) {

+               eor |= m->m_flags & M_EOR;

                if (m->m_len == 0) {
                        m = m_free(m);
                        continue;
                }
                if (m->m_len == 0) {
                        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 | M_EOR)) == 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_type == m->m_type) {
                        bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,
                            (unsigned)m->m_len);


@@ -532,15 +638,18 @@ sbcompress(sb, m, n)
                        m = m_free(m);
                        continue;
                }
                        m = m_free(m);
                        continue;
                }

-               sballoc(sb, m);

                if (n)
                        n->m_next = m;
                else
                        sb->sb_mb = m;
                if (n)
                        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 (n)
+               n->m_flags |= eor;

 }
 
 /*
 }
 
 /*


@@ -553,16 +662,15 @@ sbflush(sb)
 
        if (sb->sb_flags & SB_LOCK)
                panic("sbflush");
 
        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 *

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


@@ -570,18 +678,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;
                }


@@ -597,17 +705,15 @@ 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 *

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


@@ -615,11 +721,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);

 }
 }