webrtc_m130/p2p/base/ice_controller_interface.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

83 lines
3.5 KiB
C++
Raw Normal View History

/*
* Copyright 2019 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "p2p/base/ice_controller_interface.h"
#include <string>
Reland "Refactor IceControllerEvent" 1/n This is a partial reland of commit 794e68cf3dbc3b16ee8b12b5615d8a1622154dbd which - adds a new enum - IceSwitchReason - adds a member for the new enum in IceControllerEvent - adds methods to IceControllerInterface accepting the new enum - adds conversion between the old and new enums for compatibility Original change's description: > Refactor IceControllerEvent > > This change is the first step in decoupling IceControllerEvent from > the ICE switch reason. Further cleanup is earmarked, and will be > landed after some internal cleanup. > > This change > - adds a new enum - IceSwitchReason > - adds a member for the new enum in IceControllerEvent > - uses the new enum within P2PTransportChannel > - adds methods to IceControllerInterface accepting the new enum > - deprecates usages of the old enum in IceControllerInterface > - adds conversion between the old and new enums for compatibility > > Bug: webrtc:14125, webrtc:14131 > Change-Id: I5b7201c3f631eb40db334dfeec842841a7e58174 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264140 > Reviewed-by: Jonas Oreland <jonaso@webrtc.org> > Commit-Queue: Sameer Vijaykar <samvi@google.com> > Cr-Commit-Position: refs/heads/main@{#37051} Bug: webrtc:14125, webrtc:14131 Change-Id: I2ccdd53c80e38dc139669aa3f438864befed3dc0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264506 Commit-Queue: Sameer Vijaykar <samvi@google.com> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37094}
2022-06-02 11:29:09 +02:00
#include "p2p/base/ice_switch_reason.h"
namespace cricket {
std::string IceControllerEvent::ToString() const {
Reland "Refactor IceControllerEvent" 1/n This is a partial reland of commit 794e68cf3dbc3b16ee8b12b5615d8a1622154dbd which - adds a new enum - IceSwitchReason - adds a member for the new enum in IceControllerEvent - adds methods to IceControllerInterface accepting the new enum - adds conversion between the old and new enums for compatibility Original change's description: > Refactor IceControllerEvent > > This change is the first step in decoupling IceControllerEvent from > the ICE switch reason. Further cleanup is earmarked, and will be > landed after some internal cleanup. > > This change > - adds a new enum - IceSwitchReason > - adds a member for the new enum in IceControllerEvent > - uses the new enum within P2PTransportChannel > - adds methods to IceControllerInterface accepting the new enum > - deprecates usages of the old enum in IceControllerInterface > - adds conversion between the old and new enums for compatibility > > Bug: webrtc:14125, webrtc:14131 > Change-Id: I5b7201c3f631eb40db334dfeec842841a7e58174 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264140 > Reviewed-by: Jonas Oreland <jonaso@webrtc.org> > Commit-Queue: Sameer Vijaykar <samvi@google.com> > Cr-Commit-Position: refs/heads/main@{#37051} Bug: webrtc:14125, webrtc:14131 Change-Id: I2ccdd53c80e38dc139669aa3f438864befed3dc0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264506 Commit-Queue: Sameer Vijaykar <samvi@google.com> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37094}
2022-06-02 11:29:09 +02:00
std::string str = IceSwitchReasonToString(reason);
Revert "Refactor IceControllerEvent" This reverts commit 794e68cf3dbc3b16ee8b12b5615d8a1622154dbd. Reason for revert: Possibly breaks downstream project Original change's description: > Refactor IceControllerEvent > > This change is the first step in decoupling IceControllerEvent from the > ICE switch reason. Further cleanup is earmarked, and will be landed > after some internal cleanup. > > This change > - adds a new enum - IceSwitchReason > - adds a member for the new enum in IceControllerEvent > - uses the new enum within P2PTransportChannel > - adds methods to IceControllerInterface accepting the new enum > - deprecates usages of the old enum in IceControllerInterface > - adds conversion between the old and new enums for compatibility > > Bug: webrtc:14125, webrtc:14131 > Change-Id: I5b7201c3f631eb40db334dfeec842841a7e58174 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264140 > Reviewed-by: Jonas Oreland <jonaso@webrtc.org> > Commit-Queue: Sameer Vijaykar <samvi@google.com> > Cr-Commit-Position: refs/heads/main@{#37051} Bug: webrtc:14125, webrtc:14131 Change-Id: Ie6c4dea0f9007f78ce2bf1ee4e6b1dbca08f3142 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264505 Auto-Submit: Sameer Vijaykar <samvi@google.com> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37059}
2022-05-31 11:38:20 +00:00
if (recheck_delay_ms) {
Reland "Refactor IceControllerEvent" 1/n This is a partial reland of commit 794e68cf3dbc3b16ee8b12b5615d8a1622154dbd which - adds a new enum - IceSwitchReason - adds a member for the new enum in IceControllerEvent - adds methods to IceControllerInterface accepting the new enum - adds conversion between the old and new enums for compatibility Original change's description: > Refactor IceControllerEvent > > This change is the first step in decoupling IceControllerEvent from > the ICE switch reason. Further cleanup is earmarked, and will be > landed after some internal cleanup. > > This change > - adds a new enum - IceSwitchReason > - adds a member for the new enum in IceControllerEvent > - uses the new enum within P2PTransportChannel > - adds methods to IceControllerInterface accepting the new enum > - deprecates usages of the old enum in IceControllerInterface > - adds conversion between the old and new enums for compatibility > > Bug: webrtc:14125, webrtc:14131 > Change-Id: I5b7201c3f631eb40db334dfeec842841a7e58174 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264140 > Reviewed-by: Jonas Oreland <jonaso@webrtc.org> > Commit-Queue: Sameer Vijaykar <samvi@google.com> > Cr-Commit-Position: refs/heads/main@{#37051} Bug: webrtc:14125, webrtc:14131 Change-Id: I2ccdd53c80e38dc139669aa3f438864befed3dc0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264506 Commit-Queue: Sameer Vijaykar <samvi@google.com> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37094}
2022-06-02 11:29:09 +02:00
str += " (after delay: " + std::to_string(recheck_delay_ms) + ")";
}
return str;
}
// TODO(bugs.webrtc.org/14125) remove when Type is replaced with
// IceSwitchReason.
IceControllerEvent::Type IceControllerEvent::FromIceSwitchReason(
IceSwitchReason reason) {
switch (reason) {
case IceSwitchReason::REMOTE_CANDIDATE_GENERATION_CHANGE:
return IceControllerEvent::REMOTE_CANDIDATE_GENERATION_CHANGE;
case IceSwitchReason::NETWORK_PREFERENCE_CHANGE:
return IceControllerEvent::NETWORK_PREFERENCE_CHANGE;
case IceSwitchReason::NEW_CONNECTION_FROM_LOCAL_CANDIDATE:
return IceControllerEvent::NEW_CONNECTION_FROM_LOCAL_CANDIDATE;
case IceSwitchReason::NEW_CONNECTION_FROM_REMOTE_CANDIDATE:
return IceControllerEvent::NEW_CONNECTION_FROM_REMOTE_CANDIDATE;
case IceSwitchReason::NEW_CONNECTION_FROM_UNKNOWN_REMOTE_ADDRESS:
return IceControllerEvent::NEW_CONNECTION_FROM_UNKNOWN_REMOTE_ADDRESS;
case IceSwitchReason::NOMINATION_ON_CONTROLLED_SIDE:
return IceControllerEvent::NOMINATION_ON_CONTROLLED_SIDE;
case IceSwitchReason::DATA_RECEIVED:
return IceControllerEvent::DATA_RECEIVED;
case IceSwitchReason::CONNECT_STATE_CHANGE:
return IceControllerEvent::CONNECT_STATE_CHANGE;
case IceSwitchReason::SELECTED_CONNECTION_DESTROYED:
return IceControllerEvent::SELECTED_CONNECTION_DESTROYED;
case IceSwitchReason::ICE_CONTROLLER_RECHECK:
return IceControllerEvent::ICE_CONTROLLER_RECHECK;
}
}
// TODO(bugs.webrtc.org/14125) remove when Type is replaced with
// IceSwitchReason.
IceSwitchReason IceControllerEvent::FromType(IceControllerEvent::Type type) {
switch (type) {
case IceControllerEvent::REMOTE_CANDIDATE_GENERATION_CHANGE:
return IceSwitchReason::REMOTE_CANDIDATE_GENERATION_CHANGE;
case IceControllerEvent::NETWORK_PREFERENCE_CHANGE:
return IceSwitchReason::NETWORK_PREFERENCE_CHANGE;
case IceControllerEvent::NEW_CONNECTION_FROM_LOCAL_CANDIDATE:
return IceSwitchReason::NEW_CONNECTION_FROM_LOCAL_CANDIDATE;
case IceControllerEvent::NEW_CONNECTION_FROM_REMOTE_CANDIDATE:
return IceSwitchReason::NEW_CONNECTION_FROM_REMOTE_CANDIDATE;
case IceControllerEvent::NEW_CONNECTION_FROM_UNKNOWN_REMOTE_ADDRESS:
return IceSwitchReason::NEW_CONNECTION_FROM_UNKNOWN_REMOTE_ADDRESS;
case IceControllerEvent::NOMINATION_ON_CONTROLLED_SIDE:
return IceSwitchReason::NOMINATION_ON_CONTROLLED_SIDE;
case IceControllerEvent::DATA_RECEIVED:
return IceSwitchReason::DATA_RECEIVED;
case IceControllerEvent::CONNECT_STATE_CHANGE:
return IceSwitchReason::CONNECT_STATE_CHANGE;
case IceControllerEvent::SELECTED_CONNECTION_DESTROYED:
return IceSwitchReason::SELECTED_CONNECTION_DESTROYED;
case IceControllerEvent::ICE_CONTROLLER_RECHECK:
return IceSwitchReason::ICE_CONTROLLER_RECHECK;
}
}
} // namespace cricket