mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 00:57:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forward the SignalNetworkRouteChanged from DtlsSrtpTransport to BaseChannel.

Browse source 
In current implementation, the DtlsSrtpTransport listens to the
SignalNetworkRouteChanged but doesn't forward it to the BaseChannel which
makes it impossible for the media engine to update the network route and
the transport overhead.

The BaseChannel unit tests failed to catch this issue because it used a plain
unencrypted RTP transport for testing.

This CL fix that issue and update the BaseChannel tests.

Bug: webrtc:7013, b/73645191
Change-Id: I417b58ff9af4e3c4fac442ff10b5a85bc2093530
Reviewed-on: https://webrtc-review.googlesource.com/55940
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22140}
This commit is contained in:
Zhi Huang 2018-02-21 10:40:07 -08:00 committed by Commit Bot
parent 52d86774c2
commit cf6e24a12d
4 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pc/channel_unittest.cc
View file

@ -1030,8 +1030,10 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
static constexpr int kLastPacketId = 100; static constexpr int kLastPacketId = 100;
// Ipv4(20) + UDP(8). // Ipv4(20) + UDP(8).
static constexpr int kTransportOverheadPerPacket = 28; static constexpr int kTransportOverheadPerPacket = 28;
static constexpr int kSrtpOverheadPerPacket = 10;
CreateChannels(0, 0); CreateChannels(DTLS, DTLS);
SendInitiate();
typename T::MediaChannel* media_channel1 = typename T::MediaChannel* media_channel1 =
static_cast<typename T::MediaChannel*>(channel1_->media_channel()); static_cast<typename T::MediaChannel*>(channel1_->media_channel());
@ -1073,7 +1075,7 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
EXPECT_EQ(expected_network_route, media_channel1->last_network_route()); EXPECT_EQ(expected_network_route, media_channel1->last_network_route());
EXPECT_EQ(kLastPacketId, EXPECT_EQ(kLastPacketId,
media_channel1->last_network_route().last_sent_packet_id); media_channel1->last_network_route().last_sent_packet_id);
EXPECT_EQ(kTransportOverheadPerPacket, EXPECT_EQ(kTransportOverheadPerPacket + kSrtpOverheadPerPacket,
media_channel1->transport_overhead_per_packet()); media_channel1->transport_overhead_per_packet());
} }

7
pc/dtlssrtptransport.cc
View file

@ -33,6 +33,8 @@ DtlsSrtpTransport::DtlsSrtpTransport(
this, &DtlsSrtpTransport::OnPacketReceived); this, &DtlsSrtpTransport::OnPacketReceived);
srtp_transport_->SignalReadyToSend.connect(this, srtp_transport_->SignalReadyToSend.connect(this,
&DtlsSrtpTransport::OnReadyToSend); &DtlsSrtpTransport::OnReadyToSend);
srtp_transport_->SignalNetworkRouteChanged.connect(
this, &DtlsSrtpTransport::OnNetworkRouteChanged);
srtp_transport_->SignalWritableState.connect( srtp_transport_->SignalWritableState.connect(
this, &DtlsSrtpTransport::OnWritableState); this, &DtlsSrtpTransport::OnWritableState);
srtp_transport_->SignalSentPacket.connect(this, srtp_transport_->SignalSentPacket.connect(this,
@ -356,4 +358,9 @@ void DtlsSrtpTransport::OnReadyToSend(bool ready) {
SignalReadyToSend(ready); SignalReadyToSend(ready);
} }
void DtlsSrtpTransport::OnNetworkRouteChanged(
rtc::Optional<rtc::NetworkRoute> network_route) {
SignalNetworkRouteChanged(network_route);
}
} // namespace webrtc } // namespace webrtc

1
pc/dtlssrtptransport.h
View file

@ -88,6 +88,7 @@ class DtlsSrtpTransport : public RtpTransportInternalAdapter {
rtc::CopyOnWriteBuffer* packet, rtc::CopyOnWriteBuffer* packet,
const rtc::PacketTime& packet_time); const rtc::PacketTime& packet_time);
void OnReadyToSend(bool ready); void OnReadyToSend(bool ready);
void OnNetworkRouteChanged(rtc::Optional<rtc::NetworkRoute> network_route);
bool writable_ = false; bool writable_ = false;
std::unique_ptr<SrtpTransport> srtp_transport_; std::unique_ptr<SrtpTransport> srtp_transport_;

1
pc/srtptransport.cc
View file

@ -177,7 +177,6 @@ void SrtpTransport::OnPacketReceived(bool rtcp,
} }
void SrtpTransport::OnNetworkRouteChanged( void SrtpTransport::OnNetworkRouteChanged(
rtc::Optional<rtc::NetworkRoute> network_route) { rtc::Optional<rtc::NetworkRoute> network_route) {
// Only append the SRTP overhead when there is a selected network route. // Only append the SRTP overhead when there is a selected network route.
if (network_route) { if (network_route) {