Changeset 277332 in webkit

Timestamp:

May 11, 2021, 11:01:25 AM (5 years ago)

Author:

youenn@apple.com

Message:

Improve usrsctp restart handling
​https://bugs.webkit.org/show_bug.cgi?id=225638
<rdar://77582953>

Reviewed by Alex Christensen.

• Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c:

(sctp_process_cookie_existing):

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c (modified) (4 diffs)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2021-05-11  Youenn Fablet  <youenn@apple.com>
+
+        Improve usrsctp restart handling
+        https://bugs.webkit.org/show_bug.cgi?id=225638
+        <rdar://77582953>
+
+        Reviewed by Alex Christensen.
+
+        * Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c:
+        (sctp_process_cookie_existing):
+
 2021-05-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c

@@ -2006 +2006 @@
                 if (how_indx < sizeof(asoc->cookie_how))
                         asoc->cookie_how[how_indx] = 12;
-                sctp_timer_stop(SCTP_TIMER_TYPE_INIT, inp, stcb, net,
-                                SCTP_FROM_SCTP_INPUT + SCTP_LOC_16);
-                sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net,
-                                SCTP_FROM_SCTP_INPUT + SCTP_LOC_17);
-
+                sctp_stop_association_timers(stcb, false);
                 /* notify upper layer */
                 *notification = SCTP_NOTIFY_ASSOC_RESTART;
@@ -2043 +2039 @@
                 asoc->advanced_peer_ack_point = asoc->last_acked_seq;
                 asoc->send_sack = 1;
+                asoc->data_pkts_seen = 0;
+                asoc->last_data_chunk_from = NULL;
+                asoc->last_control_chunk_from = NULL;
+                asoc->last_net_cmt_send_started = NULL;
                 if (asoc->mapping_array) {
                         memset(asoc->mapping_array, 0,
@@ -2107 +2107 @@
                         SCTP_DECR_CHK_COUNT();
                 }
+                asoc->ctrl_queue_cnt = 0;
+                asoc->str_reset = NULL;
+                asoc->stream_reset_outstanding = 0;
                 TAILQ_FOREACH_SAFE(chk, &asoc->asconf_send_queue, sctp_next, nchk) {
                         TAILQ_REMOVE(&asoc->asconf_send_queue, chk, sctp_next);
@@ -2177 +2180 @@
                 }
                 /* respond with a COOKIE-ACK */
-                sctp_stop_all_cookie_timers(stcb);
-                sctp_toss_old_cookies(stcb, asoc);
                 sctp_send_cookie_ack(stcb);
                 if (how_indx < sizeof(asoc->cookie_how))
                         asoc->cookie_how[how_indx] = 15;
-
+                if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_AUTOCLOSE) &&
+                    (asoc->sctp_autoclose_ticks > 0)) {
+                        sctp_timer_start(SCTP_TIMER_TYPE_AUTOCLOSE, inp, stcb, NULL);
+                }
                 return (stcb);
         }