[asterisk-commits] rmudgett: branch 1.6.1 r193079 - in /branches/1.6.1: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May  7 17:42:54 2009
New Revision: 193079

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=193079
Log:
Merged revisions 193077 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r193077 | rmudgett | 2009-05-07 17:24:04 -0500 (Thu, 07 May 2009) | 12 lines
  
  Merged revisions 193050 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193050 | rmudgett | 2009-05-07 17:17:06 -0500 (Thu, 07 May 2009) | 5 lines
    
    Give a more helpful message when an incoming call's dialed extension does not match.
    
    Added the dialed extension and context to the chan_misdn messages warning
    that the dialed number cannot be matched in the dialplan.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_misdn.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_misdn.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_misdn.c?view=diff&rev=193079&r1=193078&r2=193079
==============================================================================
--- branches/1.6.1/channels/chan_misdn.c (original)
+++ branches/1.6.1/channels/chan_misdn.c Thu May  7 17:42:54 2009
@@ -4336,7 +4336,9 @@
 			
 			if (!ast_canmatch_extension(ch->ast, ch->context, bc->dad, 1, bc->oad)) {
 				if (ast_exists_extension(ch->ast, ch->context, "i", 1, bc->oad)) {
-					ast_log(LOG_WARNING, "Extension can never match, So jumping to 'i' extension. port(%d)\n", bc->port);
+					ast_log(LOG_WARNING,
+						"Extension '%s@%s' can never match. Jumping to 'i' extension. port:%d\n",
+						bc->dad, ch->context, bc->port);
 					strcpy(ch->ast->exten, "i");
 
 					ch->state = MISDN_DIALING;
@@ -4344,9 +4346,10 @@
 					break;
 				}
 
-				ast_log(LOG_WARNING, "Extension can never match, so disconnecting on port(%d)."
-						"maybe you want to add an 'i' extension to catch this case.\n",
-						bc->port);
+				ast_log(LOG_WARNING,
+					"Extension '%s@%s' can never match. Disconnecting. port:%d\n"
+					"\tMaybe you want to add an 'i' extension to catch this case.\n",
+					bc->dad, ch->context, bc->port);
 
 				if (bc->nt)
 					hanguptone_indicate(ch);
@@ -4605,7 +4608,9 @@
 		chan_misdn_log(5, bc->port, "CONTEXT:%s\n", ch->context);
 		if(!ast_canmatch_extension(ch->ast, ch->context, bc->dad, 1, bc->oad)) {
 			if (ast_exists_extension(ch->ast, ch->context, "i", 1, bc->oad)) {
-				ast_log(LOG_WARNING, "Extension can never match, So jumping to 'i' extension. port(%d)\n", bc->port);
+				ast_log(LOG_WARNING,
+					"Extension '%s@%s' can never match. Jumping to 'i' extension. port:%d\n",
+					bc->dad, ch->context, bc->port);
 				strcpy(ch->ast->exten, "i");
 				misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE);
 				ch->state = MISDN_DIALING;
@@ -4613,9 +4618,10 @@
 				break;
 			}
 
-			ast_log(LOG_WARNING, "Extension can never match, so disconnecting on port(%d)."
-					"maybe you want to add an 'i' extension to catch this case.\n",
-					bc->port);
+			ast_log(LOG_WARNING,
+				"Extension '%s@%s' can never match. Disconnecting. port:%d\n"
+				"\tMaybe you want to add an 'i' extension to catch this case.\n",
+				bc->dad, ch->context, bc->port);
 			if (bc->nt)
 				hanguptone_indicate(ch);