[svn-commits] russell: trunk r279816 - in /trunk: ./ channels/chan_dahdi.c main/channel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jul 27 11:08:10 2010
New Revision: 279816

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=279816
Log:
Merged revisions 279636,279815 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279636 | russell | 2010-07-26 16:53:30 -0500 (Mon, 26 Jul 2010) | 2 lines
  
  Ignore a control subclass of -1 in ast_waitfordigit_full().
........
  r279815 | russell | 2010-07-27 11:06:58 -0500 (Tue, 27 Jul 2010) | 4 lines
  
  Support "channels" in addition to "channel" in chan_dahdi.conf.
  
  Review: https://reviewboard.asterisk.org/r/804
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Tue Jul 27 11:08:10 2010
@@ -1,1 +1,1 @@
-/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279658,279689,279726,279755,279785
+/branches/1.8:1-279056,279113,279227,279273,279280,279314,279390,279410,279442,279472,279502,279504,279562,279566,279568,279598,279601,279619,279636-279815

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=279816&r1=279815&r2=279816
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Jul 27 11:08:10 2010
@@ -16228,7 +16228,7 @@
 		}
 
 		/* Create the interface list */
-		if (!strcasecmp(v->name, "channel")) {
+		if (!strcasecmp(v->name, "channel") || !strcasecmp(v->name, "channels")) {
  			if (options & PROC_DAHDI_OPT_NOCHAN) {
 				ast_log(LOG_WARNING, "Channel '%s' ignored.\n", v->value);
  				continue;

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=279816&r1=279815&r2=279816
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Jul 27 11:08:10 2010
@@ -3429,6 +3429,7 @@
 				case AST_CONTROL_SRCCHANGE:
 				case AST_CONTROL_CONNECTED_LINE:
 				case AST_CONTROL_REDIRECTING:
+				case -1:
 					/* Unimportant */
 					break;
 				default: