From 952429aa89d2cf8a4e1421cdd3253aea1ccbb655 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 15 Apr 2025 07:53:00 -0400 Subject: [PATCH] MT#55283 convert last_packet to int64_t Change-Id: I21aec3c852a213c433b3a6c62d8b039303ec0f01 --- daemon/call.c | 8 +++--- daemon/call_interfaces.c | 2 +- daemon/cli.c | 2 +- daemon/media_socket.c | 2 +- daemon/redis.c | 3 +-- include/call.h | 4 +-- t/auto-daemon-tests-redis-json.pl | 40 ---------------------------- t/auto-daemon-tests-redis.pl | 44 ------------------------------- 8 files changed, 10 insertions(+), 95 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index 0753c1973..3e665289a 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -200,12 +200,12 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) { if (PS_ISSET(ps, RTP)) { if (timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&ps->stats_in->last_packet) < 2) { // kernel activity - if (timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&ps->last_packet) < 2) + if (rtpe_now - atomic64_get_na(&ps->last_packet_us) < 2000000LL) hlp->user_kernel_streams++; // user activity else hlp->kernel_streams++; } - else if (timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&ps->last_packet) < 2) + else if (rtpe_now - atomic64_get_na(&ps->last_packet_us) < 2000000LL) hlp->user_streams++; // user activity } @@ -975,7 +975,7 @@ struct packet_stream *__packet_stream_new(call_t *call) { mutex_init(&stream->in_lock); mutex_init(&stream->out_lock); stream->call = call; - atomic64_set_na(&stream->last_packet, timeval_from_us(rtpe_now).tv_sec); + atomic64_set_na(&stream->last_packet_us, rtpe_now); stream->rtp_stats = rtp_stats_ht_new(); recording_init_stream(stream); stream->send_timer = send_timer_new(stream); @@ -1018,7 +1018,7 @@ static void __fill_stream(struct packet_stream *ps, const struct endpoint *epp, struct endpoint ep; struct call_media *media = ps->media; - atomic64_set_na(&ps->last_packet, timeval_from_us(rtpe_now).tv_sec); + atomic64_set_na(&ps->last_packet_us, rtpe_now); ep = *epp; ep.port += port_off; diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index 8d63f377e..14e799ade 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -2798,7 +2798,7 @@ static void ng_stats_stream(ng_command_ctx_t *ctx, parser_arg list, const struct ps->crypto.params.crypto_suite->name); parser->dict_add_int(dict, "last packet", packet_stream_last_packet(ps)); parser->dict_add_int(dict, "last kernel packet", atomic64_get_na(&ps->stats_in->last_packet)); - parser->dict_add_int(dict, "last user packet", atomic64_get_na(&ps->last_packet)); + parser->dict_add_int(dict, "last user packet", atomic64_get_na(&ps->last_packet_us) / 1000000LL); flags = parser->dict_add_list(dict, "flags"); diff --git a/daemon/cli.c b/daemon/cli.c index f71567432..b5ab4e4f2 100644 --- a/daemon/cli.c +++ b/daemon/cli.c @@ -812,7 +812,7 @@ static void cli_list_tag_info(struct cli_writer *cw, struct call_monologue *ml) atomic64_get_na(&ps->stats_in->packets), atomic64_get_na(&ps->stats_in->bytes), atomic64_get_na(&ps->stats_in->errors), - atomic64_get_na(&ps->last_packet), + atomic64_get_na(&ps->last_packet_us) / 1000000L, atomic64_get_na(&ps->stats_in->last_packet)); cw->cw_printf(cw, "\n"); } diff --git a/daemon/media_socket.c b/daemon/media_socket.c index 3a20b88d3..32d456fb0 100644 --- a/daemon/media_socket.c +++ b/daemon/media_socket.c @@ -2856,7 +2856,7 @@ static int stream_packet(struct packet_handler_ctx *phc) { atomic64_add_na(&phc->mp.stream->stats_in->bytes, phc->s.len); atomic64_inc_na(&phc->mp.sfd->local_intf->stats->in.packets); atomic64_add_na(&phc->mp.sfd->local_intf->stats->in.bytes, phc->s.len); - atomic64_set(&phc->mp.stream->last_packet, timeval_from_us(rtpe_now).tv_sec); + atomic64_set(&phc->mp.stream->last_packet_us, rtpe_now); RTPE_STATS_INC(packets_user); RTPE_STATS_ADD(bytes_user, phc->s.len); diff --git a/daemon/redis.c b/daemon/redis.c index 735130bb0..71222238a 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -1449,7 +1449,7 @@ static int redis_streams(call_t *c, struct redis_list *streams) { if (!ps) return -1; - atomic64_set_na(&ps->last_packet, time(NULL)); + atomic64_set_na(&ps->last_packet_us, now_us()); if (redis_hash_get_a64(&ps->ps_flags, rh, "ps_flags")) return -1; if (redis_hash_get_unsigned((unsigned int *) &ps->component, rh, "component")) @@ -2514,7 +2514,6 @@ static str redis_encode_json(ng_parser_ctx_t *ctx, call_t *c, void **to_free) { JSON_SET_SIMPLE("media","%u",ps->media->unique_id); JSON_SET_SIMPLE("sfd","%u",ps->selected_sfd ? ps->selected_sfd->unique_id : -1); JSON_SET_SIMPLE("rtcp_sibling","%u",ps->rtcp_sibling ? ps->rtcp_sibling->unique_id : -1); - JSON_SET_SIMPLE("last_packet", "%" PRIu64,atomic64_get(&ps->last_packet)); JSON_SET_SIMPLE("ps_flags", "%" PRIu64, atomic64_get_na(&ps->ps_flags)); JSON_SET_SIMPLE("component","%u",ps->component); JSON_SET_SIMPLE_CSTR("endpoint",endpoint_print_buf(&ps->endpoint)); diff --git a/include/call.h b/include/call.h index 2ef800f53..3f8bca79a 100644 --- a/include/call.h +++ b/include/call.h @@ -449,7 +449,7 @@ struct packet_stream { struct stream_stats *stats_in; struct stream_stats *stats_out; - atomic64 last_packet; // userspace only + atomic64 last_packet_us; // userspace only rtp_stats_ht rtp_stats; /* LOCK: call->master_lock */ struct rtp_stats *rtp_stats_cache; enum endpoint_learning el_flags; @@ -468,7 +468,7 @@ struct packet_stream { }; INLINE uint64_t packet_stream_last_packet(const struct packet_stream *ps) { - uint64_t lp1 = atomic64_get_na(&ps->last_packet); + uint64_t lp1 = atomic64_get_na(&ps->last_packet_us) / 1000000L; uint64_t lp2 = atomic64_get_na(&ps->stats_in->last_packet); return MAX(lp1, lp2); } diff --git a/t/auto-daemon-tests-redis-json.pl b/t/auto-daemon-tests-redis-json.pl index 4b5c2642e..d9b913e72 100755 --- a/t/auto-daemon-tests-redis-json.pl +++ b/t/auto-daemon-tests-redis-json.pl @@ -233,7 +233,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '1', @@ -246,7 +245,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -259,7 +257,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3000', 'component' => '1', 'endpoint' => '198.51.100.1:3000', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '68222976', 'rtcp_sibling' => '3', @@ -272,7 +269,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3001', 'component' => '2', 'endpoint' => '198.51.100.1:3001', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -491,7 +487,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3000', 'component' => '1', 'endpoint' => '198.51.100.4:3000', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -504,7 +499,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3001', 'component' => '2', 'endpoint' => '198.51.100.4:3001', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -517,7 +511,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3000', 'component' => '1', 'endpoint' => '198.51.100.1:3000', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -530,7 +523,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3001', 'component' => '2', 'endpoint' => '198.51.100.1:3001', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -758,7 +750,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '1', @@ -771,7 +762,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -784,7 +774,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '68222976', 'rtcp_sibling' => '3', @@ -797,7 +786,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1019,7 +1007,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6090', 'component' => '1', 'endpoint' => '198.51.100.14:6090', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1032,7 +1019,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6091', 'component' => '2', 'endpoint' => '198.51.100.14:6091', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1045,7 +1031,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -1058,7 +1043,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1391,7 +1375,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6090', 'component' => '1', 'endpoint' => '198.51.100.14:6090', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1404,7 +1387,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6091', 'component' => '2', 'endpoint' => '198.51.100.14:6091', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1417,7 +1399,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -1430,7 +1411,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1443,7 +1423,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '2', 'ps_flags' => '65536', 'rtcp_sibling' => '5', @@ -1456,7 +1435,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '2', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -1469,7 +1447,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '3', 'ps_flags' => '65536', 'rtcp_sibling' => '7', @@ -1482,7 +1459,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '3', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -1714,7 +1690,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1727,7 +1702,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1915,7 +1889,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1928,7 +1901,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1941,7 +1913,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '3', @@ -1954,7 +1925,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -2156,7 +2126,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -2169,7 +2138,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2182,7 +2150,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6044', 'component' => '1', 'endpoint' => '198.51.100.14:6044', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -2195,7 +2162,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6045', 'component' => '2', 'endpoint' => '198.51.100.14:6045', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2451,7 +2417,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -2464,7 +2429,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2477,7 +2441,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6044', 'component' => '1', 'endpoint' => '198.51.100.14:6044', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -2490,7 +2453,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6045', 'component' => '2', 'endpoint' => '198.51.100.14:6045', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2503,7 +2465,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '2', 'ps_flags' => '65536', 'rtcp_sibling' => '5', @@ -2516,7 +2477,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '2', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', diff --git a/t/auto-daemon-tests-redis.pl b/t/auto-daemon-tests-redis.pl index 664dd87c5..380305b23 100755 --- a/t/auto-daemon-tests-redis.pl +++ b/t/auto-daemon-tests-redis.pl @@ -232,7 +232,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '1', @@ -245,7 +244,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -258,7 +256,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3000', 'component' => '1', 'endpoint' => '198.51.100.1:3000', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '68222976', 'rtcp_sibling' => '3', @@ -271,7 +268,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3001', 'component' => '2', 'endpoint' => '198.51.100.1:3001', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -492,7 +488,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3000', 'component' => '1', 'endpoint' => '198.51.100.4:3000', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -505,7 +500,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3001', 'component' => '2', 'endpoint' => '198.51.100.4:3001', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -518,7 +512,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3000', 'component' => '1', 'endpoint' => '198.51.100.1:3000', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -531,7 +524,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3001', 'component' => '2', 'endpoint' => '198.51.100.1:3001', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -757,7 +749,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3000', 'component' => '1', 'endpoint' => '198.51.100.4:3000', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -770,7 +761,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.4:3001', 'component' => '2', 'endpoint' => '198.51.100.4:3001', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -783,7 +773,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3000', 'component' => '1', 'endpoint' => '198.51.100.1:3000', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -796,7 +785,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.1:3001', 'component' => '2', 'endpoint' => '198.51.100.1:3001', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1024,7 +1012,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '1', @@ -1037,7 +1024,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -1050,7 +1036,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '68222976', 'rtcp_sibling' => '3', @@ -1063,7 +1048,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1285,7 +1269,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6090', 'component' => '1', 'endpoint' => '198.51.100.14:6090', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1298,7 +1281,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6091', 'component' => '2', 'endpoint' => '198.51.100.14:6091', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1311,7 +1293,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -1324,7 +1305,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1657,7 +1637,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6090', 'component' => '1', 'endpoint' => '198.51.100.14:6090', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1670,7 +1649,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6091', 'component' => '2', 'endpoint' => '198.51.100.14:6091', - 'last_packet' => qr/^\d+$/, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1683,7 +1661,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6088', 'component' => '1', 'endpoint' => '198.51.100.14:6088', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -1696,7 +1673,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6089', 'component' => '2', 'endpoint' => '198.51.100.14:6089', - 'last_packet' => qr/^\d+$/, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -1709,7 +1685,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '2', 'ps_flags' => '65536', 'rtcp_sibling' => '5', @@ -1722,7 +1697,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '2', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -1735,7 +1709,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '3', 'ps_flags' => '65536', 'rtcp_sibling' => '7', @@ -1748,7 +1721,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr/^\d+$/, 'media' => '3', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -1979,7 +1951,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -1992,7 +1963,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2180,7 +2150,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -2193,7 +2162,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2206,7 +2174,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '65536', 'rtcp_sibling' => '3', @@ -2219,7 +2186,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295', @@ -2421,7 +2387,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -2434,7 +2399,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2447,7 +2411,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6044', 'component' => '1', 'endpoint' => '198.51.100.14:6044', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -2460,7 +2423,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6045', 'component' => '2', 'endpoint' => '198.51.100.14:6045', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2716,7 +2678,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6042', 'component' => '1', 'endpoint' => '198.51.100.14:6042', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1114112', 'rtcp_sibling' => '1', @@ -2729,7 +2690,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6043', 'component' => '2', 'endpoint' => '198.51.100.14:6043', - 'last_packet' => qr//, 'media' => '0', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2742,7 +2702,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6044', 'component' => '1', 'endpoint' => '198.51.100.14:6044', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1114112', 'rtcp_sibling' => '3', @@ -2755,7 +2714,6 @@ $json_exp = { 'advertised_endpoint' => '198.51.100.14:6045', 'component' => '2', 'endpoint' => '198.51.100.14:6045', - 'last_packet' => qr//, 'media' => '1', 'ps_flags' => '1179649', 'rtcp_sibling' => '4294967295', @@ -2768,7 +2726,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '1', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '2', 'ps_flags' => '65536', 'rtcp_sibling' => '5', @@ -2781,7 +2738,6 @@ $json_exp = { 'advertised_endpoint' => '', 'component' => '2', 'endpoint' => '', - 'last_packet' => qr//, 'media' => '2', 'ps_flags' => '131072', 'rtcp_sibling' => '4294967295',