diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 4 | ||||
| -rw-r--r-- | apps/app_macro.c | 4 | ||||
| -rw-r--r-- | apps/app_meetme.c | 2 | ||||
| -rw-r--r-- | apps/app_osplookup.c | 2 | ||||
| -rw-r--r-- | apps/app_queue.c | 4 | ||||
| -rw-r--r-- | apps/app_zapras.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 8fd479f22..c7928116a 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1789,7 +1789,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP); /* set it back the way it was */ } if (res != AST_PBX_NO_HANGUP_PEER) { - if (!chan->_softhangup) + if (!ast_check_hangup(chan)) chan->hangupcause = peer->hangupcause; ast_hangup(peer); } @@ -1808,7 +1808,7 @@ out: senddialendevent(chan, pa.status); ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status); - if ((ast_test_flag64(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) { + if ((ast_test_flag64(peerflags, OPT_GO_ON)) && !ast_check_hangup(chan) && (res != AST_PBX_KEEPALIVE)) { if (calldurationlimit) chan->whentohangup = 0; res = 0; diff --git a/apps/app_macro.c b/apps/app_macro.c index 9949f43c3..32e9d2d21 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -385,7 +385,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) } /* don't stop executing extensions when we're in "h" */ - if (chan->_softhangup && !inhangup) { + if (ast_check_hangup(chan) && !inhangup) { ast_debug(1, "Extension %s, macroexten %s, priority %d returned normally even though call was hung up\n", chan->exten, chan->macroexten, chan->priority); goto out; } @@ -434,7 +434,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) /* If we're leaving the macro normally, restore original information */ chan->priority = oldpriority; ast_copy_string(chan->context, oldcontext, sizeof(chan->context)); - if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) { + if (!(ast_check_hangup(chan) & AST_SOFTHANGUP_ASYNCGOTO)) { /* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */ const char *offsets; ast_copy_string(chan->exten, oldexten, sizeof(chan->exten)); diff --git a/apps/app_meetme.c b/apps/app_meetme.c index e03304472..fcf45e82b 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -718,7 +718,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu int len; int res = -1; - if (!chan->_softhangup) + if (!ast_check_hangup(chan)) res = ast_autoservice_start(chan); AST_LIST_LOCK(&confs); diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index dd75b57fd..3e7f9b2b3 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1734,7 +1734,7 @@ static int ospfinished_exec( ast_debug(1, "OSPFinish: connect '%ld'\n", connect); ast_debug(1, "OSPFinish: end '%ld'\n", end); - release = chan->_softhangup ? 0 : 1; + release = ast_check_hangup(chan) ? 0 : 1; if (osp_finish(outhandle, recorded, cause, start, connect, end, release) <= 0) { ast_debug(1, "OSPFinish: Unable to report usage for outbound call\n"); diff --git a/apps/app_queue.c b/apps/app_queue.c index 166237f91..291c883bd 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2651,7 +2651,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce } } res2 |= ast_autoservice_stop(qe->chan); - if (peer->_softhangup) { + if (ast_check_hangup(peer)) { /* Agent must have hung up */ ast_log(LOG_WARNING, "Agent on %s hungup on the customer.\n", peer->name); ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "AGENTDUMP", "%s", ""); @@ -2943,7 +2943,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce qe->chan->exten, qe->chan->context, (long) (callstart - qe->start), (long) (time(NULL) - callstart)); send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER); - } else if (qe->chan->_softhangup) { + } else if (ast_check_hangup(qe->chan)) { ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d", (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos); send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), CALLER); diff --git a/apps/app_zapras.c b/apps/app_zapras.c index 448c45b7b..3433ba0f1 100644 --- a/apps/app_zapras.c +++ b/apps/app_zapras.c @@ -161,7 +161,7 @@ static void run_ras(struct ast_channel *chan, char *args) res = wait4(pid, &status, WNOHANG, NULL); if (!res) { /* Check for hangup */ - if (chan->_softhangup && !signalled) { + if (ast_check_hangup(chan) && !signalled) { ast_debug(1, "Channel '%s' hungup. Signalling RAS at %d to die...\n", chan->name, pid); kill(pid, SIGTERM); signalled=1; |