svn commit: r283741 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Fri May 29 13:37:04 2015
New Revision: 283741
URL: https://svnweb.freebsd.org/changeset/base/283741

Log:
  MFC r282810:
  
  Ensure that the COOKIE-ACK can be sent over UDP if the COOKIE-ECHO was
  received over UDP.
  Thanks to Felix Weinrank for makeing me aware of the problem and to
  Irene Ruengeler for providing the fix.

Modified:
  stable/10/sys/netinet/sctp_input.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/sctp_input.c
==============================================================================
--- stable/10/sys/netinet/sctp_input.c	Fri May 29 13:34:31 2015	(r283740)
+++ stable/10/sys/netinet/sctp_input.c	Fri May 29 13:37:04 2015	(r283741)
@@ -2325,12 +2325,13 @@ sctp_process_cookie_new(struct mbuf *m, 
 	    sctp_is_feature_on(inp, SCTP_PCB_FLAGS_AUTOCLOSE)) {
 		sctp_timer_start(SCTP_TIMER_TYPE_AUTOCLOSE, inp, stcb, NULL);
 	}
-	/* calculate the RTT */
 	(void)SCTP_GETTIME_TIMEVAL(&stcb->asoc.time_entered);
 	if ((netp) && (*netp)) {
+		/* calculate the RTT and set the encaps port */
 		(*netp)->RTO = sctp_calculate_rto(stcb, asoc, *netp,
 		    &cookie->time_entered, sctp_align_unsafe_makecopy,
 		    SCTP_RTT_FROM_NON_DATA);
+		(*netp)->port = port;
 	}
 	/* respond with a COOKIE-ACK */
 	sctp_send_cookie_ack(stcb);