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.205.2.1
retrieving revision 1.211.2.3
diff -u -p -r1.205.2.1 -r1.211.2.3
--- src/sys/kern/uipc_socket.c	2012/04/17 00:08:30	1.205.2.1
+++ src/sys/kern/uipc_socket.c	2013/06/23 06:18:58	1.211.2.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.205.2.1 2012/04/17 00:08:30 yamt Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.211.2.3 2013/06/23 06:18:58 tls Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.205.2.1 2012/04/17 00:08:30 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.211.2.3 2013/06/23 06:18:58 tls Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
@@ -160,7 +160,7 @@ static void sopendfree_thread(void *);
 static kcondvar_t pendfree_thread_cv;
 static lwp_t *sopendfree_lwp;
 
-static void sysctl_kern_somaxkva_setup(void);
+static void sysctl_kern_socket_setup(void);
 static struct sysctllog *socket_sysctllog;
 
 static vsize_t
@@ -453,7 +453,7 @@ void
 soinit(void)
 {
 
-	sysctl_kern_somaxkva_setup();
+	sysctl_kern_socket_setup();
 
 	mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
 	softnet_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
@@ -538,6 +538,7 @@ socreate(int dom, struct socket **aso, i
 		lock = lockso->so_lock;
 		so->so_lock = lock;
 		mutex_obj_hold(lock);
+		/* XXX Why is this not solock, to match sounlock? */
 		mutex_enter(lock);
 	} else {
 		/* Lock assigned and taken during PRU_ATTACH. */
@@ -585,6 +586,8 @@ fsocreate(int domain, struct socket **so
 		fp->f_data = so;
 		fd_affix(curproc, fp, fd);
 		*fdout = fd;
+		if (flags & SOCK_NONBLOCK)
+			so->so_state |= SS_NBIO;
 	}
 	return error;
 }
@@ -874,12 +877,10 @@ sosend(struct socket *so, struct mbuf *a
 	struct mbuf *control, int flags, struct lwp *l)
 {
 	struct mbuf	**mp, *m;
-	struct proc	*p;
 	long		space, len, resid, clen, mlen;
 	int		error, s, dontroute, atomic;
 	short		wakeup_state = 0;
 
-	p = l->l_proc;
 	clen = 0;
 
 	/*
@@ -1132,7 +1133,8 @@ soreceive(struct socket *so, struct mbuf
 {
 	struct lwp *l = curlwp;
 	struct mbuf	*m, **mp, *mt;
-	int atomic, flags, len, error, s, offset, moff, type, orig_resid;
+	size_t len, offset, moff, orig_resid;
+	int atomic, flags, error, s, type;
 	const struct protosw	*pr;
 	struct mbuf	*nextrecord;
 	int		mbuf_removed = 0;
@@ -1165,7 +1167,7 @@ soreceive(struct socket *so, struct mbuf
 			goto bad;
 		do {
 			error = uiomove(mtod(m, void *),
-			    (int) min(uio->uio_resid, m->m_len), uio);
+			    MIN(uio->uio_resid, m->m_len), uio);
 			m = m_free(m);
 		} while (uio->uio_resid > 0 && error == 0 && m);
  bad:
@@ -1419,7 +1421,7 @@ soreceive(struct socket *so, struct mbuf
 			SBLASTMBUFCHK(&so->so_rcv, "soreceive uiomove");
 			sounlock(so);
 			splx(s);
-			error = uiomove(mtod(m, char *) + moff, (int)len, uio);
+			error = uiomove(mtod(m, char *) + moff, len, uio);
 			s = splsoftnet();
 			solock(so);
 			if (error != 0) {
@@ -2365,6 +2367,7 @@ sopoll(struct socket *so, int events)
 #include <sys/sysctl.h>
 
 static int sysctl_kern_somaxkva(SYSCTLFN_PROTO);
+static int sysctl_kern_sbmax(SYSCTLFN_PROTO);
 
 /*
  * sysctl helper routine for kern.somaxkva.  ensures that the given
@@ -2395,8 +2398,32 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS)
 	return (error);
 }
 
+/*
+ * sysctl helper routine for kern.sbmax. Basically just ensures that
+ * any new value is not too small.
+ */
+static int
+sysctl_kern_sbmax(SYSCTLFN_ARGS)
+{
+	int error, new_sbmax;
+	struct sysctlnode node;
+
+	new_sbmax = sb_max;
+	node = *rnode;
+	node.sysctl_data = &new_sbmax;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return (error);
+
+	KERNEL_LOCK(1, NULL);
+	error = sb_max_set(new_sbmax);
+	KERNEL_UNLOCK_ONE(NULL);
+
+	return (error);
+}
+
 static void
-sysctl_kern_somaxkva_setup(void)
+sysctl_kern_socket_setup(void)
 {
 
 	KASSERT(socket_sysctllog == NULL);
@@ -2413,4 +2440,11 @@ sysctl_kern_somaxkva_setup(void)
 				    "used for socket buffers"),
 		       sysctl_kern_somaxkva, 0, NULL, 0,
 		       CTL_KERN, KERN_SOMAXKVA, CTL_EOL);
+
+	sysctl_createv(&socket_sysctllog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+		       CTLTYPE_INT, "sbmax",
+		       SYSCTL_DESCR("Maximum socket buffer size"),
+		       sysctl_kern_sbmax, 0, NULL, 0,
+		       CTL_KERN, KERN_SBMAX, CTL_EOL);
 }