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.176
retrieving revision 1.185
diff -u -p -r1.176 -r1.185
--- src/sys/kern/uipc_socket.c	2008/10/12 09:26:50	1.176
+++ src/sys/kern/uipc_socket.c	2009/01/21 06:59:29	1.185
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.176 2008/10/12 09:26:50 plunky Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.185 2009/01/21 06:59:29 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -63,9 +63,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.176 2008/10/12 09:26:50 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.185 2009/01/21 06:59:29 yamt Exp $");
 
-#include "opt_inet.h"
+#include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
@@ -93,6 +93,11 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket.
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 
+#ifdef COMPAT_50
+#include <compat/sys/time.h>
+#include <compat/sys/socket.h>
+#endif
+
 #include <uvm/uvm.h>
 
 MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options");
@@ -151,6 +156,9 @@ static kcondvar_t socurkva_cv;
 static size_t sodopendfree(void);
 static size_t sodopendfreel(void);
 
+static void sysctl_kern_somaxkva_setup(void);
+static struct sysctllog *socket_sysctllog;
+
 static vsize_t
 sokvareserve(struct socket *so, vsize_t len)
 {
@@ -424,6 +432,8 @@ void
 soinit(void)
 {
 
+	sysctl_kern_somaxkva_setup();
+
 	mutex_init(&so_pendfree_lock, MUTEX_DEFAULT, IPL_VM);
 	softnet_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&socurkva_cv, "sokva");
@@ -615,9 +625,9 @@ sofree(struct socket *so)
 	KASSERT(!cv_has_waiters(&so->so_snd.sb_cv));
 	sorflush(so);
 	refs = so->so_aborting;	/* XXX */
-	/* remove acccept filter if one is present. */
+	/* Remove acccept filter if one is present. */
 	if (so->so_accf != NULL)
-		do_setopt_accept_filter(so, NULL);
+		(void)accept_filt_clear(so);
 	sounlock(so);
 	if (refs == 0)		/* XXX */
 		soput(so);
@@ -670,7 +680,7 @@ soclose(struct socket *so)
 			if ((so->so_state & SS_ISDISCONNECTING) && so->so_nbio)
 				goto drop;
 			while (so->so_state & SS_ISCONNECTED) {
-				error = sowait(so, so->so_linger * hz);
+				error = sowait(so, true, so->so_linger * hz);
 				if (error)
 					break;
 			}
@@ -1572,33 +1582,33 @@ sorflush(struct socket *so)
 static int
 sosetopt1(struct socket *so, const struct sockopt *sopt)
 {
-	int error, optval;
+	int error = EINVAL, optval, opt;
 	struct linger l;
 	struct timeval tv;
 
-	switch (sopt->sopt_name) {
+	switch ((opt = sopt->sopt_name)) {
 
 	case SO_ACCEPTFILTER:
-		error = do_setopt_accept_filter(so, sopt);
-		if (error)
-			return error;
+		error = accept_filt_setopt(so, sopt);
+		KASSERT(solocked(so));
 		break;
 
   	case SO_LINGER:
  		error = sockopt_get(sopt, &l, sizeof(l));
+		solock(so);
  		if (error)
- 			return (error);
- 
+ 			break;
  		if (l.l_linger < 0 || l.l_linger > USHRT_MAX ||
- 		    l.l_linger > (INT_MAX / hz))
-			return EDOM;
+ 		    l.l_linger > (INT_MAX / hz)) {
+			error = EDOM;
+			break;
+		}
  		so->so_linger = l.l_linger;
  		if (l.l_onoff)
  			so->so_options |= SO_LINGER;
  		else
  			so->so_options &= ~SO_LINGER;
- 
-  		break;
+   		break;
 
 	case SO_DEBUG:
 	case SO_KEEPALIVE:
@@ -1609,14 +1619,17 @@ sosetopt1(struct socket *so, const struc
 	case SO_REUSEPORT:
 	case SO_OOBINLINE:
 	case SO_TIMESTAMP:
+#ifdef SO_OTIMESTAMP
+	case SO_OTIMESTAMP:
+#endif
 		error = sockopt_getint(sopt, &optval);
+		solock(so);
 		if (error)
-			return (error);
-
+			break;
 		if (optval)
-			so->so_options |= sopt->sopt_name;
+			so->so_options |= opt;
 		else
-			so->so_options &= ~sopt->sopt_name;
+			so->so_options &= ~opt;
 		break;
 
 	case SO_SNDBUF:
@@ -1624,28 +1637,33 @@ sosetopt1(struct socket *so, const struc
 	case SO_SNDLOWAT:
 	case SO_RCVLOWAT:
 		error = sockopt_getint(sopt, &optval);
+		solock(so);
 		if (error)
-			return (error);
+			break;
 
 		/*
 		 * Values < 1 make no sense for any of these
 		 * options, so disallow them.
 		 */
-		if (optval < 1)
-			return EINVAL;
+		if (optval < 1) {
+			error = EINVAL;
+			break;
+		}
 
-		switch (sopt->sopt_name) {
+		switch (opt) {
 		case SO_SNDBUF:
-			if (sbreserve(&so->so_snd, (u_long)optval, so) == 0)
-				return ENOBUFS;
-
+			if (sbreserve(&so->so_snd, (u_long)optval, so) == 0) {
+				error = ENOBUFS;
+				break;
+			}
 			so->so_snd.sb_flags &= ~SB_AUTOSIZE;
 			break;
 
 		case SO_RCVBUF:
-			if (sbreserve(&so->so_rcv, (u_long)optval, so) == 0)
-				return ENOBUFS;
-
+			if (sbreserve(&so->so_rcv, (u_long)optval, so) == 0) {
+				error = ENOBUFS;
+				break;
+			}
 			so->so_rcv.sb_flags &= ~SB_AUTOSIZE;
 			break;
 
@@ -1669,20 +1687,38 @@ sosetopt1(struct socket *so, const struc
 		}
 		break;
 
+#ifdef COMPAT_50
+	case SO_OSNDTIMEO:
+	case SO_ORCVTIMEO: {
+		struct timeval50 otv;
+		error = sockopt_get(sopt, &otv, sizeof(otv));
+		if (error)
+			break;
+		timeval50_to_timeval(&otv, &tv);
+		opt = opt == SO_OSNDTIMEO ? SO_SNDTIMEO : SO_RCVTIMEO;
+		error = 0;
+		/*FALLTHROUGH*/
+	}
+#endif /* COMPAT_50 */
+
 	case SO_SNDTIMEO:
 	case SO_RCVTIMEO:
-		error = sockopt_get(sopt, &tv, sizeof(tv));
 		if (error)
-			return (error);
+			error = sockopt_get(sopt, &tv, sizeof(tv));
+		solock(so);
+		if (error)
+			break;
 
-		if (tv.tv_sec > (INT_MAX - tv.tv_usec / tick) / hz)
-			return EDOM;
+		if (tv.tv_sec > (INT_MAX - tv.tv_usec / tick) / hz) {
+			error = EDOM;
+			break;
+		}
 
 		optval = tv.tv_sec * hz + tv.tv_usec / tick;
 		if (optval == 0 && tv.tv_usec != 0)
 			optval = 1;
 
-		switch (sopt->sopt_name) {
+		switch (opt) {
 		case SO_SNDTIMEO:
 			so->so_snd.sb_timeo = optval;
 			break;
@@ -1693,9 +1729,12 @@ sosetopt1(struct socket *so, const struc
 		break;
 
 	default:
-		return ENOPROTOOPT;
+		solock(so);
+		error = ENOPROTOOPT;
+		break;
 	}
-	return 0;
+	KASSERT(solocked(so));
+	return error;
 }
 
 int
@@ -1703,11 +1742,13 @@ sosetopt(struct socket *so, struct socko
 {
 	int error, prerr;
 
-	solock(so);
-	if (sopt->sopt_level == SOL_SOCKET)
+	if (sopt->sopt_level == SOL_SOCKET) {
 		error = sosetopt1(so, sopt);
-	else
+		KASSERT(solocked(so));
+	} else {
 		error = ENOPROTOOPT;
+		solock(so);
+	}
 
 	if ((error == 0 || error == ENOPROTOOPT) &&
 	    so->so_proto != NULL && so->so_proto->pr_ctloutput != NULL) {
@@ -1750,14 +1791,14 @@ so_setsockopt(struct lwp *l, struct sock
 static int
 sogetopt1(struct socket *so, struct sockopt *sopt)
 {
-	int error, optval;
+	int error, optval, opt;
 	struct linger l;
 	struct timeval tv;
 
-	switch (sopt->sopt_name) {
+	switch ((opt = sopt->sopt_name)) {
 
 	case SO_ACCEPTFILTER:
-		error = do_getopt_accept_filter(so, sopt);
+		error = accept_filt_getopt(so, sopt);
 		break;
 
 	case SO_LINGER:
@@ -1776,8 +1817,10 @@ sogetopt1(struct socket *so, struct sock
 	case SO_BROADCAST:
 	case SO_OOBINLINE:
 	case SO_TIMESTAMP:
-		error = sockopt_setint(sopt,
-		    (so->so_options & sopt->sopt_name) ? 1 : 0);
+#ifdef SO_OTIMESTAMP
+	case SO_OTIMESTAMP:
+#endif
+		error = sockopt_setint(sopt, (so->so_options & opt) ? 1 : 0);
 		break;
 
 	case SO_TYPE:
@@ -1805,9 +1848,25 @@ sogetopt1(struct socket *so, struct sock
 		error = sockopt_setint(sopt, so->so_rcv.sb_lowat);
 		break;
 
+#ifdef COMPAT_50
+	case SO_OSNDTIMEO:
+	case SO_ORCVTIMEO: {
+		struct timeval50 otv;
+
+		optval = (opt == SO_OSNDTIMEO ?
+		     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
+
+		otv.tv_sec = optval / hz;
+		otv.tv_usec = (optval % hz) * tick;
+
+		error = sockopt_set(sopt, &otv, sizeof(otv));
+		break;
+	}
+#endif /* COMPAT_50 */
+
 	case SO_SNDTIMEO:
 	case SO_RCVTIMEO:
-		optval = (sopt->sopt_name == SO_SNDTIMEO ?
+		optval = (opt == SO_SNDTIMEO ?
 		     so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
 
 		tv.tv_sec = optval / hz;
@@ -2248,16 +2307,18 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS)
 	return (error);
 }
 
-SYSCTL_SETUP(sysctl_kern_somaxkva_setup, "sysctl kern.somaxkva setup")
+static void
+sysctl_kern_somaxkva_setup()
 {
 
-	sysctl_createv(clog, 0, NULL, NULL,
+	KASSERT(socket_sysctllog == NULL);
+	sysctl_createv(&socket_sysctllog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_NODE, "kern", NULL,
 		       NULL, 0, NULL, 0,
 		       CTL_KERN, CTL_EOL);
 
-	sysctl_createv(clog, 0, NULL, NULL,
+	sysctl_createv(&socket_sysctllog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_INT, "somaxkva",
 		       SYSCTL_DESCR("Maximum amount of kernel memory to be "