From 9e2e6e704b28832c8a50e8f30e308e74713a9395 Mon Sep 17 00:00:00 2001 From: Zach Stein Date: Wed, 12 Dec 2018 15:09:40 -0800 Subject: [PATCH] Set LoggedIceCandidatePairEvent.transaction_id to default value if missing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9972 Change-Id: I559ccb6799b494a9013523d3960a725ea7fd448e Reviewed-on: https://webrtc-review.googlesource.com/c/114240 Reviewed-by: Björn Terelius Commit-Queue: Zach Stein Cr-Commit-Position: refs/heads/master@{#26006} --- logging/rtc_event_log/rtc_event_log_parser_new.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/logging/rtc_event_log/rtc_event_log_parser_new.cc b/logging/rtc_event_log/rtc_event_log_parser_new.cc index b8beff4f52..79747b0d3e 100644 --- a/logging/rtc_event_log/rtc_event_log_parser_new.cc +++ b/logging/rtc_event_log/rtc_event_log_parser_new.cc @@ -1741,6 +1741,8 @@ LoggedIceCandidatePairEvent ParsedRtcEventLogNew::GetIceCandidatePairEvent( res.type = GetRuntimeIceCandidatePairEventType(event.event_type()); RTC_CHECK(event.has_candidate_pair_id()); res.candidate_pair_id = event.candidate_pair_id(); + // transaction_id is not supported by rtclog::Event + res.transaction_id = 0; return res; } @@ -2420,8 +2422,8 @@ void ParsedRtcEventLogNew::StoreIceCandidateEvent( ice_event.candidate_pair_id = proto.candidate_pair_id(); // TODO(zstein): Make the transaction_id field required once all old versions // of the log (which don't have the field) are obsolete. - if (proto.has_transaction_id()) - ice_event.transaction_id = proto.transaction_id(); + ice_event.transaction_id = + proto.has_transaction_id() ? proto.transaction_id() : 0; ice_candidate_pair_events_.push_back(ice_event);