[svn-commits] mattf: branch mattf/bug13454 r149627 - in /team/mattf/bug13454: channels/ con...

[SVN commits to the Digium repositories]

Author: mattf
Date: Wed Oct 15 11:32:54 2008
New Revision: 149627

URL: http://svn.digium.com/view/asterisk?view=rev&rev=149627
Log:
Hopefully final modifications before merging this into trunk

Modified:
    team/mattf/bug13454/channels/chan_dahdi.c
    team/mattf/bug13454/configs/chan_dahdi.conf.sample

Modified: team/mattf/bug13454/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/team/mattf/bug13454/channels/chan_dahdi.c?view=diff&rev=149627&r1=149626&r2=149627
==============================================================================
--- team/mattf/bug13454/channels/chan_dahdi.c (original)
+++ team/mattf/bug13454/channels/chan_dahdi.c Wed Oct 15 11:32:54 2008
@@ -2478,8 +2478,7 @@
 
 	tok = strtok_r(NULL, "|", &tokb);
 	if (!tok) {
-		ast_log(LOG_WARNING, "Callrerouting Facility without diversion reason argument\n");
-		return -1;
+		ast_log(LOG_NOTICE, "Callrerouting Facility without diversion reason argument, defaulting to unknown\n");
 	} else {
 		reason = tok;
 	}

Modified: team/mattf/bug13454/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/team/mattf/bug13454/configs/chan_dahdi.conf.sample?view=diff&rev=149627&r1=149626&r2=149627
==============================================================================
--- team/mattf/bug13454/configs/chan_dahdi.conf.sample (original)
+++ team/mattf/bug13454/configs/chan_dahdi.conf.sample Wed Oct 15 11:32:54 2008
@@ -142,6 +142,11 @@
 ; physical:	Use physical channel mapping (default)
 ;
 ;qsigchannelmapping=logical
+;
+; If you wish to ignore remote hold indications (and use MOH that is supplied over
+; the B channel) enable this option.
+;
+;discardremoteholdretrieval=yes
 ;
 ; ISDN Timers
 ; All of the ISDN timers and counters that are used are configurable.  Specify