kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 22:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ast_call_forward() todo notes and originate flag copy.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@198954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-03 20:30:10 +00:00
parent 0c47c8f448
commit c42344b319
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@@ -724,6 +724,8 @@ static void senddialendevent(const struct ast_channel *src, const char *dialstat
* *
* XXX this code is highly suspicious, as it essentially overwrites * XXX this code is highly suspicious, as it essentially overwrites
* the outgoing channel without properly deleting it. * the outgoing channel without properly deleting it.
*
* \todo eventually this function should be intergrated into and replaced by ast_call_forward()
*/ */
static void do_forward(struct chanlist *o, static void do_forward(struct chanlist *o,
struct cause_args *num, struct ast_flags64 *peerflags, int single, int *to) struct cause_args *num, struct ast_flags64 *peerflags, int single, int *to)

2
apps/app_queue.c
View File

@@ -3001,6 +3001,8 @@ static void rna(int rnatime, struct queue_ent *qe, char *interface, char *member
* \param[in] prebusies number of busy members calculated prior to calling wait_for_answer * \param[in] prebusies number of busy members calculated prior to calling wait_for_answer
* \param[in] caller_disconnect if the 'H' option is used when calling Queue(), this is used to detect if the caller pressed * to disconnect the call * \param[in] caller_disconnect if the 'H' option is used when calling Queue(), this is used to detect if the caller pressed * to disconnect the call
* \param[in] forwardsallowed used to detect if we should allow call forwarding, based on the 'i' option to Queue() * \param[in] forwardsallowed used to detect if we should allow call forwarding, based on the 'i' option to Queue()
*
* \todo eventually all call forward logic should be intergerated into and replaced by ast_call_forward()
*/ */
static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed, int update_connectedline) static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed, int update_connectedline)
{ {

1
main/channel.c
View File

@@ -4001,6 +4001,7 @@ struct ast_channel *ast_call_forward(struct ast_channel *caller, struct ast_chan
while (ast_channel_trylock(new)) { while (ast_channel_trylock(new)) {
CHANNEL_DEADLOCK_AVOIDANCE(orig); CHANNEL_DEADLOCK_AVOIDANCE(orig);
} }
ast_copy_flags(new->cdr, orig->cdr, AST_CDR_FLAG_ORIGINATED);
ast_string_field_set(new, accountcode, orig->accountcode); ast_string_field_set(new, accountcode, orig->accountcode);
ast_party_caller_copy(&new->cid, &orig->cid); ast_party_caller_copy(&new->cid, &orig->cid);
ast_party_connected_line_copy(&new->connected, &orig->connected); ast_party_connected_line_copy(&new->connected, &orig->connected);