diff options
| -rw-r--r-- | src/trau/osmo_ortp.c | 6 | ||||
| -rw-r--r-- | tests/rtp_test/rtp_test.c | 2 | ||||
| -rw-r--r-- | tests/rtp_test/rtp_test.ok | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 1d652cb..0fd30df 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -378,6 +378,12 @@ struct osmo_rtp_socket *osmo_rtp_socket_create(void *talloc_ctx, unsigned int fl rtp_session_set_profile(rs->sess, osmo_pt_profile); rtp_session_set_jitter_compensation(rs->sess, 100); + /* ortp >= 0.24.0 doesn't differentiate between SO_REUSEADDR and + * SO_REUSEPORT, and has both enabled by default. The latter means that + * we can end up with non-unique port bindings as we will not fail to + * bind the same port twice */ + rtp_session_set_reuseaddr(rs->sess, false); + rtp_session_signal_connect(rs->sess, "ssrc_changed", (RtpCallback) ortp_sig_cb_ssrc, RTP_SIGNAL_PTR_CAST(rs)); diff --git a/tests/rtp_test/rtp_test.c b/tests/rtp_test/rtp_test.c index d696033..ae7d8ef 100644 --- a/tests/rtp_test/rtp_test.c +++ b/tests/rtp_test/rtp_test.c @@ -54,7 +54,7 @@ static void test_bind_fail(void) else { printf("FAILED - second bind to port %u worked\n", port[0]); fflush(stdout); - //OSMO_ASSERT(0); + OSMO_ASSERT(0); } osmo_rtp_socket_free(rs[0]); diff --git a/tests/rtp_test/rtp_test.ok b/tests/rtp_test/rtp_test.ok index ded2792..ddb68a4 100644 --- a/tests/rtp_test/rtp_test.ok +++ b/tests/rtp_test/rtp_test.ok @@ -1,2 +1,2 @@ First bind to any random local port... -Now try to bind another socket to the same port: FAILED - second bind to port 16384 worked +Now try to bind another socket to the same port: OK (EADDRINUSE) |