zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove deprecated fields in rtc::NetworkRoute

Browse Source 
this patch is a followup to https://webrtc-review.googlesource.com/c/src/+/170628
and removed the now deprecated fields {local/remote}_network_id that
is now no longer used by downstream.

BUG: webrtc:11434
Change-Id: Ia322609c0b4f07b05b8592cbca7f001a115da109
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171515
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30874}
This commit is contained in:
Jonas Oreland
2020-03-24 14:38:54 +01:00
committed by Commit Bot
parent 26d52e1ba0
commit d1a0062db7
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/base/p2p_transport_channel.cc
View File

@ -1733,12 +1733,6 @@ void P2PTransportChannel::SwitchSelectedConnection(Connection* conn,
/* uses_turn= */ selected_connection_->remote_candidate().type() ==
RELAY_PORT_TYPE);
// Downstream projects depend on the old representation,
// populate that until they have been migrated.
// TODO(jonaso): remove.
network_route_->local_network_id = network_route_->local.network_id();
network_route_->remote_network_id = network_route_->remote.network_id();
network_route_->last_sent_packet_id = last_sent_packet_id_;
network_route_->packet_overhead =
selected_connection_->local_candidate().address().ipaddr().overhead() +

6
rtc_base/network_route.h
View File

@ -71,12 +71,6 @@ struct NetworkRoute {
// This is the maximum of any part of the route.
int packet_overhead = 0;
// Downstream projects depend on the old representation,
// populate that until they have been migrated.
// TODO(jonaso): remove.
uint16_t local_network_id = 0;
uint16_t remote_network_id = 0;
RTC_NO_INLINE inline std::string DebugString() const {
rtc::StringBuilder oss;
oss << "[ connected: " << connected << " local: [ " << local.adapter_id()