diff options
| author | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-03-13 18:20:34 +0000 |
| commit | 786f5898d12d30c481b1d178bb80e5801dbf666f (patch) | |
| tree | 2b5e07ed1b5fbd7aae1187f068eff498621878a2 /channels/chan_dahdi.c | |
| parent | 73ec67e008ca6db76625bfc1f992fa726c948837 (diff) | |
Finalize ast_channel opaquification
Review: https://reviewboard.asterisk.org/r/1786/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 6751d0d0c..5dad53910 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -7741,7 +7741,7 @@ static int attempt_transfer(struct dahdi_pvt *p) } else { ast_debug(1, "Neither %s nor %s are in a bridge, nothing to transfer\n", ast_channel_name(p->subs[SUB_REAL].owner), ast_channel_name(p->subs[SUB_THREEWAY].owner)); - ast_channel_softhangup_internal_flag_set(p->subs[SUB_THREEWAY].owner, ast_channel_softhangup_internal_flag(p->subs[SUB_THREEWAY].owner) | AST_SOFTHANGUP_DEV); + ast_channel_softhangup_internal_flag_add(p->subs[SUB_THREEWAY].owner, AST_SOFTHANGUP_DEV); return -1; } return 0; @@ -9150,7 +9150,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast) readbuf = ((unsigned char *)p->subs[idx].buffer) + AST_FRIENDLY_OFFSET; CHECK_BLOCKING(ast); res = read(p->subs[idx].dfd, readbuf, p->subs[idx].linear ? READ_SIZE * 2 : READ_SIZE); - ast_clear_flag(ast, AST_FLAG_BLOCKING); + ast_clear_flag(ast_channel_flags(ast), AST_FLAG_BLOCKING); /* Check for hangup */ if (res < 0) { f = NULL; @@ -10549,7 +10549,7 @@ static void *analog_ss_thread(void *data) * emulation. The DTMF digits can come so fast that emulation * can drop some of them. */ - ast_set_flag(chan, AST_FLAG_END_DTMF_ONLY); + ast_set_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY); res = 4000;/* This is a typical OFF time between rings. */ for (;;) { struct ast_frame *f; @@ -10580,7 +10580,7 @@ static void *analog_ss_thread(void *data) ast_channel_state(chan) == AST_STATE_RINGING) break; /* Got ring */ } - ast_clear_flag(chan, AST_FLAG_END_DTMF_ONLY); + ast_clear_flag(ast_channel_flags(chan), AST_FLAG_END_DTMF_ONLY); dtmfbuf[k] = '\0'; dahdi_setlinear(p->subs[idx].dfd, p->subs[idx].linear); /* Got cid and ring. */ |