Rename IceControllerEvent to IceRecheckEvent 3/n
This changes renames the event to better suit its purpose. An alias
with the old name is added for compatibility pending internal cleanup.
Bug: webrtc:14125, webrtc:14131
Change-Id: I87026e19f2620eaa6a6770dcbedf1d0399c6c6b0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264149
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Commit-Queue: Sameer Vijaykar <samvi@google.com>
Cr-Commit-Position: refs/heads/main@{#37111}
diff --git a/p2p/base/ice_controller_interface.h b/p2p/base/ice_controller_interface.h
index dad2b70..5ec5e5a 100644
--- a/p2p/base/ice_controller_interface.h
+++ b/p2p/base/ice_controller_interface.h
@@ -24,7 +24,7 @@
struct IceFieldTrials; // Forward declaration to avoid circular dependency.
-struct IceControllerEvent {
+struct IceRecheckEvent {
// TODO(bugs.webrtc.org/14125) replace with IceSwitchReason.
enum Type {
REMOTE_CANDIDATE_GENERATION_CHANGE,
@@ -42,11 +42,11 @@
ICE_CONTROLLER_RECHECK,
};
- [[deprecated("bugs.webrtc.org/14125")]] IceControllerEvent(
+ [[deprecated("bugs.webrtc.org/14125")]] IceRecheckEvent(
const Type& _type) // NOLINT: runtime/explicit
: type(_type), reason(FromType(_type)) {}
- IceControllerEvent(IceSwitchReason _reason, int _recheck_delay_ms)
+ IceRecheckEvent(IceSwitchReason _reason, int _recheck_delay_ms)
: type(FromIceSwitchReason(_reason)),
reason(_reason),
recheck_delay_ms(_recheck_delay_ms) {}
@@ -62,6 +62,9 @@
int recheck_delay_ms = 0;
};
+// TODO(bugs.webrtc.org/14125): remove.
+using IceControllerEvent = IceRecheckEvent;
+
// Defines the interface for a module that control
// - which connection to ping
// - which connection to use
@@ -93,7 +96,7 @@
absl::optional<const Connection*> connection;
// An optional recheck event for when a Switch() should be attempted again.
- absl::optional<IceControllerEvent> recheck_event;
+ absl::optional<IceRecheckEvent> recheck_event;
// A vector with connection to run ForgetLearnedState on.
std::vector<const Connection*> connections_to_forget_state_on;
@@ -152,9 +155,8 @@
// This method is called for IceSwitchReasons that can switch directly
// i.e without resorting.
[[deprecated("bugs.webrtc.org/14125")]] virtual SwitchResult
- ShouldSwitchConnection(IceControllerEvent reason,
- const Connection* connection) {
- return ShouldSwitchConnection(IceControllerEvent::FromType(reason.type),
+ ShouldSwitchConnection(IceRecheckEvent reason, const Connection* connection) {
+ return ShouldSwitchConnection(IceRecheckEvent::FromType(reason.type),
connection);
}
virtual SwitchResult ShouldSwitchConnection(IceSwitchReason reason,
@@ -162,8 +164,8 @@
// Sort connections and check if we should switch.
[[deprecated("bugs.webrtc.org/14125")]] virtual SwitchResult
- SortAndSwitchConnection(IceControllerEvent reason) {
- return SortAndSwitchConnection(IceControllerEvent::FromType(reason.type));
+ SortAndSwitchConnection(IceRecheckEvent reason) {
+ return SortAndSwitchConnection(IceRecheckEvent::FromType(reason.type));
}
virtual SwitchResult SortAndSwitchConnection(IceSwitchReason reason) = 0;