diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-07-01 19:36:49 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-07-01 19:36:49 +0000 |
| commit | 3f9cfe2d411c3b1de603e1f48216f12ce155ce08 (patch) | |
| tree | d556526e4d2b3c575a9f40bd3438912671a0db5d | |
| parent | 37256ea45d7a5c088229af496df366dc42005d15 (diff) | |
Don't try to send connectivity checks on RTCP if RTCP is no longer present and don't do multiple ICE connectivity checks at once.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/res_rtp_asterisk.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index d7c847895..0d12aa93c 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -239,6 +239,7 @@ struct ast_rtp { pj_turn_state_t turn_state; /*!< Current state of the TURN relay session */ ast_cond_t cond; /*!< Condition for signaling */ unsigned int passthrough:1; /*!< Bit to indicate that the received packet should be passed through */ + unsigned int ice_started:1; /*!< Bit to indicate ICE connectivity checks have started */ char remote_ufrag[256]; /*!< The remote ICE username */ char remote_passwd[256]; /*!< The remote ICE password */ @@ -446,7 +447,7 @@ static void ast_rtp_ice_start(struct ast_rtp_instance *instance) struct ast_rtp_engine_ice_candidate *candidate; int cand_cnt = 0; - if (!rtp->ice || !rtp->remote_candidates) { + if (!rtp->ice || !rtp->remote_candidates || rtp->ice_started) { return; } @@ -488,6 +489,7 @@ static void ast_rtp_ice_start(struct ast_rtp_instance *instance) if (pj_ice_sess_create_check_list(rtp->ice, &ufrag, &passwd, ao2_container_count(rtp->remote_candidates), &candidates[0]) == PJ_SUCCESS) { pj_ice_sess_start_check(rtp->ice); + rtp->ice_started = 1; } } @@ -667,7 +669,11 @@ static pj_status_t ast_rtp_on_ice_tx_pkt(pj_ice_sess *ice, unsigned comp_id, uns status = pj_sock_sendto(rtp->s, pkt, (pj_ssize_t*)&size, 0, dst_addr, dst_addr_len); } else if (transport_id == TRANSPORT_SOCKET_RTCP) { /* Traffic is destined to go right out the RTCP socket we already have */ - status = pj_sock_sendto(rtp->rtcp->s, pkt, (pj_ssize_t*)&size, 0, dst_addr, dst_addr_len); + if (rtp->rtcp) { + status = pj_sock_sendto(rtp->rtcp->s, pkt, (pj_ssize_t*)&size, 0, dst_addr, dst_addr_len); + } else { + status = PJ_SUCCESS; + } } else if (transport_id == TRANSPORT_TURN_RTP) { /* Traffic is going through the RTP TURN relay */ if (rtp->turn_rtp) { |