mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-01 12:20:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsession: never send on a non-internal source

Browse source 
This will end up as a "received" packet, due to the code in
source_push_rtp, which will think this is a packet being received.

Instead drop the packet and hope that either:
1. Something upstream responds to the GstRTPCollision event and changes
   SSRC used for sending.
2. That the application responds to the "on-ssrc-collision" signal, and
   forces the sender (payloader) to change its SSRC.
3. That the BYE sent to the existing user of this SSRC will respond to
   the BYE, and that we timeout this source, so we can continue sending
   using the chosen SSRC.

The test reproduces a scenario where we previously would have sent
on a non-internal source.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/817>
This commit is contained in:
Havard Graff 2020-11-13 21:25:42 +01:00
parent 97ced29277
commit 79748dab2b
2 changed files with 72 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/rtpmanager/rtpsession.c
View file

@ -3282,13 +3282,15 @@ rtp_session_send_rtp (RTPSession * sess, gpointer data, gboolean is_list,
GST_DEBUG ("Collision for SSRC %x, change our sender ssrc", pinfo.ssrc);
rtp_session_have_conflict (sess, source, from, current_time);
goto collision;
}
} else {
GST_LOG ("Ignoring collision on sent SSRC %x because remote source"
" doesn't have an address", pinfo.ssrc);
}
/* the the sending source is not internal, we have to drop the packet,
or else we will end up receving it ourselves! */
goto collision;
}
prevsender = RTP_SOURCE_IS_SENDER (source);

68
tests/check/elements/rtpsession.c
View file

@ -1334,6 +1334,70 @@ GST_START_TEST (test_ssrc_collision_third_party_favor_new)
GST_END_TEST;
GST_START_TEST (test_ssrc_collision_never_send_on_non_internal_source)
{
SessionHarness *h = session_harness_new ();
GstBuffer *buf;
GstEvent *ev;
GSocketAddress *saddr;
gboolean had_collision = FALSE;
g_signal_connect (h->internal_session, "on-ssrc-collision",
G_CALLBACK (on_ssrc_collision_cb), &had_collision);
/* Push SDES with identical SSRC as what we will use for sending RTP,
establishing this as a non-internal SSRC */
buf = gst_rtcp_buffer_new (1400);
add_rtcp_sdes_packet (buf, 0xdeadbeef, "test@foo.bar");
saddr = g_inet_socket_address_new_from_string ("127.0.0.1", 8080);
gst_buffer_add_net_address_meta (buf, saddr);
session_harness_recv_rtcp (h, buf);
g_object_unref (saddr);
fail_unless (had_collision == FALSE);
/* Push RTP buffer making our internal SSRC=0xdeadbeef */
buf = generate_test_buffer (0, 0xdeadbeef);
fail_unless_equals_int (GST_FLOW_OK, session_harness_send_rtp (h, buf));
fail_unless (had_collision == TRUE);
/* verify we drop this packet because of SSRC collision */
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h->send_rtp_h));
/* Verify the packet we just sent is not being boomeranged back to us
as a received packet! */
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h->recv_rtp_h));
/* verify we get an upstream GstRTPCollision event */
while ((ev = gst_harness_try_pull_upstream_event (h->send_rtp_h)) != NULL) {
if (GST_EVENT_CUSTOM_UPSTREAM == GST_EVENT_TYPE (ev) &&
gst_event_has_name (ev, "GstRTPCollision"))
break;
gst_event_unref (ev);
}
fail_unless (ev != NULL);
gst_event_unref (ev);
/* Push another RTP buffer and verify that one is not send or "received" as well */
buf = generate_test_buffer (1, 0xdeadbeef);
fail_unless_equals_int (GST_FLOW_OK, session_harness_send_rtp (h, buf));
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h->send_rtp_h));
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h->recv_rtp_h));
/* now generate a BYE to the non-internal SSRC */
session_harness_produce_rtcp (h, 1);
/* and verify we can now send using that SSRC */
buf = generate_test_buffer (2, 0xdeadbeef);
fail_unless_equals_int (GST_FLOW_OK, session_harness_send_rtp (h, buf));
fail_unless_equals_int (1, gst_harness_buffers_in_queue (h->send_rtp_h));
fail_unless_equals_int (0, gst_harness_buffers_in_queue (h->recv_rtp_h));
session_harness_free (h);
}
GST_END_TEST;
GST_START_TEST (test_request_fir)
{
SessionHarness *h = session_harness_new ();
@ -3647,11 +3711,15 @@ rtpsession_suite (void)
tcase_add_test (tc_chain, test_receive_rtcp_app_packet);
tcase_add_test (tc_chain, test_dont_lock_on_stats);
tcase_add_test (tc_chain, test_ignore_suspicious_bye);
tcase_add_test (tc_chain, test_ssrc_collision_when_sending);
tcase_add_test (tc_chain, test_ssrc_collision_when_sending_loopback);
tcase_add_test (tc_chain, test_ssrc_collision_when_receiving);
tcase_add_test (tc_chain, test_ssrc_collision_third_party);
tcase_add_test (tc_chain, test_ssrc_collision_third_party_favor_new);
tcase_add_test (tc_chain,
test_ssrc_collision_never_send_on_non_internal_source);
tcase_add_test (tc_chain, test_request_fir);
tcase_add_test (tc_chain, test_request_pli);
tcase_add_test (tc_chain, test_request_fir_after_pli_in_caps);