no more opt parameter to usrreq

[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 40609e3..6eaf141 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.28    82/10/09        */
+/*     uipc_socket2.c  4.35    83/01/13        */

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


@@ -112,21 +112,22 @@ sonewconn(head)
 
        if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)
                goto bad;
 
        if (head->so_qlen + head->so_q0len > 3 * head->so_qlimit / 2)
                goto bad;

-       m = m_getclr(M_DONTWAIT);
-       if (m == 0)
+       m = m_getclr(M_DONTWAIT, MT_SOCKET);
+       if (m == NULL)

                goto bad;
        so = mtod(m, struct socket *);
        so->so_type = head->so_type;
        so->so_options = head->so_options &~ SO_ACCEPTCONN;
        so->so_linger = head->so_linger;
                goto bad;
        so = mtod(m, struct socket *);
        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;
+       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_proto = head->so_proto;
        so->so_timeo = head->so_timeo;
        so->so_pgrp = head->so_pgrp;
        soqinsque(head, so, 0);

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

                (void) soqremque(so, 0);
                (void) soqremque(so, 0);

-               m_free(m);
+               (void) m_free(m);

                goto bad;
        }
        return (so);
                goto bad;
        }
        return (so);


@@ -322,6 +323,22 @@ sbwakeup(sb)
  * also add data to, and remove data from socket buffers repectively.
  */
 
  * also add data to, and remove data from socket buffers repectively.
  */
 

+soreserve(so, sndcc, rcvcc)
+       struct socket *so;
+       int sndcc, rcvcc;
+{
+
+       if (sbreserve(&so->so_snd, sndcc) == 0)
+               goto bad;
+       if (sbreserve(&so->so_rcv, rcvcc) == 0)
+               goto bad2;
+       return (0);
+bad2:
+       sbrelease(&so->so_snd);
+bad:
+       return (ENOBUFS);
+}
+

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


@@ -331,6 +348,7 @@ sbreserve(sb, cc)
 
        /* someday maybe this routine will fail... */
        sb->sb_hiwat = cc;
 
        /* someday maybe this routine will fail... */
        sb->sb_hiwat = cc;

+       /* the 2 implies names can be no more than 1 mbuf each */

        sb->sb_mbmax = cc*2;
        return (1);
 }
        sb->sb_mbmax = cc*2;
        return (1);
 }


@@ -417,7 +435,7 @@ sbappendaddr(sb, asa, m0)
        }
        if (len > sbspace(sb))
                return (0);
        }
        if (len > sbspace(sb))
                return (0);

-       m = m_get(M_DONTWAIT);
+       m = m_get(M_DONTWAIT, MT_SONAME);

        if (m == 0)
                return (0);
        m->m_len = sizeof (struct sockaddr);
        if (m == 0)
                return (0);
        m->m_len = sizeof (struct sockaddr);


@@ -429,6 +447,28 @@ sbappendaddr(sb, asa, m0)
        return (1);
 }
 
        return (1);
 }
 

+#ifdef notdef
+SBCHECK(sb, str)
+       struct sockbuf *sb;
+       char *str;
+{
+       register int cnt = sb->sb_cc;
+       register int mbcnt = sb->sb_mbcnt;
+       register struct mbuf *m;
+
+       for (m = sb->sb_mb; m; m = m->m_next) {
+               cnt -= m->m_len;
+               mbcnt -= MSIZE;
+               if (m->m_off > MMAXOFF)
+                       mbcnt -= CLBYTES;
+       }
+       if (cnt || mbcnt) {
+               printf("cnt %d mbcnt %d\n", cnt, mbcnt);
+               panic(str);
+       }
+}
+#endif
+

 /*
  * Free all mbufs on a sockbuf mbuf chain.
  * Check that resource allocations return to 0.
 /*
  * Free all mbufs on a sockbuf mbuf chain.
  * Check that resource allocations return to 0.