res_pjsip_sdp_rtp.c: Initial RTP inactivity check must consider the rtp_timeout setting.

First rtp activity check was performed after 500ms regardless of the rtp_timeout setting. Having a call in ringing state for more than rtp_timeout and the first rtp package is received more than 500ms after sdp negotiation and before the rtp_timeout, erronously caused the call to be hungup. Changed to perform the first rtp inactivity check after the timeout setting preventing calls to be disconnected before the rtp_timeout has elapsed since sdp negotiation.

Fixes #710

(cherry picked from commit 1423cfee29baac8460bb709907e4aab80de5bafb)

diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index 8d1c5c363596d07bc830457662387043eb2bf7da..60023863b5c776ec42aef11af0d34f43f4ce6ec8 100644 (file)
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -2101,6 +2101,7 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session,
        enum ast_media_type media_type = session_media->type;
        char host[NI_MAXHOST];
        int res;
+       int rtp_timeout;
        struct ast_sip_session_media *session_media_transport;
        SCOPE_ENTER(1, "%s Stream: %s\n", ast_sip_session_get_name(session),
                ast_str_tmp(128, ast_stream_to_str(asterisk_stream, &STR_TMP)));
@@ -2246,8 +2247,10 @@ static int apply_negotiated_sdp_stream(struct ast_sip_session *session,
                ast_rtp_instance_set_timeout(session_media->rtp, session->endpoint->media.rtp.timeout_hold);
        }
 
-       if (ast_rtp_instance_get_timeout(session_media->rtp)) {
-               session_media->timeout_sched_id = ast_sched_add_variable(sched, 500, rtp_check_timeout,
+       rtp_timeout = ast_rtp_instance_get_timeout(session_media->rtp);
+
+       if (rtp_timeout) {
+               session_media->timeout_sched_id = ast_sched_add_variable(sched, rtp_timeout*1000, rtp_check_timeout,
                        session_media, 1);
        }