getting reassembly to work

[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 120ae96..dc2ec8c 100644 (file)
--- a/usr/src/sys/kern/uipc_socket2.c
+++ b/usr/src/sys/kern/uipc_socket2.c
@@ -1,4 +1,4 @@
-/*     uipc_socket2.c  4.3     81/11/18        */
+/*     uipc_socket2.c  4.20    82/01/19        */

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


@@ -12,8 +12,8 @@
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

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

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


@@ -21,8 +21,22 @@
 
 /*
  * Procedures to manipulate state flags of socket
 
 /*
  * Procedures to manipulate state flags of socket

- * and do appropriate wakeups.
+ * and do appropriate wakeups.  Normal sequence is that
+ * soisconnecting() is called during processing of connect() call,
+ * resulting in an eventual call to soisconnected() if/when the
+ * connection is established.  When the connection is torn down
+ * soisdisconnecting() is called during processing of disconnect() call,
+ * and soisdisconnected() is called when the connection to the peer
+ * is totally severed.  The semantics of these routines are such that
+ * connectionless protocols can call soisconnected() and soisdisconnected()
+ * only, bypassing the in-progress calls when setting up a ``connection''
+ * takes no time.
+ *
+ * When higher level protocols are implemented in
+ * the kernel, the wakeups done here will sometimes
+ * be implemented as software-interrupt process scheduling.

  */
  */

+

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


@@ -39,15 +53,19 @@ soisconnected(so)
        so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTED;
        wakeup((caddr_t)&so->so_timeo);
        so->so_state &= ~(SS_ISCONNECTING|SS_ISDISCONNECTING);
        so->so_state |= SS_ISCONNECTED;
        wakeup((caddr_t)&so->so_timeo);

+       sorwakeup(so);
+       sowwakeup(so);

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

-       so->so_state &= ~(SS_ISCONNECTED|SS_ISCONNECTING);
+       so->so_state &= ~SS_ISCONNECTING;

        so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
        wakeup((caddr_t)&so->so_timeo);
        so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE);
        wakeup((caddr_t)&so->so_timeo);

+       sowwakeup(so);
+       sorwakeup(so);

 }
 
 soisdisconnected(so)
 }
 
 soisdisconnected(so)


@@ -61,6 +79,16 @@ soisdisconnected(so)
        sorwakeup(so);
 }
 
        sorwakeup(so);
 }
 

+/*
+ * Socantsendmore indicates that no more data will be sent on the
+ * socket; it would normally be applied to a socket when the user
+ * informs the system that no more data is to be sent, by the protocol
+ * code (in case PRU_SHUTDOWN).  Socantrcvmore indicates that no more data
+ * will be received, and will normally be applied to the socket by a
+ * protocol when it detects that the peer will send no more data.
+ * Data queued for reading in the socket may yet be read.
+ */
+

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


@@ -78,23 +106,38 @@ socantrcvmore(so)
 }
 
 /*
 }
 
 /*

- * Select a socket.
+ * Socket select/wakeup routines.

  */
  */

-soselect(so, flag)
+
+/*
+ * Interface routine to select() system
+ * call for sockets.
+ */
+soselect(so, rw)

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

-       int flag;
+       int rw;

 {
 {

+       int s = splnet();
+
+       switch (rw) {

 
 

-       if (flag & FREAD) {
-               if (soreadable(so))
+       case FREAD:
+               if (soreadable(so)) {
+                       splx(s);

                        return (1);
                        return (1);

+               }

                sbselqueue(&so->so_rcv);
                sbselqueue(&so->so_rcv);

-       }
-       if (flag & FWRITE) {
-               if (sowriteable(so))
+               break;
+
+       case FWRITE:
+               if (sowriteable(so)) {
+                       splx(s);

                        return (1);
                        return (1);

+               }

                sbselqueue(&so->so_snd);
                sbselqueue(&so->so_snd);

+               break;

        }
        }

+       splx(s);

        return (0);
 }
 
        return (0);
 }
 


