diff --git a/daemon/redis.c b/daemon/redis.c index f387b175b..5624e4918 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -2139,7 +2139,6 @@ static const char *json_build_ssrc_iter(const ng_parser_t *parser, parser_arg di uint32_t ssrc = parser_get_ll(dict, "ssrc"); struct ssrc_entry_call *se_in = get_ssrc(ssrc, &md->ssrc_hash_in); - struct ssrc_entry_call *se_out = get_ssrc(ssrc, &md->ssrc_hash_out); if (se_in) { atomic_set_na(&se_in->stats->ext_seq, parser_get_ll(dict, "in_srtp_index")); @@ -2147,6 +2146,16 @@ static const char *json_build_ssrc_iter(const ng_parser_t *parser, parser_arg di payload_tracker_add(&se_in->tracker, parser_get_ll(dict, "in_payload_type")); obj_put(&se_in->h); } + + return NULL; +} + +static const char *json_build_ssrc_out_iter(const ng_parser_t *parser, parser_arg dict, helper_arg arg) { + struct call_media *md = arg.md; + + uint32_t ssrc = parser_get_ll(dict, "ssrc"); + struct ssrc_entry_call *se_out = get_ssrc(ssrc, &md->ssrc_hash_out); + if (se_out) { atomic_set_na(&se_out->stats->ext_seq, parser_get_ll(dict, "out_srtp_index")); atomic_set_na(&se_out->stats->rtcp_seq, parser_get_ll(dict, "out_srtcp_index")); @@ -2166,6 +2175,11 @@ static int json_build_ssrc(struct call_media *md, parser_arg arg) { return 0; } redis_parser->list_iter(redis_parser, list, NULL, json_build_ssrc_iter, md); + + snprintf(tmp, sizeof(tmp), "ssrc_out_table-%u", md->unique_id); + list = redis_parser->dict_get_expect(arg, tmp, BENCODE_LIST); + if (list.gen) + redis_parser->list_iter(redis_parser, list, NULL, json_build_ssrc_out_iter, md); return 0; } @@ -2795,12 +2809,22 @@ static parser_arg redis_encode_media_basic(struct call_media *media, const ng_pa JSON_SET_SIMPLE("in_srtp_index", "%u", atomic_get_na(&se->stats->ext_seq)); JSON_SET_SIMPLE("in_srtcp_index", "%u", atomic_get_na(&se->stats->rtcp_seq)); JSON_SET_SIMPLE("in_payload_type", "%i", se->tracker.most[0]); - //JSON_SET_SIMPLE("out_srtp_index", "%u", atomic_get_na(&se->output_ctx.stats->ext_seq)); - //JSON_SET_SIMPLE("out_srtcp_index", "%u", atomic_get_na(&se->output_ctx.stats->rtcp_seq)); - //JSON_SET_SIMPLE("out_payload_type", "%i", se->output_ctx.tracker.most[0]); // XXX add rest of info } + LOCK(&media->ssrc_hash_out.lock); + snprintf(tmp, sizeof(tmp), "ssrc_out_table-%u", media->unique_id); + list = parser->dict_add_list_dup(root, tmp); + for (GList *m = media->ssrc_hash_out.nq.head; m; m = m->next) { + struct ssrc_entry_call *se = m->data; + inner = parser->list_add_dict(list); + + JSON_SET_SIMPLE("ssrc", "%" PRIu32, se->h.ssrc); + JSON_SET_SIMPLE("out_srtp_index", "%u", atomic_get_na(&se->stats->ext_seq)); + JSON_SET_SIMPLE("out_srtcp_index", "%u", atomic_get_na(&se->stats->rtcp_seq)); + JSON_SET_SIMPLE("out_payload_type", "%i", se->tracker.most[0]); + } + snprintf(tmp, sizeof(tmp), "media-%u", media->unique_id); inner = parser->dict_add_dict_dup(root, tmp); diff --git a/t/auto-daemon-tests-redis-json.pl b/t/auto-daemon-tests-redis-json.pl index eb42066cf..bedc6aaa2 100755 --- a/t/auto-daemon-tests-redis-json.pl +++ b/t/auto-daemon-tests-redis-json.pl @@ -242,6 +242,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -507,6 +509,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -781,6 +785,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -1049,6 +1055,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -1431,6 +1439,9 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '7' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], + 'ssrc_out_table-2' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'ssrc_table-2' => [], @@ -1773,6 +1784,7 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '1' }, + 'ssrc_out_table-0' => [], 'ssrc_table-0' => [], 'stream-0' => { 'advertised_endpoint' => '198.51.100.14:6042', @@ -1978,6 +1990,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -2226,6 +2240,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -2529,6 +2545,9 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '5' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], + 'ssrc_out_table-2' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'ssrc_table-2' => [], diff --git a/t/auto-daemon-tests-redis-subscribe.pl b/t/auto-daemon-tests-redis-subscribe.pl index dd269ad89..5c7d0ec63 100755 --- a/t/auto-daemon-tests-redis-subscribe.pl +++ b/t/auto-daemon-tests-redis-subscribe.pl @@ -336,6 +336,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { diff --git a/t/auto-daemon-tests-redis.pl b/t/auto-daemon-tests-redis.pl index 932c587ed..dd3c99294 100755 --- a/t/auto-daemon-tests-redis.pl +++ b/t/auto-daemon-tests-redis.pl @@ -241,6 +241,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -508,6 +510,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -780,6 +784,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -1054,6 +1060,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -1322,6 +1330,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -1704,6 +1714,9 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '7' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], + 'ssrc_out_table-2' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'ssrc_table-2' => [], @@ -2045,6 +2058,7 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '1' }, + 'ssrc_out_table-0' => [], 'ssrc_table-0' => [], 'stream-0' => { 'advertised_endpoint' => '198.51.100.14:6042', @@ -2250,6 +2264,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -2498,6 +2514,8 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '3' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'stream-0' => { @@ -2801,6 +2819,9 @@ $json_exp = { 'pref_family' => 'IP4', 'stream' => '5' }, + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [], + 'ssrc_out_table-2' => [], 'ssrc_table-0' => [], 'ssrc_table-1' => [], 'ssrc_table-2' => [], @@ -2995,4 +3016,82 @@ SDP + + +# the output SRTP index, including the ROC, is written to the record + +my ($sock_a, $sock_b) = new_call([qw(198.51.100.1 7188)], [qw(198.51.100.3 7190)]); + +$json_exp = {}; + +my ($port_a, undef, $srtp_key_a) = offer('SRTP output index', + { 'transport-protocol' => 'RTP/SAVP', DTLS => 'off', SDES => [ 'only-AES_CM_128_HMAC_SHA1_80' ] }, < $NGCP::Rtpclient::SRTP::crypto_suites{AES_CM_128_HMAC_SHA1_80}, + key => $srtp_key_a, +}; + +# the first packet confirms the peer address, which writes the record +snd($sock_a, $port_b, rtp(8, 65534, 3000, 0x1234, "\x00" x 160)); +$NGCP::Rtpengine::req_cb->(); +srtp_rcv($sock_b, $port_a, rtpm(8, 65534, 3000, 0x1234, "\x00" x 160), $srtp_ctx); +snd($sock_a, $port_b, rtp(8, 65535, 3160, 0x1234, "\x00" x 160)); +srtp_rcv($sock_b, $port_a, rtpm(8, 65535, 3160, 0x1234, "\x00" x 160), $srtp_ctx); +snd($sock_a, $port_b, rtp(8, 0, 3320, 0x1234, "\x00" x 160)); +srtp_rcv($sock_b, $port_a, rtpm(8, 0, 3320, 0x1234, "\x00" x 160), $srtp_ctx); + +$json_exp = { + 'ssrc_out_table-0' => [], + 'ssrc_out_table-1' => [ + { + 'out_payload_type' => '8', + 'out_srtcp_index' => '0', + 'out_srtp_index' => '65536', + 'ssrc' => '4660' + } + ], +}; +rtpe_req('delete', 'SRTP output index', { 'delete delay' => 10 }); + done_testing();