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.177.2.2 retrieving revision 1.177.4.2 diff -u -p -r1.177.2.2 -r1.177.4.2 --- src/sys/kern/uipc_socket.c 2009/03/03 18:32:57 1.177.2.2 +++ src/sys/kern/uipc_socket.c 2009/04/04 23:36:27 1.177.4.2 @@ -1,11 +1,11 @@ -/* $NetBSD: uipc_socket.c,v 1.177.2.2 2009/03/03 18:32:57 skrll Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.177.4.2 2009/04/04 23:36:27 snj Exp $ */ /*- - * Copyright (c) 2002, 2007, 2008 The NetBSD Foundation, Inc. + * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of Wasabi Systems, Inc. + * by Jason R. Thorpe of Wasabi Systems, Inc, and by Andrew Doran. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -63,9 +63,8 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.177.2.2 2009/03/03 18:32:57 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.177.4.2 2009/04/04 23:36:27 snj Exp $"); -#include "opt_compat_netbsd.h" #include "opt_sock_counters.h" #include "opt_sosend_loan.h" #include "opt_mbuftrace.h" @@ -93,11 +92,6 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include -#ifdef COMPAT_50 -#include -#include -#endif - #include MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); @@ -156,9 +150,6 @@ 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) { @@ -432,8 +423,6 @@ 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"); @@ -1547,6 +1536,20 @@ soshutdown(struct socket *so, int how) return error; } +int +sodrain(struct socket *so) +{ + int error; + + solock(so); + so->so_state |= SS_ISDRAINING; + cv_broadcast(&so->so_cv); + error = soshutdown(so, SHUT_RDWR); + sounlock(so); + + return error; +} + void sorflush(struct socket *so) { @@ -1582,11 +1585,11 @@ sorflush(struct socket *so) static int sosetopt1(struct socket *so, const struct sockopt *sopt) { - int error = EINVAL, optval, opt; + int error, optval; struct linger l; struct timeval tv; - switch ((opt = sopt->sopt_name)) { + switch (sopt->sopt_name) { case SO_ACCEPTFILTER: error = accept_filt_setopt(so, sopt); @@ -1619,17 +1622,14 @@ 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 |= opt; + so->so_options |= sopt->sopt_name; else - so->so_options &= ~opt; + so->so_options &= ~sopt->sopt_name; break; case SO_SNDBUF: @@ -1650,7 +1650,7 @@ sosetopt1(struct socket *so, const struc break; } - switch (opt) { + switch (sopt->sopt_name) { case SO_SNDBUF: if (sbreserve(&so->so_snd, (u_long)optval, so) == 0) { error = ENOBUFS; @@ -1687,26 +1687,9 @@ 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) { - solock(so); - 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: - if (error) - error = sockopt_get(sopt, &tv, sizeof(tv)); + error = sockopt_get(sopt, &tv, sizeof(tv)); solock(so); if (error) break; @@ -1720,7 +1703,7 @@ sosetopt1(struct socket *so, const struc if (optval == 0 && tv.tv_usec != 0) optval = 1; - switch (opt) { + switch (sopt->sopt_name) { case SO_SNDTIMEO: so->so_snd.sb_timeo = optval; break; @@ -1793,11 +1776,11 @@ so_setsockopt(struct lwp *l, struct sock static int sogetopt1(struct socket *so, struct sockopt *sopt) { - int error, optval, opt; + int error, optval; struct linger l; struct timeval tv; - switch ((opt = sopt->sopt_name)) { + switch (sopt->sopt_name) { case SO_ACCEPTFILTER: error = accept_filt_getopt(so, sopt); @@ -1819,10 +1802,8 @@ sogetopt1(struct socket *so, struct sock case SO_BROADCAST: case SO_OOBINLINE: case SO_TIMESTAMP: -#ifdef SO_OTIMESTAMP - case SO_OTIMESTAMP: -#endif - error = sockopt_setint(sopt, (so->so_options & opt) ? 1 : 0); + error = sockopt_setint(sopt, + (so->so_options & sopt->sopt_name) ? 1 : 0); break; case SO_TYPE: @@ -1850,25 +1831,9 @@ 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 = (opt == SO_SNDTIMEO ? + optval = (sopt->sopt_name == SO_SNDTIMEO ? so->so_snd.sb_timeo : so->so_rcv.sb_timeo); tv.tv_sec = optval / hz; @@ -2309,18 +2274,16 @@ sysctl_kern_somaxkva(SYSCTLFN_ARGS) return (error); } -static void -sysctl_kern_somaxkva_setup() +SYSCTL_SETUP(sysctl_kern_somaxkva_setup, "sysctl kern.somaxkva setup") { - KASSERT(socket_sysctllog == NULL); - sysctl_createv(&socket_sysctllog, 0, NULL, NULL, + sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, CTLTYPE_NODE, "kern", NULL, NULL, 0, NULL, 0, CTL_KERN, CTL_EOL); - sysctl_createv(&socket_sysctllog, 0, NULL, NULL, + sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "somaxkva", SYSCTL_DESCR("Maximum amount of kernel memory to be "