kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add final part of previously committed work for answered elsewhere in queue - the missing piece that started with app_dial() earlier on.

Browse Source 
This is to avoid having the list and counter of missed calls being touched by queue calls. Add the C option to queue() and nothing 
will be logged on phones that support the Reason: header on SIP cancel, like the SNOM phones.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@171924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2009-01-28 14:37:16 +00:00
parent aca43d126a
commit 097822966b
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_queue.c
View File

@@ -118,6 +118,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="queuename" required="true" /> <parameter name="queuename" required="true" />
<parameter name="options"> <parameter name="options">
<optionlist> <optionlist>
<option name="C">
<para>Mark all calls as "answered elsewhere" when cancelled.</para>
</option>
<option name="c"> <option name="c">
<para>Continue in the dialplan if the callee hangs up.</para> <para>Continue in the dialplan if the callee hangs up.</para>
</option> </option>
@@ -2222,15 +2225,15 @@ static void leave_queue(struct queue_ent *qe)
} }
/*! \brief Hang up a list of outgoing calls */ /*! \brief Hang up a list of outgoing calls */
static void hangupcalls(struct callattempt *outgoing, struct ast_channel *exception) static void hangupcalls(struct callattempt *outgoing, struct ast_channel *exception, int cancel_answered_elsewhere)
{ {
struct callattempt *oo; struct callattempt *oo;
while (outgoing) { while (outgoing) {
/* If someone else answered the call we should indicate this in the CANCEL */ /* If someone else answered the call we should indicate this in the CANCEL */
/* Hangup any existing lines we have open */ /* Hangup any existing lines we have open */
if (outgoing->chan && (outgoing->chan != exception)) { if (outgoing->chan && (outgoing->chan != exception || cancel_answered_elsewhere)) {
if (exception) if (exception || cancel_answered_elsewhere)
ast_set_flag(outgoing->chan, AST_FLAG_ANSWERED_ELSEWHERE); ast_set_flag(outgoing->chan, AST_FLAG_ANSWERED_ELSEWHERE);
ast_hangup(outgoing->chan); ast_hangup(outgoing->chan);
} }
@@ -3481,6 +3484,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
struct ao2_iterator memi; struct ao2_iterator memi;
struct ast_datastore *datastore, *transfer_ds; struct ast_datastore *datastore, *transfer_ds;
struct queue_end_bridge *queue_end_bridge = NULL; struct queue_end_bridge *queue_end_bridge = NULL;
int cancel_answered_elsewhere = 0;
ast_channel_lock(qe->chan); ast_channel_lock(qe->chan);
datastore = ast_channel_datastore_find(qe->chan, &dialed_interface_info, NULL); datastore = ast_channel_datastore_find(qe->chan, &dialed_interface_info, NULL);
@@ -3548,6 +3552,9 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
case 'X': case 'X':
ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_AUTOMIXMON); ast_set_flag(&(bridge_config.features_caller), AST_FEATURE_AUTOMIXMON);
break; break;
case 'C':
cancel_answered_elsewhere = 1;
break;
} }
@@ -3744,7 +3751,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
member = lpeer->member; member = lpeer->member;
/* Increment the refcount for this member, since we're going to be using it for awhile in here. */ /* Increment the refcount for this member, since we're going to be using it for awhile in here. */
ao2_ref(member, 1); ao2_ref(member, 1);
hangupcalls(outgoing, peer); hangupcalls(outgoing, peer, cancel_answered_elsewhere);
outgoing = NULL; outgoing = NULL;
if (announce || qe->parent->reportholdtime || qe->parent->memberdelay) { if (announce || qe->parent->reportholdtime || qe->parent->memberdelay) {
int res2; int res2;
@@ -4147,7 +4154,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
ao2_ref(member, -1); ao2_ref(member, -1);
} }
out: out:
hangupcalls(outgoing, NULL); hangupcalls(outgoing, NULL, cancel_answered_elsewhere);
return res; return res;
} }