Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.36
retrieving revision 1.40
diff -u -p -r1.36 -r1.40
--- src/sys/kern/uipc_socket.c	1998/07/31 22:50:52	1.36
+++ src/sys/kern/uipc_socket.c	1998/12/16 00:26:10	1.40
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.36 1998/07/31 22:50:52 perry Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.40 1998/12/16 00:26:10 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -50,6 +50,17 @@
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
+#include <sys/pool.h>
+
+struct pool socket_pool;
+
+void
+soinit()
+{
+
+	pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0,
+	    "sockpl", 0, NULL, NULL, M_SOCKET);
+}
 
 /*
  * Socket operation routines.
@@ -70,6 +81,7 @@ socreate(dom, aso, type, proto)
 	register struct protosw *prp;
 	register struct socket *so;
 	register int error;
+	int s;
 
 	if (proto)
 		prp = pffindproto(dom, proto, type);
@@ -79,8 +91,9 @@ socreate(dom, aso, type, proto)
 		return (EPROTONOSUPPORT);
 	if (prp->pr_type != type)
 		return (EPROTOTYPE);
-	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
-	bzero((caddr_t)so, sizeof(*so));
+	s = splsoftnet();
+	so = pool_get(&socket_pool, PR_WAITOK);
+	memset((caddr_t)so, 0, sizeof(*so));
 	TAILQ_INIT(&so->so_q0);
 	TAILQ_INIT(&so->so_q);
 	so->so_type = type;
@@ -92,6 +105,7 @@ socreate(dom, aso, type, proto)
 	if (error) {
 		so->so_state |= SS_NOFDREF;
 		sofree(so);
+		splx(s);
 		return (error);
 	}
 #ifdef COMPAT_SUNOS
@@ -101,6 +115,7 @@ socreate(dom, aso, type, proto)
 			so->so_options |= SO_BROADCAST;
 	}
 #endif
+	splx(s);
 	*aso = so;
 	return (0);
 }
@@ -156,7 +171,7 @@ sofree(so)
 	}
 	sbrelease(&so->so_snd);
 	sorflush(so);
-	FREE(so, M_SOCKET);
+	pool_put(&socket_pool, so);
 }
 
 /*
@@ -465,6 +480,8 @@ nopages:
 		    } while (space > 0 && atomic);
 		    if (dontroute)
 			    so->so_options |= SO_DONTROUTE;
+		    if (resid > 0)
+			    so->so_state |= SS_MORETOCOME;
 		    s = splsoftnet();				/* XXX */
 		    error = (*so->so_proto->pr_usrreq)(so,
 			(flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
@@ -472,6 +489,8 @@ nopages:
 		    splx(s);
 		    if (dontroute)
 			    so->so_options &= ~SO_DONTROUTE;
+		    if (resid > 0)
+			    so->so_state &= ~SS_MORETOCOME;
 		    clen = 0;
 		    control = 0;
 		    top = 0;
@@ -842,7 +861,7 @@ sorflush(so)
 	socantrcvmore(so);
 	sbunlock(sb);
 	asb = *sb;
-	bzero((caddr_t)sb, sizeof(*sb));
+	memset((caddr_t)sb, 0, sizeof(*sb));
 	splx(s);
 	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
 		(*pr->pr_domain->dom_dispose)(asb.sb_mb);