Title: [270894] trunk/Source/ThirdParty/libwebrtc
- Revision
- 270894
- Author
- [email protected]
- Date
- 2020-12-16 09:27:49 -0800 (Wed, 16 Dec 2020)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (270893 => 270894)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-12-16 17:23:47 UTC (rev 270893)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-12-16 17:27:49 UTC (rev 270894)
@@ -1,5 +1,16 @@
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-16 Youenn Fablet <[email protected]>
+
Remove ILBC audio codec as WebRTC audio codec
https://bugs.webkit.org/show_bug.cgi?id=219912
<rdar://problem/72302868>
Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c (270893 => 270894)
--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c 2020-12-16 17:23:47 UTC (rev 270893)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c 2020-12-16 17:27:49 UTC (rev 270894)
@@ -1881,7 +1881,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
@@ -2036,8 +2038,9 @@
/* move to OPEN state, if not in SHUTDOWN_SENT */
SCTP_SET_STATE(stcb, 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;
@@ -2310,7 +2313,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
