From owner-svn-src-head@FreeBSD.ORG Sat Jul 14 20:10:07 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E3F9D106566C; Sat, 14 Jul 2012 20:10:06 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from mail-n.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) by mx1.freebsd.org (Postfix) with ESMTP id 76C928FC12; Sat, 14 Jul 2012 20:10:06 +0000 (UTC) Received: from [192.168.1.103] (p5481B529.dip.t-dialin.net [84.129.181.41]) (Authenticated sender: macmic) by mail-n.franken.de (Postfix) with ESMTP id CDFD61C0C0BD8; Sat, 14 Jul 2012 22:10:04 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Apple Message framework v1278) From: Michael Tuexen In-Reply-To: <201207141944.q6EJidFx003841@svn.freebsd.org> Date: Sat, 14 Jul 2012 22:10:03 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201207141944.q6EJidFx003841@svn.freebsd.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Mailer: Apple Mail (2.1278) Cc: Subject: Re: svn commit: r238454 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jul 2012 20:10:07 -0000 On Jul 14, 2012, at 9:44 PM, Michael Tuexen wrote: > Author: tuexen > Date: Sat Jul 14 19:44:39 2012 > New Revision: 238454 > URL: http://svn.freebsd.org/changeset/base/238454 >=20 > Log: > Use case for selecting the address family (as in other places). Wrong commit message. It should have been: Bugfix: Send up a COMM UP notification for active 1-to-1 style sockets also in the case where the assoc comes up due to a remotely started handshake (collision case). >=20 > MFC after: 3 days >=20 > Modified: > head/sys/netinet/sctp_input.c >=20 > Modified: head/sys/netinet/sctp_input.c > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/sys/netinet/sctp_input.c Sat Jul 14 19:39:53 2012 = (r238453) > +++ head/sys/netinet/sctp_input.c Sat Jul 14 19:44:39 2012 = (r238454) > @@ -2874,14 +2874,12 @@ sctp_handle_cookie_echo(struct mbuf *m,=20 > return (m); > } > } > - if ((*inp_p)->sctp_flags & SCTP_PCB_FLAGS_UDPTYPE) { > - if (notification) { > - sctp_ulp_notify(notification, *stcb, 0, NULL, = SCTP_SO_NOT_LOCKED); > - } > - if (send_int_conf) { > - sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED, > - (*stcb), 0, (void *)netl, = SCTP_SO_NOT_LOCKED); > - } > + if (notification) { > + sctp_ulp_notify(notification, *stcb, 0, NULL, = SCTP_SO_NOT_LOCKED); > + } > + if (send_int_conf) { > + sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_CONFIRMED, > + (*stcb), 0, (void *)netl, SCTP_SO_NOT_LOCKED); > } > return (m); > } >=20