]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix when remote candidates exceed PJ_ICE_MAX_CAND 02/1202/1
authorDavid M. Lee <dlee@respoke.io>
Fri, 4 Sep 2015 21:06:39 +0000 (16:06 -0500)
committerDavid M. Lee <dlee@digium.com>
Fri, 4 Sep 2015 21:13:43 +0000 (16:13 -0500)
We were passing the wrong count into pj_ice_sess_create_check_list(),
causing the create to fail if we ever received more than PJ_ICE_MAX_CAND
candidates.

Change-Id: I0303d8e1ecb20a8de9fe629a3209d216c4028378

res/res_rtp_asterisk.c

index 43615d6c8e0b6357d28a11fce17e27615c24e1b7..adbec8297e51586117ce09450654194834614d7e 100644 (file)
@@ -706,8 +706,7 @@ static void ast_rtp_ice_start(struct ast_rtp_instance *instance)
        ao2_iterator_destroy(&i);
 
        if (has_rtp && has_rtcp &&
-           pj_ice_sess_create_check_list(rtp->ice, &ufrag, &passwd, ao2_container_count(
-                                                 rtp->ice_active_remote_candidates), &candidates[0]) == PJ_SUCCESS) {
+           pj_ice_sess_create_check_list(rtp->ice, &ufrag, &passwd, cand_cnt, &candidates[0]) == PJ_SUCCESS) {
                ast_test_suite_event_notify("ICECHECKLISTCREATE", "Result: SUCCESS");
                pj_ice_sess_start_check(rtp->ice);
                pj_timer_heap_poll(timer_heap, NULL);