Rename kLocal to kHost and kStun to kSrflx
Bug: none
Change-Id: I92845014024e5780365057e81b613b0882724d1d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336740
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41652}
diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
index f1b12f0..83c5441 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
@@ -131,9 +131,9 @@
rtclog::IceCandidatePairConfig::IceCandidateType ConvertIceCandidateType(
IceCandidateType type) {
switch (type) {
- case IceCandidateType::kLocal:
+ case IceCandidateType::kHost:
return rtclog::IceCandidatePairConfig::LOCAL;
- case IceCandidateType::kStun:
+ case IceCandidateType::kSrflx:
return rtclog::IceCandidatePairConfig::STUN;
case IceCandidateType::kPrflx:
return rtclog::IceCandidatePairConfig::PRFLX;
diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
index ebda3bf..7018f71 100644
--- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
+++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
@@ -200,9 +200,9 @@
rtclog2::IceCandidatePairConfig::IceCandidateType ConvertToProtoFormat(
IceCandidateType type) {
switch (type) {
- case IceCandidateType::kLocal:
+ case IceCandidateType::kHost:
return rtclog2::IceCandidatePairConfig::LOCAL;
- case IceCandidateType::kStun:
+ case IceCandidateType::kSrflx:
return rtclog2::IceCandidatePairConfig::STUN;
case IceCandidateType::kPrflx:
return rtclog2::IceCandidatePairConfig::PRFLX;
diff --git a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
index e77253d..c8623a3 100644
--- a/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
+++ b/logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
@@ -32,13 +32,15 @@
kNumValues,
};
-// TODO(tommi): Change the names of candidate types to "host", "srflx" for
-// spec-compliance.
+// TODO(tommi): Move this definition to candidate.h.
enum class IceCandidateType {
- kLocal,
- kStun,
+ kHost,
+ kSrflx,
kPrflx,
kRelay,
+ // TODO(tommi): Legacy names. Remove.
+ kLocal [[deprecated("Use kHost instead")]] = kHost,
+ kStun [[deprecated("Use kSrflx instead ")]] = kSrflx
};
enum class IceCandidatePairProtocol {
diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index c53b1dd..d6469e1 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -171,10 +171,10 @@
IceCandidateType& parsed_type) {
switch (log_type) {
case rtclog::IceCandidatePairConfig::LOCAL:
- parsed_type = IceCandidateType::kLocal;
+ parsed_type = IceCandidateType::kHost;
break;
case rtclog::IceCandidatePairConfig::STUN:
- parsed_type = IceCandidateType::kStun;
+ parsed_type = IceCandidateType::kSrflx;
break;
case rtclog::IceCandidatePairConfig::PRFLX:
parsed_type = IceCandidateType::kPrflx;
@@ -813,16 +813,16 @@
rtclog2::IceCandidatePairConfig::IceCandidateType type) {
switch (type) {
case rtclog2::IceCandidatePairConfig::LOCAL:
- return IceCandidateType::kLocal;
+ return IceCandidateType::kHost;
case rtclog2::IceCandidatePairConfig::STUN:
- return IceCandidateType::kStun;
+ return IceCandidateType::kSrflx;
case rtclog2::IceCandidatePairConfig::PRFLX:
return IceCandidateType::kPrflx;
case rtclog2::IceCandidatePairConfig::RELAY:
return IceCandidateType::kRelay;
default:
RTC_DCHECK_NOTREACHED();
- return IceCandidateType::kLocal;
+ return IceCandidateType::kHost;
}
}
@@ -831,10 +831,10 @@
IceCandidateType& parsed_type) {
switch (log_type) {
case rtclog2::IceCandidatePairConfig::LOCAL:
- parsed_type = IceCandidateType::kLocal;
+ parsed_type = IceCandidateType::kHost;
break;
case rtclog2::IceCandidatePairConfig::STUN:
- parsed_type = IceCandidateType::kStun;
+ parsed_type = IceCandidateType::kSrflx;
break;
case rtclog2::IceCandidatePairConfig::PRFLX:
parsed_type = IceCandidateType::kPrflx;
@@ -2270,13 +2270,13 @@
if (candidate.remote_address_family ==
IceCandidatePairAddressFamily::kIpv6)
route.send_overhead += kIpv6Overhead - kIpv4Overhead;
- if (candidate.remote_candidate_type != IceCandidateType::kLocal)
+ if (candidate.remote_candidate_type != IceCandidateType::kHost)
route.send_overhead += kStunOverhead;
route.return_overhead = kUdpOverhead + kSrtpOverhead + kIpv4Overhead;
if (candidate.remote_address_family ==
IceCandidatePairAddressFamily::kIpv6)
route.return_overhead += kIpv6Overhead - kIpv4Overhead;
- if (candidate.remote_candidate_type != IceCandidateType::kLocal)
+ if (candidate.remote_candidate_type != IceCandidateType::kHost)
route.return_overhead += kStunOverhead;
route_changes.push_back(route);
}
diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
index be771e3..bd83586 100644
--- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
+++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
@@ -224,10 +224,10 @@
// This switch statement only exists to catch changes to the IceCandidateType
// enumeration. If you get an error here, please update the switch statement
// and the return value.
- IceCandidateType type = IceCandidateType::kLocal;
+ IceCandidateType type = IceCandidateType::kHost;
switch (type) {
- case IceCandidateType::kLocal:
- case IceCandidateType::kStun:
+ case IceCandidateType::kHost:
+ case IceCandidateType::kSrflx:
case IceCandidateType::kPrflx:
case IceCandidateType::kRelay:
break;
@@ -237,7 +237,7 @@
std::unique_ptr<RtcEventIceCandidatePairConfig>
EventGenerator::NewIceCandidatePairConfig() {
- static_assert(static_cast<int>(IceCandidateType::kLocal) == 0,
+ static_assert(static_cast<int>(IceCandidateType::kHost) == 0,
"Expect kLocal to be the first enum value, equal to 0");
IceCandidateType local_candidate_type =
static_cast<IceCandidateType>(prng_.Rand(CandidateTypeCount() - 1));
diff --git a/p2p/base/connection.cc b/p2p/base/connection.cc
index cd5166a..3809f12 100644
--- a/p2p/base/connection.cc
+++ b/p2p/base/connection.cc
@@ -77,9 +77,9 @@
// enum.
webrtc::IceCandidateType GetRtcEventLogCandidateType(const Candidate& c) {
if (c.is_local()) {
- return webrtc::IceCandidateType::kLocal;
+ return webrtc::IceCandidateType::kHost;
} else if (c.is_stun()) {
- return webrtc::IceCandidateType::kStun;
+ return webrtc::IceCandidateType::kSrflx;
} else if (c.is_prflx()) {
return webrtc::IceCandidateType::kPrflx;
}
diff --git a/rtc_tools/rtc_event_log_to_text/converter.cc b/rtc_tools/rtc_event_log_to_text/converter.cc
index 79cf03e..3c72bfc 100644
--- a/rtc_tools/rtc_event_log_to_text/converter.cc
+++ b/rtc_tools/rtc_event_log_to_text/converter.cc
@@ -231,8 +231,8 @@
{IceCandidatePairConfigType::kNumValues, "NUM_VALUES"}};
static const std::map<IceCandidateType, std::string>
- candidate_type_name{{IceCandidateType::kLocal, "LOCAL"},
- {IceCandidateType::kStun, "STUN"},
+ candidate_type_name{{IceCandidateType::kHost, "LOCAL"},
+ {IceCandidateType::kSrflx, "STUN"},
{IceCandidateType::kPrflx, "PRFLX"},
{IceCandidateType::kRelay, "RELAY"}};
diff --git a/rtc_tools/rtc_event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
index 33a7ce3..0c7775e 100644
--- a/rtc_tools/rtc_event_log_visualizer/analyzer.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
@@ -261,9 +261,9 @@
absl::string_view GetIceCandidateTypeAsString(IceCandidateType type) {
switch (type) {
- case IceCandidateType::kLocal:
+ case IceCandidateType::kHost:
return kIceCandidateTypeLocal;
- case IceCandidateType::kStun:
+ case IceCandidateType::kSrflx:
return kIceCandidateTypeStun;
case IceCandidateType::kPrflx:
return kIceCandidateTypePrflx;
