diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 13:20:19 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 13:20:19 +0000 |
| commit | 426e614b8b2fe902b8a486f420bc4ed7f31f8c5f (patch) | |
| tree | 4e0b91c7028591618bce1d7803e73d13030d05fa /apps | |
| parent | 686a1cf372a97eaa34862be951806165c20174be (diff) | |
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/branches/1.8@297245 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c2e81a139..c0dcf13e5 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1215,9 +1215,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); @@ -2571,7 +2571,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; |