From: Sean Bright <sean.bright@gmail.com>
Date: Wed, 15 Feb 2017 17:03:00 +0000 (-0500)
Subject: res_rtp_asterisk: Use PJ_ICE_MAX_CAND instead of hard-coding 16
X-Git-Tag: 13.15.0-rc1~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73133d5354d5794a99f901532a6516857c3e4831;p=thirdparty%2Fasterisk.git

res_rtp_asterisk: Use PJ_ICE_MAX_CAND instead of hard-coding 16

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
---

diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index ba2d815505..e6a65ff601 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -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;