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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@297229 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4d081d0fff4c58c9a460ae4b8957faf5716e080e..db4c2c86ba3c57eb14d53ee85041224ea6153dbb 100644 (file)
--- 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;