svn commit: r231413 - stable/8/sys/netinet

[Michael Tuexen]

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 at .

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;
 };