@@ -137,10 +180,48 @@ sbwakeup(sb)
        }
        if (sb->sb_flags & SB_WAIT) {
                sb->sb_flags &= ~SB_WAIT;
        }
        if (sb->sb_flags & SB_WAIT) {
                sb->sb_flags &= ~SB_WAIT;

-               wakeup((caddr_t)sb->sb_cc);
+               wakeup((caddr_t)&sb->sb_cc);

        }
 }
 
        }
 }
 

+/*
+ * Socket buffer (struct sockbuf) utility routines.
+ *
+ * Each socket contains two socket buffers: one for sending data and
+ * one for receiving data.  Each buffer contains a queue of mbufs,
+ * information about the number of mbufs and amount of data in the
+ * queue, and other fields allowing select() statements and notification
+ * on data availability to be implemented.
+ *
+ * Before using a new socket structure it is first necessary to reserve
+ * buffer space to the socket, by calling sbreserve.  This commits
+ * 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 routine sbappend() is normally called to append new mbufs
+ * to a socket buffer, after checking that adequate space is available
+ * comparing the function spspace() with the amount of data to be added.
+ * 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 when the data is acknowledged by the peer (or immediately
+ * in the case of unreliable protocols.)
+ *
+ * Protocols which do not require connections place both source address
+ * and data information in socket buffer queues.  The source addresses
+ * are stored in single mbufs after each data item, and are easily found
+ * as the data items are all marked with end of record markers.  The
+ * sbappendaddr() routine stores a datum and associated address in
+ * a socket buffer.  Note that, unlike sbappend(), this routine checks
+ * for the caller that there will be enough space to store the data.
+ * It fails if there is not enough space, or if it cannot find
+ * a mbuf to store the address in.
+ *
+ * The higher-level routines sosend and soreceive (in socket.c)
+ * also add data to, and remove data from socket buffers repectively.
+ */
+

 /*
  * Allot mbufs to a sockbuf.
  */
 /*
  * Allot mbufs to a sockbuf.
  */


