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

stats: expose relayProtocol on prflx candidate

Browse source 
This makes relay candidates identifiable in scenarios
where the TURN server is behind another entity and the peer
sees a different ip address:

client -> turn -> relay address -> third party relay + address -> peer

In those cases, the relay candidate will become peer-reflexive
since the peer sends the third party relay's address in the xor-mapped
address and it is currently not easily possible to determine this is a
relay candidate anymore.

BUG=webrtc:13392

Change-Id: I6787339d0abdc735f8a43f636a676cccd8cadcda
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237561
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#35346}
This commit is contained in:
Philipp Hancke 2021-11-11 07:45:59 +01:00 committed by WebRTC LUCI CQ
parent 8718f58868
commit 21c4b1e9ca
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pc/rtc_stats_collector.cc
View file

@ -728,8 +728,11 @@ const std::string& ProduceIceCandidateStats(int64_t timestamp_us,
if (is_local) { if (is_local) {
candidate_stats->network_type = candidate_stats->network_type =
NetworkAdapterTypeToStatsType(candidate.network_type()); NetworkAdapterTypeToStatsType(candidate.network_type());
if (candidate.type() == cricket::RELAY_PORT_TYPE) { const std::string& candidate_type = candidate.type();
std::string relay_protocol = candidate.relay_protocol(); const std::string& relay_protocol = candidate.relay_protocol();
if (candidate_type == cricket::RELAY_PORT_TYPE ||
(candidate_type == cricket::PRFLX_PORT_TYPE &&
!relay_protocol.empty())) {
RTC_DCHECK(relay_protocol.compare("udp") == 0 || RTC_DCHECK(relay_protocol.compare("udp") == 0 ||
relay_protocol.compare("tcp") == 0 || relay_protocol.compare("tcp") == 0 ||
relay_protocol.compare("tls") == 0); relay_protocol.compare("tls") == 0);

28
pc/rtc_stats_collector_unittest.cc
View file

@ -1315,6 +1315,24 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidateStats) {
expected_a_local_relay.priority = 1; expected_a_local_relay.priority = 1;
EXPECT_FALSE(*expected_a_local_relay.is_remote); EXPECT_FALSE(*expected_a_local_relay.is_remote);
std::unique_ptr<cricket::Candidate> a_local_relay_prflx = CreateFakeCandidate(
"11.12.13.20", 22, "a_local_relay_prflx's protocol",
rtc::ADAPTER_TYPE_UNKNOWN, cricket::PRFLX_PORT_TYPE, 1);
a_local_relay_prflx->set_relay_protocol("udp");
RTCLocalIceCandidateStats expected_a_local_relay_prflx(
"RTCIceCandidate_" + a_local_relay_prflx->id(), 0);
expected_a_local_relay_prflx.transport_id = "RTCTransport_a_0";
expected_a_local_relay_prflx.network_type = "unknown";
expected_a_local_relay_prflx.ip = "11.12.13.20";
expected_a_local_relay_prflx.address = "11.12.13.20";
expected_a_local_relay_prflx.port = 22;
expected_a_local_relay_prflx.protocol = "a_local_relay_prflx's protocol";
expected_a_local_relay_prflx.relay_protocol = "udp";
expected_a_local_relay_prflx.candidate_type = "prflx";
expected_a_local_relay_prflx.priority = 1;
EXPECT_FALSE(*expected_a_local_relay.is_remote);
// Candidates in the second transport stats. // Candidates in the second transport stats.
std::unique_ptr<cricket::Candidate> b_local = std::unique_ptr<cricket::Candidate> b_local =
CreateFakeCandidate("42.42.42.42", 42, "b_local's protocol", CreateFakeCandidate("42.42.42.42", 42, "b_local's protocol",
@ -1365,6 +1383,12 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidateStats) {
.local_candidate = *a_local_relay.get(); .local_candidate = *a_local_relay.get();
a_transport_channel_stats.ice_transport_stats.connection_infos[2] a_transport_channel_stats.ice_transport_stats.connection_infos[2]
.remote_candidate = *a_remote_relay.get(); .remote_candidate = *a_remote_relay.get();
a_transport_channel_stats.ice_transport_stats.connection_infos.push_back(
cricket::ConnectionInfo());
a_transport_channel_stats.ice_transport_stats.connection_infos[3]
.local_candidate = *a_local_relay_prflx.get();
a_transport_channel_stats.ice_transport_stats.connection_infos[3]
.remote_candidate = *a_remote_relay.get();
pc_->AddVoiceChannel("audio", "a"); pc_->AddVoiceChannel("audio", "a");
pc_->SetTransportStats("a", a_transport_channel_stats); pc_->SetTransportStats("a", a_transport_channel_stats);
@ -1399,6 +1423,10 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidateStats) {
ASSERT_TRUE(report->Get(expected_a_local_relay.id())); ASSERT_TRUE(report->Get(expected_a_local_relay.id()));
EXPECT_EQ(expected_a_local_relay, report->Get(expected_a_local_relay.id()) EXPECT_EQ(expected_a_local_relay, report->Get(expected_a_local_relay.id())
->cast_to<RTCLocalIceCandidateStats>()); ->cast_to<RTCLocalIceCandidateStats>());
ASSERT_TRUE(report->Get(expected_a_local_relay_prflx.id()));
EXPECT_EQ(expected_a_local_relay_prflx,
report->Get(expected_a_local_relay_prflx.id())
->cast_to<RTCLocalIceCandidateStats>());
ASSERT_TRUE(report->Get(expected_b_local.id())); ASSERT_TRUE(report->Get(expected_b_local.id()));
EXPECT_EQ( EXPECT_EQ(
expected_b_local, expected_b_local,