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

Revert "Add transaction id to CandidatePairEvents."

Browse Source 
This reverts commit c308bdfa451ee2ceac7096b6777fcbf756f4091a.

Reason for revert: The msan bot has been consistently failing since this commit. See eg https://ci.chromium.org/p/webrtc/builders/luci.webrtc.ci/Linux%20MSan/16989

Original change's description:
> Add transaction id to CandidatePairEvents.
> 
> The transaction id is a randomly generated number used to link stun
> requests and responses (https://tools.ietf.org/html/rfc5389#section-6).
> Logging this will help us debug ICE network issues.
> 
> Bug: webrtc:9972
> Change-Id: I93167cb119aad99156e8727b6e4eeeff5198f924
> Reviewed-on: https://webrtc-review.googlesource.com/c/109720
> Commit-Queue: Zach Stein <zstein@webrtc.org>
> Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> Reviewed-by: Elad Alon <eladalon@webrtc.org>
> Reviewed-by: Björn Terelius <terelius@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25848}

TBR=eladalon@webrtc.org,terelius@webrtc.org,zstein@webrtc.org,qingsi@webrtc.org,jeroendb@webrtc.org

Change-Id: Ib3b0a845f2300f4fcba2061650e17522735f08b3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9972
Reviewed-on: https://webrtc-review.googlesource.com/c/112581
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25852}
This commit is contained in:
Erik Språng
2018-11-30 09:28:14 +00:00
committed by Commit Bot
parent 3c19f2884c
commit 286ee0123e
10 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
logging/rtc_event_log/events/rtc_event_ice_candidate_pair.cc
View File

@ -16,18 +16,14 @@ namespace webrtc {
RtcEventIceCandidatePair::RtcEventIceCandidatePair(
IceCandidatePairEventType type,
uint32_t candidate_pair_id,
uint32_t transaction_id)
: type_(type),
candidate_pair_id_(candidate_pair_id),
transaction_id_(transaction_id) {}
uint32_t candidate_pair_id)
: type_(type), candidate_pair_id_(candidate_pair_id) {}
RtcEventIceCandidatePair::RtcEventIceCandidatePair(
const RtcEventIceCandidatePair& other)
: RtcEvent(other.timestamp_us_),
type_(other.type_),
candidate_pair_id_(other.candidate_pair_id_),
transaction_id_(other.transaction_id_) {}
candidate_pair_id_(other.candidate_pair_id_) {}
RtcEventIceCandidatePair::~RtcEventIceCandidatePair() = default;

5
logging/rtc_event_log/events/rtc_event_ice_candidate_pair.h
View File

@ -29,8 +29,7 @@ enum class IceCandidatePairEventType {
class RtcEventIceCandidatePair final : public RtcEvent {
public:
RtcEventIceCandidatePair(IceCandidatePairEventType type,
uint32_t candidate_pair_id,
uint32_t transaction_id);
uint32_t candidate_pair_id);
~RtcEventIceCandidatePair() override;
@ -42,14 +41,12 @@ class RtcEventIceCandidatePair final : public RtcEvent {
IceCandidatePairEventType type() const { return type_; }
uint32_t candidate_pair_id() const { return candidate_pair_id_; }
uint32_t transaction_id() const { return transaction_id_; }
private:
RtcEventIceCandidatePair(const RtcEventIceCandidatePair& other);
const IceCandidatePairEventType type_;
const uint32_t candidate_pair_id_;
const uint32_t transaction_id_;
};
} // namespace webrtc