diff options
-rw-r--r-- | apps/app_dial.c | 2 | ||||
-rw-r--r-- | include/asterisk/features.h | 6 | ||||
-rw-r--r-- | res/res_features.c | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 63d00a7d4..bb5e9570c 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -792,7 +792,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l static int detect_disconnect(struct ast_channel *chan, char code, char *featurecode, int len) { struct ast_flags features = { AST_FEATURE_DISCONNECT }; /* only concerned with disconnect feature */ - struct ast_call_feature feature; + struct ast_call_feature feature = { 0, }; char *tmp; int res; diff --git a/include/asterisk/features.h b/include/asterisk/features.h index 7e4de1972..4ecf59376 100644 --- a/include/asterisk/features.h +++ b/include/asterisk/features.h @@ -101,7 +101,11 @@ char *ast_pickup_ext(void); int ast_bridge_call(struct ast_channel *chan, struct ast_channel *peer,struct ast_bridge_config *config); /*! \brief detect a feature before bridging - \param chan, ast_flags ptr, code, ast_call_feature ptr to be set if found */ + \param chan + \param ast_flags ptr + \param char ptr of input code + \retval ast_call_feature ptr to be set if found + \return result, was feature found or not */ int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature); /*! \brief Pickup a call */ diff --git a/res/res_features.c b/res/res_features.c index 631d8ebca..c6d00e810 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1344,12 +1344,7 @@ static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer, int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature) { - char *dynamic_features; - ast_channel_lock(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, dynamic_features, features, 0, feature); + return feature_interpret_helper(chan, NULL, NULL, code, 0, NULL, features, 0, feature); } static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config) |