kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

channel: Fix some more unprotected channel flag setting.

Browse Source 
Change-Id: I34c3b1201b1de539945bcfdcb264fff30332d48c
This commit is contained in:
Richard Mudgett
2018-06-18 10:54:03 -05:00
parent bb0ce22b2b
commit f94a310ca0
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+4
View File
@@ -10112,7 +10112,9 @@ static void *analog_ss_thread(void *data)
* emulation. The DTMF digits can come so fast that emulation
* can drop some of them.
*/
ast_channel_lock(chan);
ast_set_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY);
ast_channel_unlock(chan);
off_ms = 4000;/* This is a typical OFF time between rings. */
for (;;) {
struct ast_frame *f;
@@ -10145,7 +10147,9 @@ static void *analog_ss_thread(void *data)
ast_channel_state(chan) == AST_STATE_RINGING)
break; /* Got ring */
}
ast_channel_lock(chan);
ast_clear_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY);
ast_channel_unlock(chan);
dtmfbuf[k] = '\0';
dahdi_setlinear(p->subs[idx].dfd, p->subs[idx].linear);
/* Got cid and ring. */
channels/sig_analog.c
+4
View File
@@ -2403,7 +2403,9 @@ static void *__analog_ss_thread(void *data)
* emulation. The DTMF digits can come so fast that emulation
* can drop some of them.
*/
ast_channel_lock(chan);
ast_set_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY);
ast_channel_unlock(chan);
timeout_ms = 4000;/* This is a typical OFF time between rings. */
for (;;) {
struct ast_frame *f;
@@ -2438,7 +2440,9 @@ static void *__analog_ss_thread(void *data)
break; /* Got ring */
}
}
ast_channel_lock(chan);
ast_clear_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY);
ast_channel_unlock(chan);
dtmfbuf[k] = '\0';
analog_set_linear_mode(p, idx, oldlinearity);
main/channel.c
+2
View File
@@ -6032,7 +6032,9 @@ struct ast_channel *__ast_request_and_dial(const char *type, struct ast_format_c
*/
ast_set_callerid(chan, cid_num, cid_name, cid_num);
ast_channel_lock(chan);
ast_set_flag(ast_channel_flags(chan), AST_FLAG_ORIGINATED);
ast_channel_unlock(chan);
ast_party_connected_line_set_init(&connected, ast_channel_connected(chan));
if (cid_num) {
connected.id.number.valid = 1;