From owner-svn-src-stable@FreeBSD.ORG Fri Feb 10 19:47:15 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C75191065675; Fri, 10 Feb 2012 19:47:15 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 971CD8FC0C; Fri, 10 Feb 2012 19:47:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1AJlFXP090747; Fri, 10 Feb 2012 19:47:15 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1AJlFSt090743; Fri, 10 Feb 2012 19:47:15 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201202101947.q1AJlFSt090743@svn.freebsd.org> From: Michael Tuexen Date: Fri, 10 Feb 2012 19:47:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231413 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2012 19:47:15 -0000 Author: tuexen Date: Fri Feb 10 19:47:15 2012 New Revision: 231413 URL: http://svn.freebsd.org/changeset/base/231413 Log: MFC r218392: 1) Track when flowid does get set. From rrs@. Modified: stable/8/sys/netinet/sctp_input.c stable/8/sys/netinet/sctp_pcb.c stable/8/sys/netinet/sctp_structs.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/e1000/ (props changed) Modified: stable/8/sys/netinet/sctp_input.c ============================================================================== --- stable/8/sys/netinet/sctp_input.c Fri Feb 10 19:40:19 2012 (r231412) +++ stable/8/sys/netinet/sctp_input.c Fri Feb 10 19:47:15 2012 (r231413) @@ -2617,6 +2617,7 @@ sctp_handle_cookie_echo(struct mbuf *m, } if ((*netp != NULL) && (m->m_flags & M_FLOWID)) { (*netp)->flowid = m->m_pkthdr.flowid; + (*netp)->flowidset = 1; } /* * Ok, we built an association so confirm the address we sent the @@ -5847,6 +5848,7 @@ sctp_skip_csum_4: } if ((net != NULL) && (m->m_flags & M_FLOWID)) { net->flowid = m->m_pkthdr.flowid; + net->flowidset = 1; } /* inp's ref-count increased && stcb locked */ if (inp == NULL) { Modified: stable/8/sys/netinet/sctp_pcb.c ============================================================================== --- stable/8/sys/netinet/sctp_pcb.c Fri Feb 10 19:40:19 2012 (r231412) +++ stable/8/sys/netinet/sctp_pcb.c Fri Feb 10 19:47:15 2012 (r231413) @@ -4039,6 +4039,7 @@ sctp_add_remote_addr(struct sctp_tcb *st net->flowid = stcb->asoc.my_vtag ^ ntohs(stcb->rport) ^ ntohs(stcb->sctp_ep->sctp_lport); + net->flowidset = 1; return (0); } @@ -5602,7 +5603,6 @@ sctp_startup_mcore_threads(void) #endif - void sctp_pcb_init() { @@ -5750,7 +5750,6 @@ sctp_pcb_init() * add the VRF's as addresses are added. */ sctp_init_vrf_list(SCTP_DEFAULT_VRF); - } /* Modified: stable/8/sys/netinet/sctp_structs.h ============================================================================== --- stable/8/sys/netinet/sctp_structs.h Fri Feb 10 19:40:19 2012 (r231412) +++ stable/8/sys/netinet/sctp_structs.h Fri Feb 10 19:47:15 2012 (r231413) @@ -351,6 +351,7 @@ struct sctp_nets { /* JRS - struct used in HTCP algorithm */ struct htcp htcp_ca; uint32_t flowid; + uint8_t flowidset; };