diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-12-18 19:28:05 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-12-18 19:28:05 +0000 |
| commit | e2630fcd516b8f794bf342d9fd267b0c905e79ce (patch) | |
| tree | f6cd5cf70eb9af24b239d78391aed7472c09dd7f /apps | |
| parent | e23b8d19a49d4ee4faf3dc167ddb7ba7afe36a46 (diff) | |
channels: Return allocated channels locked.
This change makes ast_channel_alloc return allocated channels
locked. By doing so no other thread can acquire, lock, and manipulate
the channel before it is completely set up.
(closes issue AST-1256)
Review: https://reviewboard.asterisk.org/r/3067/
........
Merged revisions 404204 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 2 | ||||
| -rw-r--r-- | apps/confbridge/conf_chan_record.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ffd55e70d..feea3b6c5 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -8140,6 +8140,8 @@ AST_TEST_DEFINE(test_meetme_data_provider) return AST_TEST_FAIL; } + ast_channel_unlock(chan); + cnf = build_conf("9898", "", "1234", 1, 1, 1, chan, test); if (!cnf) { ast_test_status_update(test, "Build of test conference 9898 failed\n"); diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index dbcd28355..4dffbbef0 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -13744,6 +13744,8 @@ AST_TEST_DEFINE(test_voicemail_vmsayname) ast_format_set(ast_channel_rawreadformat(test_channel1), AST_FORMAT_GSM, 0); ast_channel_tech_set(test_channel1, &fake_tech); + ast_channel_unlock(test_channel1); + ast_test_status_update(test, "Test playing of extension when greeting is not available...\n"); snprintf(dir, sizeof(dir), "%s@%s", TEST_EXTENSION, TEST_CONTEXT); /* not a dir, don't get confused */ if (!(res = vmsayname_exec(test_channel1, dir))) { diff --git a/apps/confbridge/conf_chan_record.c b/apps/confbridge/conf_chan_record.c index 7080d118c..78d1f272c 100644 --- a/apps/confbridge/conf_chan_record.c +++ b/apps/confbridge/conf_chan_record.c @@ -66,6 +66,7 @@ static struct ast_channel *rec_request(const char *type, struct ast_format_cap * return NULL; } if (ast_channel_add_bridge_role(chan, "recorder")) { + ast_channel_unlock(chan); ast_channel_release(chan); return NULL; } @@ -76,6 +77,7 @@ static struct ast_channel *rec_request(const char *type, struct ast_format_cap * ast_format_copy(ast_channel_rawwriteformat(chan), &format); ast_format_copy(ast_channel_readformat(chan), &format); ast_format_copy(ast_channel_rawreadformat(chan), &format); + ast_channel_unlock(chan); return chan; } |