]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_rtp_asterisk: Use PJ_ICE_MAX_CAND instead of hard-coding 16 54/4954/1
authorSean Bright <sean.bright@gmail.com>
Wed, 15 Feb 2017 17:03:00 +0000 (12:03 -0500)
committerSean Bright <sean.bright@gmail.com>
Wed, 15 Feb 2017 17:12:45 +0000 (12:12 -0500)
pjsip limits the total number of ICE candidates to PJ_ICE_MAX_CAND,
which is a compile-time constant. Instead of hard-coding 16 when we
enumerate local interfaces, use PJ_ICE_MAX_CAND so that we can
potentially collect more interfaces if the compile time options are
changed.

Tangentially related to ASTERISK~24464

Change-Id: I1b85509e39e33b1fed63c86261fc229ba14bbabd

res/res_rtp_asterisk.c

index ba2d815505a6e9ca6fa9403be4f192984267d406..e6a65ff601caf0cd9fa45856788feb2801798914 100644 (file)
@@ -2481,7 +2481,7 @@ static int rtp_address_is_ice_blacklisted(const pj_sockaddr_t *address)
 static void rtp_add_candidates_to_ice(struct ast_rtp_instance *instance, struct ast_rtp *rtp, struct ast_sockaddr *addr, int port, int component,
                                      int transport)
 {
-       pj_sockaddr address[16];
+       pj_sockaddr address[PJ_ICE_MAX_CAND];
        unsigned int count = PJ_ARRAY_SIZE(address), pos = 0;
        int basepos = -1;