dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@279816 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2010-07-27 16:08:10 +00:00
parent e9753fc92b
commit 247a51691f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_dahdi.c
View File

@ -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;

1
main/channel.c
View File

@ -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: