From owner-cvs-all@FreeBSD.ORG  Fri Feb 18 00:52:17 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DD62516A4CE; Fri, 18 Feb 2005 00:52:17 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C590D43D39; Fri, 18 Feb 2005 00:52:17 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1I0qHC2064159;
	Fri, 18 Feb 2005 00:52:17 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1I0qHC6064158;
	Fri, 18 Feb 2005 00:52:17 GMT
	(envelope-from rwatson)
Message-Id: <200502180052.j1I0qHC6064158@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 18 Feb 2005 00:52:17 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/kern uipc_socket.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2005 00:52:18 -0000

rwatson     2005-02-18 00:52:17 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             uipc_socket.c 
  Log:
  In solisten(), unconditionally set the SO_ACCEPTCONN option in
  so->so_options when solisten() will succeed, rather than setting it
  conditionally based on there not being queued sockets in the completed
  socket queue.  Otherwise, if the protocol exposes new sockets via the
  completed queue before solisten() completes, the listen() system call
  will succeed, but the socket and protocol state will be out of sync.
  For TCP, this didn't happen in practice, as the TCP code will panic if
  a new connection comes in after the tcpcb has been transitioned to a
  listening state but the socket doesn't have SO_ACCEPTCONN set.
  
  This is historical behavior resulting from bitrot since 4.3BSD, in which
  that line of code was associated with the conditional NULL'ing of the
  connection queue pointers (one-time initialization to be performed
  during the transition to a listening socket), which are now initialized
  separately.
  
  Discussed with: fenner, gnn
  MFC after:      3 days
  
  Revision  Changes    Path
  1.227     +4 -6      src/sys/kern/uipc_socket.c