From: Terry Wilson Date: Wed, 15 Jun 2011 18:13:00 +0000 (+0000) Subject: Merged revisions 323732 via svnmerge from X-Git-Tag: 1.6.2.19-rc1~3^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=431aff4e3e56e70e112c88fd5fa693a4e831a3a1;p=thirdparty%2Fasterisk.git Merged revisions 323732 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r323732 | twilson | 2011-06-15 13:06:24 -0500 (Wed, 15 Jun 2011) | 9 lines Fix DYNAMIC_FEATURES DYNAMIC_FEATURES were broken by a recent DTMF change. This patch makes sure that dynamic features are also checked when deciding whether or not to pass DTMF through or store it for interpreting. (closes issue ASTERISK-17914) Reported by: vrban ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@323733 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/features.c b/main/features.c index ab1538f100..c83b01456f 100644 --- a/main/features.c +++ b/main/features.c @@ -2381,8 +2381,12 @@ int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, cha /*! \brief Check if a feature exists */ static int feature_check(struct ast_channel *chan, struct ast_flags *features, char *code) { + char *chan_dynamic_features; + ast_channel_lock(chan); + chan_dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),"")); + ast_channel_unlock(chan); - return feature_interpret_helper(chan, NULL, NULL, code, 0, NULL, features, FEATURE_INTERPRET_CHECK, NULL); + return feature_interpret_helper(chan, NULL, NULL, code, 0, chan_dynamic_features, features, FEATURE_INTERPRET_CHECK, NULL); } static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config)