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
retrieving revision 1.177
retrieving revision 1.177.2.1
diff -u -p -r1.177 -r1.177.2.1
--- src/sys/kern/uipc_socket.c	2008/10/14 13:45:26	1.177
+++ src/sys/kern/uipc_socket.c	2009/01/19 13:19:40	1.177.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.177 2008/10/14 13:45:26 ad Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.177.2.1 2009/01/19 13:19:40 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -63,8 +63,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.177 2008/10/14 13:45:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.177.2.1 2009/01/19 13:19:40 skrll Exp $");
 
+#include "opt_compat_netbsd.h"
 #include "opt_sock_counters.h"
 #include "opt_sosend_loan.h"
 #include "opt_mbuftrace.h"
@@ -92,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");
@@ -150,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)
 {
@@ -423,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");
@@ -1571,11 +1582,11 @@ 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 = accept_filt_setopt(so, sopt);
@@ -1608,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)
 			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:
@@ -1636,7 +1650,7 @@ sosetopt1(struct socket *so, const struc
 			break;
 		}
 
-		switch (sopt->sopt_name) {
+		switch (opt) {
 		case SO_SNDBUF:
 			if (sbreserve(&so->so_snd, (u_long)optval, so) == 0) {
 				error = ENOBUFS;
@@ -1673,9 +1687,24 @@ 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)
+			error = sockopt_get(sopt, &tv, sizeof(tv));
 		solock(so);
 		if (error)
 			break;
@@ -1689,7 +1718,7 @@ sosetopt1(struct socket *so, const struc
 		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;
@@ -1762,11 +1791,11 @@ 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 = accept_filt_getopt(so, sopt);
@@ -1788,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:
@@ -1817,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;
@@ -2260,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 "