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.73
retrieving revision 1.78
diff -u -p -r1.73 -r1.78
--- src/sys/kern/uipc_socket.c	2002/11/26 18:44:35	1.73
+++ src/sys/kern/uipc_socket.c	2003/02/26 06:31:11	1.78
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.73 2002/11/26 18:44:35 christos Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.78 2003/02/26 06:31:11 matt Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.73 2002/11/26 18:44:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.78 2003/02/26 06:31:11 matt Exp $");
 
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
@@ -97,6 +97,9 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
 
 struct pool	socket_pool;
 
+MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options");
+MALLOC_DEFINE(M_SONAME, "soname", "socket name");
+
 extern int	somaxconn;			/* patchable (XXX sysctl) */
 int		somaxconn = SOMAXCONN;
 
@@ -151,7 +154,7 @@ int sokvawaiters;
 #define	SOCK_LOAN_CHUNK		65536
 
 static void
-sodoloanfree(caddr_t buf, u_int size)
+sodoloanfree(caddr_t buf, size_t size)
 {
 	struct vm_page **pgs;
 	vaddr_t va, sva, eva;
@@ -221,7 +224,7 @@ sodopendfree(struct socket *so)
 }
 
 static void
-soloanfree(struct mbuf *m, caddr_t buf, u_int size, void *arg)
+soloanfree(struct mbuf *m, caddr_t buf, size_t size, void *arg)
 {
 	struct socket *so = arg;
 	int s;
@@ -342,6 +345,11 @@ socreate(int dom, struct socket **aso, i
 	so->so_proto = prp;
 	so->so_send = sosend;
 	so->so_receive = soreceive;
+#ifdef MBUFTRACE
+	so->so_rcv.sb_mowner = &prp->pr_domain->dom_mowner;
+	so->so_snd.sb_mowner = &prp->pr_domain->dom_mowner;
+	so->so_mowner = &prp->pr_domain->dom_mowner;
+#endif
 	if (p != 0)
 		so->so_uid = p->p_ucred->cr_uid;
 	error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0,
@@ -678,14 +686,15 @@ sosend(struct socket *so, struct mbuf *a
 					top->m_flags |= M_EOR;
 			} else do {
 				if (top == 0) {
-					MGETHDR(m, M_WAIT, MT_DATA);
+					m = m_gethdr(M_WAIT, MT_DATA);
 					mlen = MHLEN;
 					m->m_pkthdr.len = 0;
 					m->m_pkthdr.rcvif = (struct ifnet *)0;
 				} else {
-					MGET(m, M_WAIT, MT_DATA);
+					m = m_get(M_WAIT, MT_DATA);
 					mlen = MLEN;
 				}
+				MCLAIM(m, so->so_snd.sb_mowner);
 				if (use_sosend_loan &&
 				    uio->uio_iov->iov_len >= SOCK_LOAN_THRESH &&
 				    space >= SOCK_LOAN_THRESH &&
@@ -697,7 +706,7 @@ sosend(struct socket *so, struct mbuf *a
 				}
 				if (resid >= MINCLSIZE && space >= MCLBYTES) {
 					SOSEND_COUNTER_INCR(&sosend_copy_big);
-					MCLGET(m, M_WAIT);
+					m_clget(m, M_WAIT);
 					if ((m->m_flags & M_EXT) == 0)
 						goto nopages;
 					mlen = MCLBYTES;
@@ -1341,11 +1350,13 @@ sosetopt(struct socket *so, int level, i
 				goto bad;
 			}
 			tv = mtod(m, struct timeval *);
-			if (tv->tv_sec * hz + tv->tv_usec / tick > SHRT_MAX) {
+			if (tv->tv_sec > (SHRT_MAX - tv->tv_usec / tick) / hz) {
 				error = EDOM;
 				goto bad;
 			}
 			val = tv->tv_sec * hz + tv->tv_usec / tick;
+			if (val == 0 && tv->tv_usec != 0)
+				val = 1;
 
 			switch (optname) {