@@ -148,10 +229,10 @@ sbreserve(sb, cc)
        struct sockbuf *sb;
 {
 
        struct sockbuf *sb;
 {
 

-       if (m_reserve(cc) == 0)
+       if (m_reserve((cc*2)/MSIZE) == 0)

                return (0);
                return (0);

-       sb->sb_cc = cc;
-       sb->sb_mbcnt = (cc*2)/MSIZE;
+       sb->sb_hiwat = cc;
+       sb->sb_mbmax = cc*2;

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


@@ -163,8 +244,8 @@ sbrelease(sb)
 {
 
        sbflush(sb);
 {
 
        sbflush(sb);

-       m_release(sb->sb_cc);
-       sb->sb_cc = sb->sb_mbcnt = 0;
+       m_release(sb->sb_mbmax/MSIZE);
+       sb->sb_hiwat = sb->sb_mbmax = 0;

 }
 
 /*
 }
 
 /*


@@ -182,13 +263,20 @@ sbappend(sb, m)
        register struct mbuf **np, *n;
 
        np = &sb->sb_mb;
        register struct mbuf **np, *n;
 
        np = &sb->sb_mb;

-       while ((n = *np) && n->m_next)
+       n = 0;
+       while (*np) {
+               n = *np;

                np = &n->m_next;
                np = &n->m_next;

+       }

        while (m) {
        while (m) {

+               if (m->m_len == 0 && (int)m->m_act == 0) {
+                       m = m_free(m);
+                       continue;
+               }

                if (n && n->m_off <= MMAXOFF && m->m_off <= MMAXOFF &&
                   (int)n->m_act == 0 && (int)m->m_act == 0 &&
                if (n && n->m_off <= MMAXOFF && m->m_off <= MMAXOFF &&
                   (int)n->m_act == 0 && (int)m->m_act == 0 &&

-                  (n->m_off + n->m_len + m->m_off) <= MMAXOFF) {
-                       bcopy(mtod(m, caddr_t), mtod(n, caddr_t),
+                  (n->m_off + n->m_len + m->m_len) <= MMAXOFF) {
+                       bcopy(mtod(m, caddr_t), mtod(n, caddr_t) + n->m_len,

                            (unsigned)m->m_len);
                        n->m_len += m->m_len;
                        sb->sb_cc += m->m_len;
                            (unsigned)m->m_len);
                        n->m_len += m->m_len;
                        sb->sb_cc += m->m_len;


@@ -203,6 +291,11 @@ sbappend(sb, m)
        }
 }
 
        }
 }
 

+/*
+ * Append data and address.
+ * Return 0 if no space in sockbuf or if
+ * can't get mbuf to stuff address in.
+ */

 sbappendaddr(sb, asa, m0)
        struct sockbuf *sb;
        struct sockaddr *asa;
 sbappendaddr(sb, asa, m0)
        struct sockbuf *sb;
        struct sockaddr *asa;


@@ -212,11 +305,20 @@ sbappendaddr(sb, asa, m0)
        register struct mbuf *m;
        register int len = sizeof (struct sockaddr);
 
        register struct mbuf *m;
        register int len = sizeof (struct sockaddr);
 

-       for (m = m0; m; m = m->m_next)
+       m = m0;
+       if (m == 0)
+               panic("sbappendaddr");
+       for (;;) {

                len += m->m_len;
                len += m->m_len;

+               if (m->m_next == 0) {
+                       m->m_act = (struct mbuf *)1;
+                       break;
+               }
+               m = m->m_next;
+       }

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

-       m = m_get(0);
+       m = m_get(M_DONTWAIT);

        if (m == 0)
                return (0);
        m->m_off = MMINOFF;
        if (m == 0)
                return (0);
        m->m_off = MMINOFF;


@@ -225,7 +327,6 @@ sbappendaddr(sb, asa, m0)
        *msa = *asa;
        m->m_act = (struct mbuf *)1;
        sbappend(sb, m);
        *msa = *asa;
        m->m_act = (struct mbuf *)1;
        sbappend(sb, m);

-       m0->m_act = (struct mbuf *)1;

        sbappend(sb, m0);
        return (1);
 }
        sbappend(sb, m0);
        return (1);
 }


@@ -240,7 +341,8 @@ sbflush(sb)
 
        if (sb->sb_flags & SB_LOCK)
                panic("sbflush");
 
        if (sb->sb_flags & SB_LOCK)
                panic("sbflush");

-       sbdrop(sb, sb->sb_cc);
+       if (sb->sb_cc)
+               sbdrop(sb, sb->sb_cc);

        if (sb->sb_cc || sb->sb_mbcnt || sb->sb_mb)
                panic("sbflush 2");
 }
        if (sb->sb_cc || sb->sb_mbcnt || sb->sb_mb)
                panic("sbflush 2");
 }


@@ -257,17 +359,31 @@ sbdrop(sb, len)
        while (len > 0) {
                if (m == 0)
                        panic("sbdrop");
        while (len > 0) {
                if (m == 0)
                        panic("sbdrop");

-               if (m->m_len <= len) {
-                       len -= m->m_len;
-                       sbfree(sb, m);
-                       MFREE(m, mn);
-                       m = mn;
-               } else {
+               if (m->m_len > len) {

                        m->m_len -= len;
                        m->m_off += len;
                        sb->sb_cc -= len;
                        break;
                }
                        m->m_len -= len;
                        m->m_off += len;
                        sb->sb_cc -= len;
                        break;
                }

+               len -= m->m_len;
+               sbfree(sb, m);
+               MFREE(m, mn);
+               m = mn;

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

+
+/*
+printm(m)
+       struct mbuf *m;
+{
+
+       printf("<");
+       while (m) {
+               printf("%d,", m->m_len);
+               m = m->m_next;
+       }
+       printf(">");
+       printf("\n");
+}
+*/