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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279816 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 4c5f081..331278e 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -16228,7 +16228,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
                }
 
                /* 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;

diff --git a/main/channel.c b/main/channel.c
index 175f9d1..00f3f78 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3429,6 +3429,7 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
                                case AST_CONTROL_SRCCHANGE:
                                case AST_CONTROL_CONNECTED_LINE:
                                case AST_CONTROL_REDIRECTING:
+                               case -1:
                                        /* Unimportant */
                                        break;
                                default: