aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-02 13:16:47 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-12-02 13:16:47 +0000
commit7531df49c26e62303f5a65f150fe1cb8d41c34f6 (patch)
tree6e2489fdb435b53697f4d6a2affc814df20e57cf /apps
parentb46e6372a8ef684cd5a4b115bc600fdb26c981a3 (diff)
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/branches/1.6.2@297229 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4d081d0ff..db4c2c86b 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1120,7 +1120,7 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
dahdic.confmode = DAHDI_CONF_CONFANN | DAHDI_CONF_CONFANNMON;
cnf->fd = open("/dev/dahdi/pseudo", O_RDWR);
if (cnf->fd < 0 || ioctl(cnf->fd, DAHDI_SETCONF, &dahdic)) {
- 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);
@@ -2415,7 +2415,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
/* 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;