[asterisk-commits] mmichelson: branch group/v14_colp r158853 - /team/group/v14_colp/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Nov 24 15:40:33 2008
New Revision: 158853

URL: http://svn.digium.com/view/asterisk?view=rev&rev=158853
Log:
Make the 'I' flags for app_dial and app_queue
suppress both connected line and redirecting updates


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

Modified: team/group/v14_colp/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_dial.c?view=diff&rev=158853&r1=158852&r2=158853
==============================================================================
--- team/group/v14_colp/apps/app_dial.c (original)
+++ team/group/v14_colp/apps/app_dial.c Mon Nov 24 15:40:33 2008
@@ -689,9 +689,16 @@
 					}
 					break;
 				case AST_CONTROL_REDIRECTING:
-					if (option_verbose > 2)
-						ast_verbose (VERBOSE_PREFIX_3 "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
-					ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data, f->datalen);
+					if (ast_test_flag(peerflags, OPT_IGNORE_CONNECTEDLINE)) {
+						if (option_verbose > 2) {
+							ast_verbose(VERBOSE_PREFIX_3 "Redirecting update to %s prevented.\n", in->name);
+						}
+					} else {
+						if (option_verbose > 2) {
+							ast_verbose (VERBOSE_PREFIX_3 "%s redirecting info has changed, passing it to %s\n", c->name, in->name);
+						}
+						ast_indicate_data(in, AST_CONTROL_REDIRECTING, f->data, f->datalen);
+					}
 					break;
 				case AST_CONTROL_PROCEEDING:
 					if (option_verbose > 2)

Modified: team/group/v14_colp/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_queue.c?view=diff&rev=158853&r1=158852&r2=158853
==============================================================================
--- team/group/v14_colp/apps/app_queue.c (original)
+++ team/group/v14_colp/apps/app_queue.c Mon Nov 24 15:40:33 2008
@@ -2337,9 +2337,16 @@
 							}
 							break;
 						case AST_CONTROL_REDIRECTING:
-							if (option_verbose > 2)
-								ast_verbose(VERBOSE_PREFIX_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, f->datalen);
+							if (!update_connectedline) {
+								if (option_verbose > 2) {
+									ast_verbose(VERBOSE_PREFIX_3 "Redirecting update to %s prevented.\n", in->name);
+								}
+							} else {
+								if (option_verbose > 2) {
+									ast_verbose(VERBOSE_PREFIX_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, f->datalen);
+							}
 							break;
 						default:
 							ast_log(LOG_DEBUG, "Dunno what to do with control type %d\n", f->subclass);