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.187 retrieving revision 1.188 diff -u -p -r1.187 -r1.188 --- src/sys/kern/uipc_socket.c 2009/03/15 17:14:40 1.187 +++ src/sys/kern/uipc_socket.c 2009/04/04 10:12:51 1.188 @@ -1,11 +1,11 @@ -/* $NetBSD: uipc_socket.c,v 1.187 2009/03/15 17:14:40 cegger Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.188 2009/04/04 10:12:51 ad 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,7 +63,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.187 2009/03/15 17:14:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.188 2009/04/04 10:12:51 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" @@ -1547,6 +1547,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) {