diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-04 17:27:56 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-04 17:27:56 +0000 |
| commit | 6f2838ce5bd6d8e681a41879e6c734d63e55a25e (patch) | |
| tree | ed3e8e161ceb22673e5217373b33ebb56d9f0393 /main | |
| parent | e575017885aa4c7aae485fc40855a7498a7779cd (diff) | |
Merged revisions 141028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines
(closes issue #11979)
Fixes multiple parking problems:
Crash when executing a park on an extension dialed by AGI due to not returning the proper return code.
Crash when using a builtin feature that was a subset of a enabled dynamic feature.
Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@141039 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/main/features.c b/main/features.c index 6aa717aec..b49f9c8b6 100644 --- a/main/features.c +++ b/main/features.c @@ -1697,8 +1697,13 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer, ast_autoservice_stop(idle); - if (res == AST_PBX_KEEPALIVE) - return AST_FEATURE_RETURN_PBX_KEEPALIVE; + if (res == AST_PBX_KEEPALIVE) { + /* do not hangup peer if feature is to be activated on it */ + if ((ast_test_flag(feature, AST_FEATURE_FLAG_ONPEER) && sense == FEATURE_SENSE_CHAN) || (ast_test_flag(feature, AST_FEATURE_FLAG_ONSELF) && sense == FEATURE_SENSE_PEER)) + return AST_FEATURE_RETURN_NO_HANGUP_PEER; + else + return AST_FEATURE_RETURN_PBX_KEEPALIVE; + } else if (res == AST_PBX_NO_HANGUP_PEER) return AST_FEATURE_RETURN_NO_HANGUP_PEER; else if (res) @@ -1747,12 +1752,13 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p { int x; struct ast_flags features; - int res = AST_FEATURE_RETURN_PASSDIGITS; struct ast_call_feature *feature; struct feature_group *fg = NULL; struct feature_group_exten *fge; const char *dynamic_features; char *tmp, *tok; + int res = AST_FEATURE_RETURN_PASSDIGITS; + int feature_detected = 0; if (sense == FEATURE_SENSE_CHAN) { ast_copy_flags(&features, &(config->features_caller), AST_FLAGS_ALL); @@ -1771,6 +1777,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p /* Feature is up for consideration */ if (!strcmp(builtin_features[x].exten, code)) { res = builtin_features[x].operation(chan, peer, config, code, sense, NULL); + feature_detected = 1; break; } else if (!strncmp(builtin_features[x].exten, code, strlen(code))) { if (res == AST_FEATURE_RETURN_PASSDIGITS) @@ -1780,7 +1787,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p } ast_rwlock_unlock(&features_lock); - if (ast_strlen_zero(dynamic_features)) + if (ast_strlen_zero(dynamic_features) || feature_detected) return res; tmp = ast_strdupa(dynamic_features); |