-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Thanks to @alabiaga and @marcelpinto for help with improvements for Android 12. #1633 #1636 #1630
- Loading branch information
Showing
83 changed files
with
1,033 additions
and
872 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
TMessagesProj/jni/voip/tgcalls/SctpDataChannelProviderInterfaceImpl.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| #include "SctpDataChannelProviderInterfaceImpl.h" | ||
|
|
||
| #include "p2p/base/dtls_transport.h" | ||
|
|
||
| namespace tgcalls { | ||
|
|
||
| SctpDataChannelProviderInterfaceImpl::SctpDataChannelProviderInterfaceImpl( | ||
| cricket::DtlsTransport *transportChannel, | ||
| bool isOutgoing, | ||
| std::function<void(bool)> onStateChanged, | ||
| std::function<void()> onTerminated, | ||
| std::function<void(std::string const &)> onMessageReceived, | ||
| std::shared_ptr<Threads> threads | ||
| ) : | ||
| _threads(std::move(threads)), | ||
| _onStateChanged(onStateChanged), | ||
| _onTerminated(onTerminated), | ||
| _onMessageReceived(onMessageReceived) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _sctpTransportFactory.reset(new cricket::SctpTransportFactory(_threads->getNetworkThread())); | ||
|
|
||
| _sctpTransport = _sctpTransportFactory->CreateSctpTransport(transportChannel); | ||
| _sctpTransport->SignalReadyToSendData.connect(this, &SctpDataChannelProviderInterfaceImpl::sctpReadyToSendData); | ||
| _sctpTransport->SignalDataReceived.connect(this, &SctpDataChannelProviderInterfaceImpl::sctpDataReceived); | ||
| _sctpTransport->SignalClosedAbruptly.connect(this, &SctpDataChannelProviderInterfaceImpl::sctpClosedAbruptly); | ||
|
|
||
| webrtc::InternalDataChannelInit dataChannelInit; | ||
| dataChannelInit.id = 0; | ||
| dataChannelInit.open_handshake_role = isOutgoing ? webrtc::InternalDataChannelInit::kOpener : webrtc::InternalDataChannelInit::kAcker; | ||
| _dataChannel = webrtc::SctpDataChannel::Create( | ||
| this, | ||
| "data", | ||
| dataChannelInit, | ||
| _threads->getNetworkThread(), | ||
| _threads->getNetworkThread() | ||
| ); | ||
|
|
||
| _dataChannel->RegisterObserver(this); | ||
| } | ||
|
|
||
|
|
||
| SctpDataChannelProviderInterfaceImpl::~SctpDataChannelProviderInterfaceImpl() { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _dataChannel->UnregisterObserver(); | ||
| _dataChannel->Close(); | ||
| _dataChannel = nullptr; | ||
|
|
||
| _sctpTransport = nullptr; | ||
| _sctpTransportFactory.reset(); | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::sendDataChannelMessage(std::string const &message) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| if (_isDataChannelOpen) { | ||
| RTC_LOG(LS_INFO) << "Outgoing DataChannel message: " << message; | ||
|
|
||
| webrtc::DataBuffer buffer(message); | ||
| _dataChannel->Send(buffer); | ||
| } else { | ||
| RTC_LOG(LS_INFO) << "Could not send an outgoing DataChannel message: the channel is not open"; | ||
| } | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::OnStateChange() { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| auto state = _dataChannel->state(); | ||
| bool isDataChannelOpen = state == webrtc::DataChannelInterface::DataState::kOpen; | ||
| if (_isDataChannelOpen != isDataChannelOpen) { | ||
| _isDataChannelOpen = isDataChannelOpen; | ||
| _onStateChanged(_isDataChannelOpen); | ||
| } | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::OnMessage(const webrtc::DataBuffer& buffer) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| if (!buffer.binary) { | ||
| std::string messageText(buffer.data.data(), buffer.data.data() + buffer.data.size()); | ||
| RTC_LOG(LS_INFO) << "Incoming DataChannel message: " << messageText; | ||
|
|
||
| _onMessageReceived(messageText); | ||
| } | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::updateIsConnected(bool isConnected) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| if (isConnected) { | ||
| if (!_isSctpTransportStarted) { | ||
| _isSctpTransportStarted = true; | ||
| _sctpTransport->Start(5000, 5000, 262144); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::sctpReadyToSendData() { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _dataChannel->OnTransportReady(true); | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::sctpClosedAbruptly() { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| if (_onTerminated) { | ||
| _onTerminated(); | ||
| } | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::sctpDataReceived(const cricket::ReceiveDataParams& params, const rtc::CopyOnWriteBuffer& buffer) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _dataChannel->OnDataReceived(params, buffer); | ||
| } | ||
|
|
||
| bool SctpDataChannelProviderInterfaceImpl::SendData(int sid, const webrtc::SendDataParams& params, const rtc::CopyOnWriteBuffer& payload, cricket::SendDataResult* result) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| return _sctpTransport->SendData(sid, params, payload); | ||
| } | ||
|
|
||
| bool SctpDataChannelProviderInterfaceImpl::ConnectDataChannel(webrtc::SctpDataChannel *data_channel) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::DisconnectDataChannel(webrtc::SctpDataChannel* data_channel) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::AddSctpDataStream(int sid) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _sctpTransport->OpenStream(sid); | ||
| } | ||
|
|
||
| void SctpDataChannelProviderInterfaceImpl::RemoveSctpDataStream(int sid) { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| _threads->getNetworkThread()->Invoke<void>(RTC_FROM_HERE, [this, sid]() { | ||
| _sctpTransport->ResetStream(sid); | ||
| }); | ||
| } | ||
|
|
||
| bool SctpDataChannelProviderInterfaceImpl::ReadyToSendData() const { | ||
| assert(_threads->getNetworkThread()->IsCurrent()); | ||
|
|
||
| return _sctpTransport->ReadyToSendData(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
7a60f94There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have few suggestions for app: