mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-18 08:07:56 +01:00
8c316c1a89
This reverts commit 71677452f9.
Reason for revert: Broke Chromium.
Original change's description:
> Replaced the SignalSelectedCandidatePairChanged with a new signal.
>
> |transport overhead| field is added to rtc::NetworkRoute structure.
>
> In PackTransportInternal:
> 1. network_route() is added which returns the current network route.
> 2. debug_name() is removed.
> 3. transport_name() is moved from DtlsTransportInternal and
> IceTransportInternal to PacketTransportInternal.
>
> When the selected candidate pair is changed, the P2PTransportChannel
> will fire the SignalNetworkRouteChanged instead of
> SignalSelectedCandidatePairChanged to upper layers.
>
> The Rtp/SrtpTransport takes the responsibility of calculating the
> transport overhead from the BaseChannel so that the BaseChannel
> doesn't need to depend on P2P layer transports.
>
> Bug: webrtc:7013
> Change-Id: I60d30d785666a50a95052d00bf08f829d8f57e9c
> Reviewed-on: https://webrtc-review.googlesource.com/13520
> Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
> Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20661}
TBR=steveanton@webrtc.org,zhihuang@webrtc.org,pthatcher@webrtc.org
Change-Id: Ie0c76786855b65bb8caba7065593c961e4bf9de7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7013
Reviewed-on: https://webrtc-review.googlesource.com/22764
Reviewed-by: Zhi Huang <zhihuang@webrtc.org>
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20662}
53 lines
1.8 KiB
C++
53 lines
1.8 KiB
C++
/*
|
|
* Copyright 2016 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.
|
|
*/
|
|
|
|
#ifndef RTC_BASE_NETWORKROUTE_H_
|
|
#define RTC_BASE_NETWORKROUTE_H_
|
|
|
|
// TODO(honghaiz): Make a directory that describes the interfaces and structs
|
|
// the media code can rely on and the network code can implement, and both can
|
|
// depend on that, but not depend on each other. Then, move this file to that
|
|
// directory.
|
|
namespace rtc {
|
|
|
|
struct NetworkRoute {
|
|
bool connected;
|
|
uint16_t local_network_id;
|
|
uint16_t remote_network_id;
|
|
int last_sent_packet_id; // Last packet id sent on the PREVIOUS route.
|
|
|
|
NetworkRoute()
|
|
: connected(false),
|
|
local_network_id(0),
|
|
remote_network_id(0),
|
|
last_sent_packet_id(-1) {}
|
|
|
|
// The route is connected if the local and remote network ids are provided.
|
|
NetworkRoute(bool connected,
|
|
uint16_t local_net_id,
|
|
uint16_t remote_net_id,
|
|
int last_packet_id)
|
|
: connected(connected),
|
|
local_network_id(local_net_id),
|
|
remote_network_id(remote_net_id),
|
|
last_sent_packet_id(last_packet_id) {}
|
|
|
|
// |last_sent_packet_id| does not affect the NetworkRoute comparison.
|
|
bool operator==(const NetworkRoute& nr) const {
|
|
return connected == nr.connected &&
|
|
local_network_id == nr.local_network_id &&
|
|
remote_network_id == nr.remote_network_id;
|
|
}
|
|
|
|
bool operator!=(const NetworkRoute& nr) const { return !(*this == nr); }
|
|
};
|
|
} // namespace rtc
|
|
|
|
#endif // RTC_BASE_NETWORKROUTE_H_
|