[asterisk-commits] mmichelson: branch group/issue8824 r158846 - /team/group/issue8824/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Nov 24 15:18:49 2008
New Revision: 158846

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158846
Log:
Make the 'I' flags to app_dial and app_queue apply to
AST_CONTROL_REDIRECTING control frames in addition to
AST_CONTROL_CONNECTED_LINE frames.


Modified:
    team/group/issue8824/apps/app_dial.c
    team/group/issue8824/apps/app_queue.c

Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=158846&r1=158845&r2=158846
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Mon Nov 24 15:18:49 2008
@@ -987,8 +987,12 @@
 					}
 					break;
 				case AST_CONTROL_REDIRECTING:
-					ast_verb(3, "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
-					ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
+					if (ast_test_flag64(peerflags, OPT_IGNORE_CONNECTDLINE)) {
+						ast_verb(3, "Redirecting update to %s prevented.\n", in->name);
+					} else {
+						ast_verb(3, "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
+						ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
+					}
 					break;
 				case AST_CONTROL_PROCEEDING:
 					ast_verb(3, "%s is proceeding passing it to %s\n", c->name, in->name);

Modified: team/group/issue8824/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_queue.c?view=diff&rev=158846&r1=158845&r2=158846
==============================================================================
--- team/group/issue8824/apps/app_queue.c (original)
+++ team/group/issue8824/apps/app_queue.c Mon Nov 24 15:18:49 2008
@@ -2916,8 +2916,12 @@
 							}
 							break;
 						case AST_CONTROL_REDIRECTING:
-							ast_verb(3, "%s redirecting info has changed, passing it to %s\n", o->chan->name, in->name);
-							ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
+							if (!update_connectedline) {
+								ast_verb(3, "Redirecting update to %s prevented\n", in->name);
+							} else {
+								ast_verb(3, "%s redirecting info has changed, passing it to %s\n", o->chan->name, in->name);
+								ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data.ptr, f->datalen);
+							}
 							break;
 						default:
 							ast_debug(1, "Dunno what to do with control type %d\n", f->subclass);