res_rtp_asterisk: Revert DTLS negotiation changes.

Due to locking issues within pjnath these changes are being
reverted until pjnath can be changed.

ASTERISK-25645

Revert "res_rtp_asterisk.c: Fix DTLS negotiation delays."

This reverts commit 24ae124e4f7310cfa64c187b944b2ffc060da28d.

Change-Id: I2986cfb2c43dc14455c1bcaf92c3804f9da49705

Revert "res_rtp_asterisk: Resolve further timing issues with DTLS negotiation"

This reverts commit 965a0eee46d24321f74c244e23c5a5f45e67e12b.

Change-Id: Ie68fafde27dad4b03cb7a1e27ce2a8502c3f7bbe

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 3dfaf87fa22de8f4b5c7a43cbcc20f8de7d636a0..f6bf34211b0f53cb7a06a9ef736c03f055bccd65 100644 (file)
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -2118,8 +2118,6 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
                        SSL_set_accept_state(dtls->ssl);
                }
 
-               ast_mutex_lock(&dtls->lock);
-
                dtls_srtp_check_pending(instance, rtp, rtcp);
 
                BIO_write(dtls->read_bio, buf, len);
@@ -2130,7 +2128,6 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
                        unsigned long error = ERR_get_error();
                        ast_log(LOG_ERROR, "DTLS failure occurred on RTP instance '%p' due to reason '%s', terminating\n",
                                instance, ERR_reason_error_string(error));
-                       ast_mutex_unlock(&dtls->lock);
                        return -1;
                }
 
@@ -2148,8 +2145,6 @@ static int __rtp_recvfrom(struct ast_rtp_instance *instance, void *buf, size_t s
                        dtls_srtp_start_timeout_timer(instance, rtp, rtcp);
                }
 
-               ast_mutex_unlock(&dtls->lock);
-
                return res;
        }
 #endif
@@ -4822,9 +4817,6 @@ static int ast_rtp_fd(struct ast_rtp_instance *instance, int rtcp)
 static void ast_rtp_remote_address_set(struct ast_rtp_instance *instance, struct ast_sockaddr *addr)
 {
        struct ast_rtp *rtp = ast_rtp_instance_get_data(instance);
-#ifdef HAVE_OPENSSL_SRTP
-       struct dtls_details *dtls;
-#endif
 
        if (rtp->rtcp) {
                ast_debug(1, "Setting RTCP address on RTP instance '%p'\n", instance);
@@ -4842,28 +4834,6 @@ static void ast_rtp_remote_address_set(struct ast_rtp_instance *instance, struct
                rtp_learning_seq_init(&rtp->rtp_source_learn, rtp->seqno);
        }
 
-#ifdef HAVE_OPENSSL_SRTP
-       /* Trigger pending outbound DTLS packets received before the address was set.  Avoid unnecessary locking
-        * by checking if we're passive. Without this, we only send the pending packets once a new SSL packet is
-        * received in __rtp_recvfrom.
-        */
-       dtls = &rtp->dtls;
-       if (dtls->dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) {
-               ast_mutex_lock(&dtls->lock);
-               dtls_srtp_check_pending(instance, rtp, 0);
-               ast_mutex_unlock(&dtls->lock);
-       }
-
-       if (rtp->rtcp) {
-               dtls = &rtp->rtcp->dtls;
-               if (dtls->dtls_setup == AST_RTP_DTLS_SETUP_PASSIVE) {
-                       ast_mutex_lock(&dtls->lock);
-                       dtls_srtp_check_pending(instance, rtp, 1);
-                       ast_mutex_unlock(&dtls->lock);
-               }
-       }
-#endif
-
        return;
 }