Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/make dtls fragment stay within mtu size range #1143

Closed
wants to merge 1 commit into from
Closed

fix/make dtls fragment stay within mtu size range #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion worker/include/RTC/DtlsTransport.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ namespace RTC
return this->localRole;
}
void SendApplicationData(const uint8_t* data, size_t len);
void SendDtlsData(void*, int);

private:
bool IsRunning() const
Expand All @@ -193,7 +194,6 @@ namespace RTC
}
void Reset();
bool CheckStatus(int returnCode);
void SendPendingOutgoingDtlsData();
bool SetTimeout();
bool ProcessHandshake();
bool CheckRemoteFingerprint();
Expand Down
47 changes: 17 additions & 30 deletions worker/src/RTC/DtlsTransport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,19 @@ inline static unsigned int onSslDtlsTimer(SSL* /*ssl*/, unsigned int timerUs)
return 2 * timerUs;
}

long sslBioOutCallback(
BIO* bio, int operationType, const char* argp, size_t len, int argi, long argl, int ret, size_t* processed)
{
long resultOfcallback = (operationType == BIO_CB_RETURN) ? ret : 1;
if (operationType == BIO_CB_WRITE && argp && len > 0)
{
MS_DEBUG_DEV("%i bytes of DTLS data ready to sent to the peer", static_cast<int>(len));
RTC::DtlsTransport* dtls = (RTC::DtlsTransport*)BIO_get_callback_arg(bio);
dtls->SendDtlsData((void*)argp, len);
}
return resultOfcallback;
}

namespace RTC
{
/* Static. */
Expand Down Expand Up @@ -538,6 +551,8 @@ namespace RTC
goto error;
}

BIO_set_callback_ex(this->sslBioToNetwork, sslBioOutCallback);
BIO_set_callback_arg(this->sslBioToNetwork, (char*)this);
SSL_set_bio(this->ssl, this->sslBioFromNetwork, this->sslBioToNetwork);

// Set the MTU so that we don't send packets that are too large with no fragmentation.
Expand Down Expand Up @@ -578,7 +593,6 @@ namespace RTC
{
// Send close alert to the peer.
SSL_shutdown(this->ssl);
SendPendingOutgoingDtlsData();
}

if (this->ssl)
Expand Down Expand Up @@ -679,7 +693,6 @@ namespace RTC

SSL_set_connect_state(this->ssl);
SSL_do_handshake(this->ssl);
SendPendingOutgoingDtlsData();
SetTimeout();

break;
Expand Down Expand Up @@ -753,9 +766,6 @@ namespace RTC
// Must call SSL_read() to process received DTLS data.
read = SSL_read(this->ssl, static_cast<void*>(DtlsTransport::sslReadBuffer), SslReadBufferSize);

// Send data if it's ready.
SendPendingOutgoingDtlsData();

// Check SSL status and return if it is bad/closed.
if (!CheckStatus(read))
return;
Expand Down Expand Up @@ -816,9 +826,6 @@ namespace RTC
MS_WARN_TAG(
dtls, "OpenSSL SSL_write() wrote less (%d bytes) than given data (%zu bytes)", written, len);
}

// Send data.
SendPendingOutgoingDtlsData();
}

void DtlsTransport::Reset()
Expand Down Expand Up @@ -950,30 +957,13 @@ namespace RTC
}
}

inline void DtlsTransport::SendPendingOutgoingDtlsData()
inline void DtlsTransport::SendDtlsData(void* data, int size)
{
MS_TRACE();

if (BIO_eof(this->sslBioToNetwork))
return;

int64_t read;
char* data{ nullptr };

read = BIO_get_mem_data(this->sslBioToNetwork, &data); // NOLINT

if (read <= 0)
return;

MS_DEBUG_DEV("%" PRIu64 " bytes of DTLS data ready to sent to the peer", read);

// Notify the listener.
this->listener->OnDtlsTransportSendData(
this, reinterpret_cast<uint8_t*>(data), static_cast<size_t>(read));

// Clear the BIO buffer.
// NOTE: the (void) avoids the -Wunused-value warning.
(void)BIO_reset(this->sslBioToNetwork);
this, reinterpret_cast<uint8_t*>(data), static_cast<size_t>(size));
}

inline bool DtlsTransport::SetTimeout()
Expand Down Expand Up @@ -1429,9 +1419,6 @@ namespace RTC

if (ret == 1)
{
// If required, send DTLS data.
SendPendingOutgoingDtlsData();

// Set the DTLS timer again.
SetTimeout();
}
Expand Down