svn commit: r218392 - head/sys/netinet

[Randall Stewart]

Author: rrs
Date: Mon Feb  7 08:10:29 2011
New Revision: 218392
URL: http://svn.freebsd.org/changeset/base/218392

Log:
  1) Track when flowid does get set.
  MFC after:    3 months

Modified:
  head/sys/netinet/sctp_input.c
  head/sys/netinet/sctp_pcb.c
  head/sys/netinet/sctp_structs.h

Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c       Mon Feb  7 07:52:53 2011        
(r218391)
+++ head/sys/netinet/sctp_input.c       Mon Feb  7 08:10:29 2011        
(r218392)
@@ -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
@@ -5845,6 +5846,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: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Mon Feb  7 07:52:53 2011        (r218391)
+++ head/sys/netinet/sctp_pcb.c Mon Feb  7 08:10:29 2011        (r218392)
@@ -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: head/sys/netinet/sctp_structs.h
==============================================================================
--- head/sys/netinet/sctp_structs.h     Mon Feb  7 07:52:53 2011        
(r218391)
+++ head/sys/netinet/sctp_structs.h     Mon Feb  7 08:10:29 2011        
(r218392)
@@ -351,6 +351,7 @@ struct sctp_nets {
        /* JRS - struct used in HTCP algorithm */
        struct htcp htcp_ca;
        uint32_t flowid;
+       uint8_t flowidset;
 };
 
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"