From 7eafb1a763295d9a42cae2adf1c85e11593a667a Mon Sep 17 00:00:00 2001
From: "Eliel C. Sardanons" <eliels@gmail.com>
Date: Sat, 10 Jul 2010 20:49:30 +0000
Subject: [PATCH] When creating a conference for a unit test, it is not
mandatory to open a dahdi pseudo channel, so if we fail doing it, continue
creating the conference.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_meetme.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index eb9aabead3..a812870798 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1186,14 +1186,18 @@ static struct ast_conference *build_conf(const char *confno, const char *pin,
cnf->fd = open("/dev/dahdi/pseudo", O_RDWR);
if (cnf->fd < 0 || ioctl(cnf->fd, DAHDI_SETCONF, &dahdic)) {
if (test) {
+ /* 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");
+ } else {
+ ast_log(LOG_WARNING, "Unable to open pseudo device\n");
+ if (cnf->fd >= 0)
+ close(cnf->fd);
+ ast_free(cnf);
+ cnf = NULL;
+ goto cnfout;
}
- ast_log(LOG_WARNING, "Unable to open pseudo device\n");
- if (cnf->fd >= 0)
- close(cnf->fd);
- ast_free(cnf);
- cnf = NULL;
- goto cnfout;
}
cnf->dahdiconf = dahdic.confno;
--
GitLab