From ec7f6574ed5527d33cfc1059b0202c685bc9bae7 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Date: Mon, 19 Jun 2017 14:08:57 -0400 Subject: [PATCH] contrib: oversize PJ_ICE_MAX_CAND to prevent crash PJ_ICE_MAX_CAND was 32 (already increased from 16, value from upstream) and it's not enough to handle cases with numerous local/remote candidates like the case when multiple hosts in IPv6 and IPv4 exists. The value is increased to 256, I hope it's enough... (my tests show I need 40 entries with 5 local host IPs) Change-Id: I28aba472a5c19497cbe64b764084841ff1b9e212 Tuleap: #1601 --- contrib/src/pjproject/ice_config.patch | 2 +- contrib/src/pjproject/rules.mak | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/src/pjproject/ice_config.patch b/contrib/src/pjproject/ice_config.patch index 8ff84b3cca..4ad95ff847 100644 --- a/contrib/src/pjproject/ice_config.patch +++ b/contrib/src/pjproject/ice_config.patch @@ -3,7 +3,7 @@ @@ -233,3 +233,3 @@ #ifndef PJ_ICE_MAX_CAND -# define PJ_ICE_MAX_CAND 16 -+# define PJ_ICE_MAX_CAND 32 ++# define PJ_ICE_MAX_CAND 256 #endif @@ -254,3 +254,3 @@ #ifndef PJ_ICE_MAX_STUN diff --git a/contrib/src/pjproject/rules.mak b/contrib/src/pjproject/rules.mak index 60b9ac3e39..bf0f03b436 100644 --- a/contrib/src/pjproject/rules.mak +++ b/contrib/src/pjproject/rules.mak @@ -33,8 +33,8 @@ ifdef HAVE_IOS PJPROJECT_OPTIONS += --with-ssl=$(PREFIX) endif -PJPROJECT_EXTRA_CFLAGS = -g -DPJ_ICE_MAX_CAND=32 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -PJPROJECT_EXTRA_CXXFLAGS = -g -DPJ_ICE_MAX_CAND=32 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -std=gnu++11 +PJPROJECT_EXTRA_CFLAGS = -g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 +PJPROJECT_EXTRA_CXXFLAGS = -g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000 -std=gnu++11 ifdef HAVE_WIN64 PJPROJECT_EXTRA_CFLAGS += -DPJ_WIN64=1 -- GitLab