diff options
| author | Christoffer Jansson <jansson@google.com> | 2022-02-17 08:46:34 +0000 |
|---|---|---|
| committer | WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-02-17 09:01:56 +0000 |
| commit | 88f3c830f65c0cc110bef7fb7cbdc034401dbfd8 (patch) | |
| tree | 0b99f145f9fbb130fb744216aea95e944f6d73e4 /media/sctp | |
| parent | fe328ca88a3d8732447bc00dcd8d8eceef3f3d8c (diff) | |
| download | webrtc-88f3c830f65c0cc110bef7fb7cbdc034401dbfd8.tar.gz | |
Revert "Make dcSCTP the default SCTP implementation"
This reverts commit 035e97a447455bdd434b6d775b824d3ee2bb2c8c.
Reason for revert: Breaks downstream projects.
Original change's description:
> Make dcSCTP the default SCTP implementation
>
> To disable dcSCTP and fallback to usrsctp, you can use the field trial
> WebRTC-DataChannel-Dcsctp/Disabled/
>
> Bug: chromium:1243702
> Change-Id: Ia90b796562245558a61481317bcded437400b045
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251800
> Auto-Submit: Florent Castelli <orphis@webrtc.org>
> Commit-Queue: Florent Castelli <orphis@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36018}
TBR=hta@webrtc.org,orphis@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com
Change-Id: Id4767920abc9a4d934b5d9bb49ea0b2178df950b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:1243702
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251862
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Christoffer Jansson <jansson@google.com>
Cr-Commit-Position: refs/heads/main@{#36022}
Diffstat (limited to 'media/sctp')
| -rw-r--r-- | media/sctp/sctp_transport_factory.cc | 8 | ||||
| -rw-r--r-- | media/sctp/sctp_transport_factory.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/sctp/sctp_transport_factory.cc b/media/sctp/sctp_transport_factory.cc index 071d7fdb23..5097d423d9 100644 --- a/media/sctp/sctp_transport_factory.cc +++ b/media/sctp/sctp_transport_factory.cc @@ -25,11 +25,11 @@ namespace cricket { SctpTransportFactory::SctpTransportFactory(rtc::Thread* network_thread) - : network_thread_(network_thread), use_usrsctp_("Disabled", false) { + : network_thread_(network_thread), use_dcsctp_("Enabled", false) { RTC_UNUSED(network_thread_); #ifdef WEBRTC_HAVE_DCSCTP - webrtc::ParseFieldTrial({&use_usrsctp_}, webrtc::field_trial::FindFullName( - "WebRTC-DataChannel-Dcsctp")); + webrtc::ParseFieldTrial({&use_dcsctp_}, webrtc::field_trial::FindFullName( + "WebRTC-DataChannel-Dcsctp")); #endif } @@ -38,7 +38,7 @@ SctpTransportFactory::CreateSctpTransport( rtc::PacketTransportInternal* transport) { std::unique_ptr<SctpTransportInternal> result; #ifdef WEBRTC_HAVE_DCSCTP - if (!use_usrsctp_.Get()) { + if (use_dcsctp_.Get()) { result = std::unique_ptr<SctpTransportInternal>(new webrtc::DcSctpTransport( network_thread_, transport, webrtc::Clock::GetRealTimeClock())); } diff --git a/media/sctp/sctp_transport_factory.h b/media/sctp/sctp_transport_factory.h index 9ae246a6a6..ed7c2163d7 100644 --- a/media/sctp/sctp_transport_factory.h +++ b/media/sctp/sctp_transport_factory.h @@ -29,7 +29,7 @@ class SctpTransportFactory : public webrtc::SctpTransportFactoryInterface { private: rtc::Thread* network_thread_; - webrtc::FieldTrialFlag use_usrsctp_; + webrtc::FieldTrialFlag use_dcsctp_; }; } // namespace cricket |