dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 297245 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297245 | russell | 2010-12-02 07:20:19 -0600 (Thu, 02 Dec 2010) | 20 lines
  
  Merged revisions 297229 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297229 | russell | 2010-12-02 07:16:47 -0600 (Thu, 02 Dec 2010) | 13 lines
    
    Merged revisions 297228 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297228 | russell | 2010-12-02 07:16:15 -0600 (Thu, 02 Dec 2010) | 6 lines
      
      Add "DAHDI" to a couple of app_meetme error messages.
      
      This is in response to some questions on IRC.  To the user, there was nothing
      that made it obvious that this error had anything to do with DAHDI not being
      loaded.
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@297248 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2010-12-02 13:20:48 +00:00
parent 286b2c53a7
commit f85546e84f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@ -1226,9 +1226,9 @@ static struct ast_conference *build_conf(const char *confno, const char *pin,
/* if we are creating a conference for a unit test, it is not neccesary
* to open a pseudo channel, so, if we fail continue creating
* the conference. */
ast_test_status_update(test, "Unable to open pseudo device\n");
ast_test_status_update(test, "Unable to open DAHDI pseudo device\n");
} else {
ast_log(LOG_WARNING, "Unable to open pseudo device\n");
ast_log(LOG_WARNING, "Unable to open DAHDI pseudo device\n");
if (cnf->fd >= 0)
close(cnf->fd);
ast_free(cnf);
@ -2618,7 +2618,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
/* open pseudo in non-blocking mode */
fd = open("/dev/dahdi/pseudo", O_RDWR | O_NONBLOCK);
if (fd < 0) {
ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
ast_log(LOG_WARNING, "Unable to open DAHDI pseudo channel: %s\n", strerror(errno));
goto outrun;
}
using_pseudo = 1;