diff options
| author | Marvin W <git@larma.de> | 2023-07-09 14:14:43 +0200 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi.dcr@tutanota.com> | 2023-10-01 21:28:29 +0200 |
| commit | 78ea2fcb23e8e74740baeb775fd84acece74b22a (patch) | |
| tree | b4d1df851eeaa9454d4fe27cfd512f74d6d92a7d | |
| parent | b486e36b065183553ddad2eec40b196c9c1d13ac (diff) | |
Do not send DTLS datagrams to RTP even after handshake
Also post debug message in case we drop datagrams
| -rw-r--r-- | plugins/ice/src/dtls_srtp.vala | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/ice/src/dtls_srtp.vala b/plugins/ice/src/dtls_srtp.vala index e2fc49f1..033d9428 100644 --- a/plugins/ice/src/dtls_srtp.vala +++ b/plugins/ice/src/dtls_srtp.vala @@ -38,7 +38,11 @@ public class Handler { } public uint8[]? process_incoming_data(uint component_id, uint8[] data) throws Crypto.Error { - if (srtp_session.has_decrypt) { + if (data[0] >= 128) { + if (!srtp_session.has_decrypt) { + debug("Received data before SRTP session is ready, dropping."); + return null; + } if (component_id == 1) { if (data.length >= 2 && data[1] >= 192 && data[1] < 224) { return srtp_session.decrypt_rtcp(data); @@ -46,9 +50,12 @@ public class Handler { return srtp_session.decrypt_rtp(data); } if (component_id == 2) return srtp_session.decrypt_rtcp(data); - } else if (component_id == 1 && (data[0] >= 20 && data[0] <= 63)) { + } + if (component_id == 1 && data.length >= 1 && (data[0] >= 20 && data[0] < 64)) { on_data_rec(data); + return null; } + debug("Dropping unknown data from component %u", component_id); return null; } |