From ab360ac6abb3fa1e7e9662194e89de497df19385 Mon Sep 17 00:00:00 2001 From: Mikhail Baranov Date: Sat, 30 Nov 2024 20:34:08 +0100 Subject: [PATCH] dump --- .../roc_pipeline/receiver_session_group.cpp | 6 +- .../roc_pipeline/sender_session.cpp | 6 +- .../roc_rtcp/communicator.cpp | 15 +- src/internal_modules/roc_rtcp/communicator.h | 12 +- src/internal_modules/roc_rtcp/reporter.cpp | 7 +- src/internal_modules/roc_rtcp/reporter.h | 15 +- .../roc_rtcp/rtt_estimator.cpp | 17 +- src/internal_modules/roc_rtcp/rtt_estimator.h | 8 +- src/tests/roc_rtcp/test_communicator.cpp | 212 +++++++++--------- 9 files changed, 159 insertions(+), 139 deletions(-) diff --git a/src/internal_modules/roc_pipeline/receiver_session_group.cpp b/src/internal_modules/roc_pipeline/receiver_session_group.cpp index 303d17e10..4ecc519c4 100644 --- a/src/internal_modules/roc_pipeline/receiver_session_group.cpp +++ b/src/internal_modules/roc_pipeline/receiver_session_group.cpp @@ -69,9 +69,9 @@ ReceiverSessionGroup::create_control_pipeline(ReceiverEndpoint* control_endpoint // We pass this as implementation of rtcp::IParticipant. // rtcp::Communicator will call our methods right now (in constructor) // and later when we call generate_packets() or process_packets(). - rtcp_communicator_.reset(new (rtcp_communicator_) rtcp::Communicator( - source_config_.common.rtcp, *this, *control_endpoint->outbound_writer(), - *control_endpoint->outbound_composer(), packet_factory_, arena_)); + rtcp_communicator_.reset(new(rtcp_communicator_) rtcp::Communicator( + source_config_.common.rtcp, *this, *control_endpoint->outbound_writer(), + *control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_)); const status::StatusCode code = rtcp_communicator_->init_status(); if (code != status::StatusOK) { diff --git a/src/internal_modules/roc_pipeline/sender_session.cpp b/src/internal_modules/roc_pipeline/sender_session.cpp index 51a5d3c9f..2b7244267 100644 --- a/src/internal_modules/roc_pipeline/sender_session.cpp +++ b/src/internal_modules/roc_pipeline/sender_session.cpp @@ -233,9 +233,9 @@ SenderSession::create_control_pipeline(SenderEndpoint* control_endpoint) { rtcp_outbound_addr_ = control_endpoint->outbound_address(); - rtcp_communicator_.reset(new (rtcp_communicator_) rtcp::Communicator( - sink_config_.rtcp, *this, control_endpoint->outbound_writer(), - control_endpoint->outbound_composer(), packet_factory_, arena_)); + rtcp_communicator_.reset(new(rtcp_communicator_) rtcp::Communicator( + sink_config_.rtcp, *this, control_endpoint->outbound_writer(), + control_endpoint->outbound_composer(), packet_factory_, arena_, dumper_)); const status::StatusCode code = rtcp_communicator_->init_status(); if (code != status::StatusOK) { diff --git a/src/internal_modules/roc_rtcp/communicator.cpp b/src/internal_modules/roc_rtcp/communicator.cpp index 70b9a48d7..e8215f03c 100644 --- a/src/internal_modules/roc_rtcp/communicator.cpp +++ b/src/internal_modules/roc_rtcp/communicator.cpp @@ -10,6 +10,7 @@ #include "roc_core/log.h" #include "roc_core/panic.h" #include "roc_core/time.h" +#include "roc_dbgio/csv_dumper.h" #include "roc_packet/ntp.h" #include "roc_packet/units.h" #include "roc_rtcp/headers.h" @@ -25,17 +26,14 @@ const core::nanoseconds_t LogInterval = core::Second * 30; } // namespace -Communicator::Communicator(const Config& config, - IParticipant& participant, - packet::IWriter& packet_writer, - packet::IComposer& packet_composer, - packet::PacketFactory& packet_factory, - core::IArena& arena) +Communicator::Communicator(const Config &config, IParticipant &participant, packet::IWriter &packet_writer, + packet::IComposer &packet_composer, packet::PacketFactory &packet_factory, + core::IArena &arena, dbgio::CsvDumper* dumper) : packet_factory_(packet_factory) , packet_writer_(packet_writer) , packet_composer_(packet_composer) , config_(config) - , reporter_(config, participant, arena) + , reporter_(config, participant, arena, dumper) , next_deadline_(0) , dest_addr_count_(0) , dest_addr_index_(0) @@ -50,7 +48,8 @@ Communicator::Communicator(const Config& config, , processed_packet_count_(0) , generated_packet_count_(0) , log_limiter_(LogInterval) - , init_status_(status::NoStatus) { + , init_status_(status::NoStatus) + , dumper_(dumper) { if ((init_status_ = reporter_.init_status()) != status::StatusOK) { return; } diff --git a/src/internal_modules/roc_rtcp/communicator.h b/src/internal_modules/roc_rtcp/communicator.h index 4b4e4eb39..ca80cdd13 100644 --- a/src/internal_modules/roc_rtcp/communicator.h +++ b/src/internal_modules/roc_rtcp/communicator.h @@ -17,6 +17,7 @@ #include "roc_core/rate_limiter.h" #include "roc_core/stddefs.h" #include "roc_core/time.h" +#include "roc_dbgio/csv_dumper.h" #include "roc_packet/icomposer.h" #include "roc_packet/iwriter.h" #include "roc_packet/packet.h" @@ -56,12 +57,9 @@ namespace rtcp { class Communicator : public core::NonCopyable<> { public: //! Initialize. - Communicator(const Config& config, - IParticipant& participant, - packet::IWriter& packet_writer, - packet::IComposer& packet_composer, - packet::PacketFactory& packet_factory, - core::IArena& arena); + Communicator(const Config &config, IParticipant &participant, packet::IWriter &packet_writer, + packet::IComposer &packet_composer, packet::PacketFactory &packet_factory, + core::IArena &arena, dbgio::CsvDumper* dumper); //! Check if the object was successfully constructed. status::StatusCode init_status() const; @@ -169,6 +167,8 @@ class Communicator : public core::NonCopyable<> { core::RateLimiter log_limiter_; status::StatusCode init_status_; + + dbgio::CsvDumper* dumper_; }; } // namespace rtcp diff --git a/src/internal_modules/roc_rtcp/reporter.cpp b/src/internal_modules/roc_rtcp/reporter.cpp index 50ba0f274..72aea1c88 100644 --- a/src/internal_modules/roc_rtcp/reporter.cpp +++ b/src/internal_modules/roc_rtcp/reporter.cpp @@ -21,7 +21,7 @@ namespace roc { namespace rtcp { -Reporter::Reporter(const Config& config, IParticipant& participant, core::IArena& arena) +Reporter::Reporter(const Config &config, IParticipant &participant, core::IArena &arena, dbgio::CsvDumper *dumper) : arena_(arena) , participant_(participant) , local_source_id_(0) @@ -43,7 +43,8 @@ Reporter::Reporter(const Config& config, IParticipant& participant, core::IArena , report_time_(0) , config_(config) , max_delay_(packet::ntp_2_nanoseconds(header::MaxDelay)) - , init_status_(status::NoStatus) { + , init_status_(status::NoStatus) + , dumper_(dumper) { memset(local_cname_, 0, sizeof(local_cname_)); const ParticipantInfo part_info = participant_.participant_info(); @@ -1400,7 +1401,7 @@ Reporter::find_stream_(packet::stream_source_t source_id, CreateMode mode) { (unsigned long)source_id); stream = - new (stream_pool_) Stream(stream_pool_, source_id, report_time_, config_.rtt); + new(stream_pool_) Stream(stream_pool_, source_id, report_time_, config_.rtt, dumper_); if (!stream) { report_error_ = status::StatusNoMem; return NULL; diff --git a/src/internal_modules/roc_rtcp/reporter.h b/src/internal_modules/roc_rtcp/reporter.h index d03165f59..8022a50ec 100644 --- a/src/internal_modules/roc_rtcp/reporter.h +++ b/src/internal_modules/roc_rtcp/reporter.h @@ -34,6 +34,7 @@ #include "roc_rtcp/rtt_estimator.h" #include "roc_rtcp/sdes.h" #include "roc_status/status_code.h" +#include "roc_dbgio/csv_dumper.h" namespace roc { namespace rtcp { @@ -90,7 +91,7 @@ namespace rtcp { class Reporter : public core::NonCopyable<> { public: //! Initialize. - Reporter(const Config& config, IParticipant& participant, core::IArena& arena); + Reporter(const Config &config, IParticipant &participant, core::IArena &arena, dbgio::CsvDumper *dumper); ~Reporter(); //! Check if the object was successfully constructed. @@ -261,16 +262,14 @@ class Reporter : public core::NonCopyable<> { struct Stream : core::RefCounted, core::HashmapNode<>, core::ListNode<> { - Stream(core::IPool& pool, - packet::stream_source_t source_id, - core::nanoseconds_t report_time, - const RttConfig& rtt_config) + Stream(core::IPool &pool, packet::stream_source_t source_id, core::nanoseconds_t report_time, + const RttConfig &rtt_config, dbgio::CsvDumper *dumper) : core::RefCounted(pool) , source_id(source_id) , has_remote_recv_report(false) - , remote_recv_rtt(rtt_config) + , remote_recv_rtt(rtt_config, dumper) , has_remote_send_report(false) - , remote_send_rtt(rtt_config) + , remote_send_rtt(rtt_config, dumper) , local_recv_report(NULL) , last_update(report_time) , last_local_sr(0) @@ -483,6 +482,8 @@ class Reporter : public core::NonCopyable<> { const core::nanoseconds_t max_delay_; status::StatusCode init_status_; + + dbgio::CsvDumper* dumper_; }; } // namespace rtcp diff --git a/src/internal_modules/roc_rtcp/rtt_estimator.cpp b/src/internal_modules/roc_rtcp/rtt_estimator.cpp index 005857e32..d361350c3 100644 --- a/src/internal_modules/roc_rtcp/rtt_estimator.cpp +++ b/src/internal_modules/roc_rtcp/rtt_estimator.cpp @@ -12,12 +12,13 @@ namespace roc { namespace rtcp { -RttEstimator::RttEstimator(const RttConfig& config) +RttEstimator::RttEstimator(const RttConfig &config, dbgio::CsvDumper *dumper) : config_(config) , metrics_() , has_metrics_(false) , first_report_ts_(0) - , last_report_ts_(0) { + , last_report_ts_(0) + , dumper_(dumper) { } bool RttEstimator::has_metrics() const { @@ -89,6 +90,18 @@ void RttEstimator::update(core::nanoseconds_t local_report_ts, metrics_.rtt = rtt; has_metrics_ = true; + + dump_(); +} + +void RttEstimator::dump_() { + dbgio::CsvEntry e; + e.type = 'r'; + e.n_fields = 3; + e.fields[0] = core::timestamp(core::ClockUnix); + e.fields[1] = metrics_.rtt; + e.fields[2] = metrics_.clock_offset; + dumper_->write(e); } } // namespace rtcp diff --git a/src/internal_modules/roc_rtcp/rtt_estimator.h b/src/internal_modules/roc_rtcp/rtt_estimator.h index 9f4208141..bcb3aa756 100644 --- a/src/internal_modules/roc_rtcp/rtt_estimator.h +++ b/src/internal_modules/roc_rtcp/rtt_estimator.h @@ -14,6 +14,7 @@ #include "roc_core/time.h" #include "roc_packet/units.h" +#include "roc_dbgio/csv_dumper.h" namespace roc { namespace rtcp { @@ -51,7 +52,7 @@ struct RttMetrics { class RttEstimator { public: //! Initialize. - RttEstimator(const RttConfig& config); + RttEstimator(const RttConfig &config, dbgio::CsvDumper *dumper); //! Check whether metrics are already available. bool has_metrics() const; @@ -71,12 +72,17 @@ class RttEstimator { core::nanoseconds_t local_reply_ts); private: + void dump_(); + const RttConfig config_; RttMetrics metrics_; bool has_metrics_; core::nanoseconds_t first_report_ts_; core::nanoseconds_t last_report_ts_; + + dbgio::CsvDumper *dumper_; + }; } // namespace rtcp diff --git a/src/tests/roc_rtcp/test_communicator.cpp b/src/tests/roc_rtcp/test_communicator.cpp index 76fd24a92..330021481 100644 --- a/src/tests/roc_rtcp/test_communicator.cpp +++ b/src/tests/roc_rtcp/test_communicator.cpp @@ -634,13 +634,13 @@ TEST(communicator, one_sender_one_receiver) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -700,19 +700,19 @@ TEST(communicator, two_senders_one_receiver) { packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send1_time = 10000000000000000; @@ -811,19 +811,19 @@ TEST(communicator, one_sender_two_receivers) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_Back); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_Back); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -914,13 +914,13 @@ TEST(communicator, receiver_report_first) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -981,13 +981,13 @@ TEST(communicator, bidirectional_peers) { packet::FifoQueue peer1_queue; MockParticipant peer1_part(Peer1Cname, Peer1Ssrc, Report_ToAddress); Communicator peer1_comm(config, peer1_part, peer1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, peer1_comm.init_status()); packet::FifoQueue peer2_queue; MockParticipant peer2_part(Peer2Cname, Peer2Ssrc, Report_ToAddress); Communicator peer2_comm(config, peer2_part, peer2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, peer2_comm.init_status()); core::nanoseconds_t peer1_time = 10000000000000000; @@ -1094,25 +1094,25 @@ TEST(communicator, long_run) { packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_Back); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_Back); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send1_time = 10000000000000000; @@ -1283,13 +1283,13 @@ TEST(communicator, halt_goodbye) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -1347,19 +1347,19 @@ TEST(communicator, halt_timeout) { packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, SendSsrc1, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, SendSsrc2, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send1_time = 10000000000000000; @@ -1467,19 +1467,19 @@ TEST(communicator, halt_cname_change) { packet::FifoQueue send1_queue; MockParticipant send1_part(SendCnameA, SendSsrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(SendCnameB, SendSsrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -1543,7 +1543,7 @@ TEST(communicator, cname_comes_earlier) { packet::FifoQueue send1_queue; MockParticipant send1_part(SendCname, SendSsrc, Report_ToAddress); Communicator send1_comm(send1_config, send1_part, send1_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); Config send2_config; @@ -1554,14 +1554,14 @@ TEST(communicator, cname_comes_earlier) { packet::FifoQueue send2_queue; MockParticipant send2_part(NoCname, SendSsrc, Report_ToAddress); Communicator send2_comm(send2_config, send2_part, send2_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); Config recv_config; packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -1622,7 +1622,7 @@ TEST(communicator, cname_comes_later) { packet::FifoQueue send1_queue; MockParticipant send1_part(NoCname, SendSsrc, Report_ToAddress); Communicator send1_comm(send1_config, send1_part, send1_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); Config send2_config; @@ -1633,14 +1633,14 @@ TEST(communicator, cname_comes_later) { packet::FifoQueue send2_queue; MockParticipant send2_part(SendCname, SendSsrc, Report_ToAddress); Communicator send2_comm(send2_config, send2_part, send2_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); Config recv_config; packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -1704,19 +1704,19 @@ TEST(communicator, collision_send_report) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrcA, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -1848,19 +1848,19 @@ TEST(communicator, collision_recv_report) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrcA, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_ToAddress); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_ToAddress); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -1989,19 +1989,19 @@ TEST(communicator, collision_unrelated_recv_report) { packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1SsrcA, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_ToAddress); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_ToAddress); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send1_time = 10000000000000000; @@ -2130,13 +2130,13 @@ TEST(communicator, collision_sdes_different_cname) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrcA, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); Config send2_config; @@ -2147,7 +2147,7 @@ TEST(communicator, collision_sdes_different_cname) { packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(send2_config, send2_part, send2_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -2277,13 +2277,13 @@ TEST(communicator, collision_sdes_same_cname) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); Config send2_config; @@ -2294,7 +2294,7 @@ TEST(communicator, collision_sdes_same_cname) { packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(send2_config, send2_part, send2_queue, composer, - packet_factory, arena); + packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -2386,13 +2386,13 @@ TEST(communicator, network_loop) { packet::FifoQueue local_queue; MockParticipant local_part(LocalCname, LocalSsrc, Report_ToAddress); Communicator local_comm(config, local_part, local_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, local_comm.init_status()); packet::FifoQueue remote_queue; MockParticipant remote_part(RemoteCname, RemoteSsrc, Report_ToAddress); Communicator remote_comm(config, remote_part, remote_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, remote_comm.init_status()); core::nanoseconds_t local_time = 10000000000000000; @@ -2492,14 +2492,14 @@ TEST(communicator, missing_sender_sdes) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2534,7 +2534,7 @@ TEST(communicator, missing_receiver_sdes) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; @@ -2544,7 +2544,7 @@ TEST(communicator, missing_receiver_sdes) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2585,14 +2585,14 @@ TEST(communicator, missing_sender_sr) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2626,7 +2626,7 @@ TEST(communicator, missing_receiver_rr) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; @@ -2636,7 +2636,7 @@ TEST(communicator, missing_receiver_rr) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2675,14 +2675,14 @@ TEST(communicator, missing_sender_xr) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2718,7 +2718,7 @@ TEST(communicator, missing_receiver_xr) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(send_config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); Config recv_config; @@ -2728,7 +2728,7 @@ TEST(communicator, missing_receiver_xr) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(recv_config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2766,7 +2766,7 @@ TEST(communicator, split_sender_report) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, small_packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2787,7 +2787,7 @@ TEST(communicator, split_sender_report) { packet::FifoQueue recv_queue; MockParticipant recv_part(recv_cname, recv_ssrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); // Generate receiver report @@ -2823,7 +2823,7 @@ TEST(communicator, split_sender_report) { packet::FifoQueue recv_queue; MockParticipant recv_part(recv_cname, recv_ssrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, small_packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); // Deliver sender report packets to one of the receivers @@ -2858,13 +2858,13 @@ TEST(communicator, split_receiver_report) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, small_packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, small_packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -2911,7 +2911,7 @@ TEST(communicator, split_bidirectional_report) { packet::FifoQueue local_queue; MockParticipant local_part(local_cname, LocalSsrc, Report_ToAddress); Communicator local_comm(config, local_part, local_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, local_comm.init_status()); core::nanoseconds_t local_time = 10000000000000000; @@ -2933,7 +2933,7 @@ TEST(communicator, split_bidirectional_report) { packet::FifoQueue remote_queue; MockParticipant remote_part(remote_cname, remote_ssrc, Report_ToAddress); Communicator remote_comm(config, remote_part, remote_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, remote_comm.init_status()); // Generate remote peer report @@ -2976,7 +2976,7 @@ TEST(communicator, split_bidirectional_report) { packet::FifoQueue remote_queue; MockParticipant remote_part(remote_cname, remote_ssrc, Report_ToAddress); Communicator remote_comm(config, remote_part, remote_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, remote_comm.init_status()); // Deliver local peer report packets to one of the remote peers @@ -3019,19 +3019,19 @@ TEST(communicator, report_to_address_sender) { MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); send_part.set_report_address(send_dest_addr); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_ToAddress); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_ToAddress); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -3156,7 +3156,7 @@ TEST(communicator, report_to_address_receiver) { MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); recv_part.set_report_address(recv_dest_addr); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -3200,19 +3200,19 @@ TEST(communicator, report_back_sender) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_Back); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv1_queue; MockParticipant recv1_part(Recv1Cname, Recv1Ssrc, Report_ToAddress); Communicator recv1_comm(config, recv1_part, recv1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv1_comm.init_status()); packet::FifoQueue recv2_queue; MockParticipant recv2_part(Recv2Cname, Recv2Ssrc, Report_ToAddress); Communicator recv2_comm(config, recv2_part, recv2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv2_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -3336,19 +3336,19 @@ TEST(communicator, report_back_receiver) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -3487,25 +3487,25 @@ TEST(communicator, report_back_combine_reports) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); packet::FifoQueue send1_queue; MockParticipant send1_part(Send1Cname, Send1Ssrc, Report_ToAddress); Communicator send1_comm(config, send1_part, send1_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send1_comm.init_status()); packet::FifoQueue send2_queue; MockParticipant send2_part(Send2Cname, Send2Ssrc, Report_ToAddress); Communicator send2_comm(config, send2_part, send2_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send2_comm.init_status()); packet::FifoQueue send3_queue; MockParticipant send3_part(Send3Cname, Send3Ssrc, Report_ToAddress); Communicator send3_comm(config, send3_part, send3_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send3_comm.init_status()); core::nanoseconds_t recv_time = 10000000000000000; @@ -3630,7 +3630,7 @@ TEST(communicator, report_back_split_reports) { packet::FifoQueue local_queue; MockParticipant local_part(local_cname, LocalSsrc, Report_Back); Communicator local_comm(config, local_part, local_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, local_comm.init_status()); core::nanoseconds_t local_time = 10000000000000000; @@ -3650,7 +3650,7 @@ TEST(communicator, report_back_split_reports) { packet::FifoQueue remote_queue; MockParticipant remote_part(remote_cname, remote_ssrc, Report_ToAddress); Communicator remote_comm(config, remote_part, remote_queue, composer, - small_packet_factory, arena); + small_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, remote_comm.init_status()); // Generate remote peer report @@ -3733,13 +3733,13 @@ TEST(communicator, rtt) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -3837,13 +3837,13 @@ TEST(communicator, rtt_clock_drift) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -3928,13 +3928,13 @@ TEST(communicator, rtt_network_jitter) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4021,13 +4021,13 @@ TEST(communicator, rtt_network_losses) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4121,13 +4121,13 @@ TEST(communicator, rtt_network_delays) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4239,13 +4239,13 @@ TEST(communicator, rtt_network_reordering) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4375,13 +4375,13 @@ TEST(communicator, rtt_network_duplicates) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4505,13 +4505,13 @@ TEST(communicator, rtt_missing_xr) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_Back); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = SendStartTime; @@ -4581,7 +4581,7 @@ TEST(communicator, generation_error) { packet::FifoQueue peer_queue; MockParticipant peer_part(Cname, Ssrc, Report_ToAddress); Communicator peer_comm(config, peer_part, peer_queue, composer, packet_factory, - peer_arena); + peer_arena, NULL); LONGS_EQUAL(status::StatusOK, peer_comm.init_status()); core::nanoseconds_t peer_time = 10000000000000000; @@ -4604,7 +4604,7 @@ TEST(communicator, generation_error) { MockWriter peer_writer(status::StatusDrain); MockParticipant peer_part(Cname, Ssrc, Report_ToAddress); Communicator peer_comm(config, peer_part, peer_writer, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, peer_comm.init_status()); core::nanoseconds_t peer_time = 10000000000000000; @@ -4619,7 +4619,7 @@ TEST(communicator, generation_error) { MockParticipant peer_part(Cname, Ssrc, Report_ToAddress); // factory creates unreasonably small buffers Communicator peer_comm(config, peer_part, peer_queue, composer, - tiny_packet_factory, arena); + tiny_packet_factory, arena, NULL); LONGS_EQUAL(status::StatusOK, peer_comm.init_status()); core::nanoseconds_t peer_time = 10000000000000000; @@ -4643,7 +4643,7 @@ TEST(communicator, processing_error) { packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - recv_arena); + recv_arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000; @@ -4667,7 +4667,7 @@ TEST(communicator, processing_error) { packet::FifoQueue send_queue; MockParticipant send_part(send_cname, send_ssrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); // Generate sender report @@ -4713,13 +4713,13 @@ TEST(communicator, notification_error) { packet::FifoQueue send_queue; MockParticipant send_part(SendCname, SendSsrc, Report_ToAddress); Communicator send_comm(config, send_part, send_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, send_comm.init_status()); packet::FifoQueue recv_queue; MockParticipant recv_part(RecvCname, RecvSsrc, Report_ToAddress); Communicator recv_comm(config, recv_part, recv_queue, composer, packet_factory, - arena); + arena, NULL); LONGS_EQUAL(status::StatusOK, recv_comm.init_status()); core::nanoseconds_t send_time = 10000000000000000;