external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

ignore padding decode before srtp decryption

Browse source
This commit is contained in:
莫战 2020-08-12 14:40:19 +08:00 • committed by winlin
parent 8a98f05066
commit 559e89caf4
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -998,7 +998,7 @@ srs_error_t SrsRtcPublishStream::on_rtp(char* data, int nb_data)
// For NACK simulator, drop packet. // For NACK simulator, drop packet.
if (nn_simulate_nack_drop) { if (nn_simulate_nack_drop) {
SrsBuffer b(data, nb_data); SrsRtpHeader h; h.decode(&b); SrsBuffer b(data, nb_data); SrsRtpHeader h; h.ignore_padding(true); h.decode(&b);
simulate_drop_packet(&h, nb_data); simulate_drop_packet(&h, nb_data);
return err; return err;
} }
@ -1038,7 +1038,7 @@ srs_error_t SrsRtcPublishStream::on_rtp(char* data, int nb_data)
char* unprotected_buf = new char[kRtpPacketSize]; char* unprotected_buf = new char[kRtpPacketSize];
if ((err = session_->transport_->unprotect_rtp(data, unprotected_buf, nb_unprotected_buf)) != srs_success) { if ((err = session_->transport_->unprotect_rtp(data, unprotected_buf, nb_unprotected_buf)) != srs_success) {
// We try to decode the RTP header for more detail error informations. // We try to decode the RTP header for more detail error informations.
SrsBuffer b(data, nb_data); SrsRtpHeader h; h.decode(&b); SrsBuffer b(data, nb_data); SrsRtpHeader h; h.ignore_padding(true); h.decode(&b);
err = srs_error_wrap(err, "marker=%u, pt=%u, seq=%u, ts=%u, ssrc=%u, pad=%u, payload=%uB", h.get_marker(), h.get_payload_type(), err = srs_error_wrap(err, "marker=%u, pt=%u, seq=%u, ts=%u, ssrc=%u, pad=%u, payload=%uB", h.get_marker(), h.get_payload_type(),
h.get_sequence(), h.get_timestamp(), h.get_ssrc(), h.get_padding(), nb_data - b.pos()); h.get_sequence(), h.get_timestamp(), h.get_ssrc(), h.get_padding(), nb_data - b.pos());
@ -1860,7 +1860,7 @@ srs_error_t SrsRtcConnection::on_rtp(char* data, int nb_data)
if (true) { if (true) {
SrsBuffer* buffer = new SrsBuffer(data, nb_data); SrsBuffer* buffer = new SrsBuffer(data, nb_data);
SrsAutoFree(SrsBuffer, buffer); SrsAutoFree(SrsBuffer, buffer);
header.ignore_padding(true);
if(srs_success != (err = header.decode(buffer))) { if(srs_success != (err = header.decode(buffer))) {
return srs_error_wrap(err, "decode rtp header"); return srs_error_wrap(err, "decode rtp header");
} }