[asterisk-commits] dvossel: trunk r198954 - in /trunk: apps/ main/

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Jun  3 15:30:10 2009
New Revision: 198954

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198954
Log:
ast_call_forward() todo notes and originate flag copy.


Modified:
    trunk/apps/app_dial.c
    trunk/apps/app_queue.c
    trunk/main/channel.c

Modified: trunk/apps/app_dial.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_dial.c?view=diff&rev=198954&r1=198953&r2=198954
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Jun  3 15:30:10 2009
@@ -724,6 +724,8 @@
  *
  * XXX this code is highly suspicious, as it essentially overwrites
  * 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,
 	struct cause_args *num, struct ast_flags64 *peerflags, int single, int *to)

Modified: trunk/apps/app_queue.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_queue.c?view=diff&rev=198954&r1=198953&r2=198954
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Jun  3 15:30:10 2009
@@ -3001,6 +3001,8 @@
  * \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] 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)
 {

Modified: trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/channel.c?view=diff&rev=198954&r1=198953&r2=198954
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Jun  3 15:30:10 2009
@@ -4001,6 +4001,7 @@
 	while (ast_channel_trylock(new)) {
 		CHANNEL_DEADLOCK_AVOIDANCE(orig);
 	}
+	ast_copy_flags(new->cdr, orig->cdr, AST_CDR_FLAG_ORIGINATED);
 	ast_string_field_set(new, accountcode, orig->accountcode);
 	ast_party_caller_copy(&new->cid, &orig->cid);
 	ast_party_connected_line_copy(&new->connected, &orig->connected);