Title: [270984] branches/safari-610-branch/Source/ThirdParty/libwebrtc
Revision
270984
Author
[email protected]
Date
2020-12-18 11:42:49 -0800 (Fri, 18 Dec 2020)

Log Message

Cherry-pick r270894. rdar://problem/72474831

    Cherry-pick usrsctp 7dab23aa0d8db86fedd222a308067439b03fad0f
    https://bugs.webkit.org/show_bug.cgi?id=219936
    <rdar://problem/72304588>

    Reviewed by Alex Christensen.

    * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c:
    (sctp_process_cookie_existing):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/ThirdParty/libwebrtc/ChangeLog (270983 => 270984)


--- branches/safari-610-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-12-18 19:34:39 UTC (rev 270983)
+++ branches/safari-610-branch/Source/ThirdParty/libwebrtc/ChangeLog	2020-12-18 19:42:49 UTC (rev 270984)
@@ -1,3 +1,30 @@
+2020-12-18  Russell Epstein  <[email protected]>
+
+        Cherry-pick r270894. rdar://problem/72474831
+
+    Cherry-pick usrsctp 7dab23aa0d8db86fedd222a308067439b03fad0f
+    https://bugs.webkit.org/show_bug.cgi?id=219936
+    <rdar://problem/72304588>
+    
+    Reviewed by Alex Christensen.
+    
+    * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c:
+    (sctp_process_cookie_existing):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270894 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-12-16  Youenn Fablet  <[email protected]>
+
+            Cherry-pick usrsctp 7dab23aa0d8db86fedd222a308067439b03fad0f
+            https://bugs.webkit.org/show_bug.cgi?id=219936
+            <rdar://problem/72304588>
+
+            Reviewed by Alex Christensen.
+
+            * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c:
+            (sctp_process_cookie_existing):
+
 2020-12-01  Alan Coon  <[email protected]>
 
         Apply patch. rdar://problem/71381873

Modified: branches/safari-610-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c (270983 => 270984)


--- branches/safari-610-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c	2020-12-18 19:34:39 UTC (rev 270983)
+++ branches/safari-610-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c	2020-12-18 19:42:49 UTC (rev 270984)
@@ -1887,7 +1887,9 @@
 					 NULL);
 		}
 		asoc->my_rwnd = ntohl(initack_cp->init.a_rwnd);
-		asoc->pre_open_streams = ntohs(initack_cp->init.num_outbound_streams);
+		if (asoc->pre_open_streams < asoc->streamoutcnt) {
+			asoc->pre_open_streams = asoc->streamoutcnt;
+		}
 
 		if (ntohl(init_cp->init.initiate_tag) != asoc->peer_vtag) {
 			/* Ok the peer probably discarded our
@@ -2042,8 +2044,9 @@
 			/* move to OPEN state, if not in SHUTDOWN_SENT */
 			SCTP_SET_STATE(asoc, SCTP_STATE_OPEN);
 		}
-		asoc->pre_open_streams =
-			ntohs(initack_cp->init.num_outbound_streams);
+		if (asoc->pre_open_streams < asoc->streamoutcnt) {
+			asoc->pre_open_streams = asoc->streamoutcnt;
+		}
 		asoc->init_seq_number = ntohl(initack_cp->init.initial_tsn);
 		asoc->sending_seq = asoc->asconf_seq_out = asoc->str_reset_seq_out = asoc->init_seq_number;
 		asoc->asconf_seq_out_acked = asoc->asconf_seq_out - 1;
@@ -2316,7 +2319,6 @@
 	/* process the INIT-ACK info (my info) */
 	asoc->my_vtag = ntohl(initack_cp->init.initiate_tag);
 	asoc->my_rwnd = ntohl(initack_cp->init.a_rwnd);
-	asoc->pre_open_streams = ntohs(initack_cp->init.num_outbound_streams);
 	asoc->init_seq_number = ntohl(initack_cp->init.initial_tsn);
 	asoc->sending_seq = asoc->asconf_seq_out = asoc->str_reset_seq_out = asoc->init_seq_number;
 	asoc->asconf_seq_out_acked = asoc->asconf_seq_out - 1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to