Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@122234 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 0 insertions, 299 deletions

diff --git a/apps/app_zapbarge.c b/apps/app_zapbarge.c
deleted file mode 100644
index 892dd1ec0..000000000
--- a/apps/app_zapbarge.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Mark Spencer <markster@digium.com>
- *
- * Special thanks to comphealth.com for sponsoring this
- * GPL application.
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*! \file
- *
- * \brief Zap Barge support
- *
- * \author Mark Spencer <markster@digium.com>
- *
- * \note Special thanks to comphealth.com for sponsoring this
- * GPL application.
- * 
- * \ingroup applications
- */
-
-/*** MODULEINFO
-	<depend>zaptel</depend>
- ***/
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include "asterisk/zapata.h"
-
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/config.h"
-#include "asterisk/app.h"
-#include "asterisk/cli.h"
-#include "asterisk/say.h"
-#include "asterisk/utils.h"
-
-static char *app = "ZapBarge";
-
-static char *synopsis = "Barge in (monitor) Zap channel";
-
-static char *descrip = 
-"  ZapBarge([channel]): Barges in on a specified zap\n"
-"channel or prompts if one is not specified.  Returns\n"
-"-1 when caller user hangs up and is independent of the\n"
-"state of the channel being monitored.";
-
-
-#define CONF_SIZE 160
-
-static int careful_write(int fd, unsigned char *data, int len)
-{
-	int res;
-	while(len) {
-		res = write(fd, data, len);
-		if (res < 1) {
-			if (errno != EAGAIN) {
-				ast_log(LOG_WARNING, "Failed to write audio data to conference: %s\n", strerror(errno));
-				return -1;
-			} else
-				return 0;
-		}
-		len -= res;
-		data += res;
-	}
-	return 0;
-}
-
-static int conf_run(struct ast_channel *chan, int confno, int confflags)
-{
-	int fd;
-	struct zt_confinfo ztc;
-	struct ast_frame *f;
-	struct ast_channel *c;
-	struct ast_frame fr;
-	int outfd;
-	int ms;
-	int nfds;
-	int res;
-	int flags;
-	int retryzap;
-	int origfd;
-	int ret = -1;
-
-	ZT_BUFFERINFO bi;
-	char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
-	char *buf = __buf + AST_FRIENDLY_OFFSET;
-
-	/* Set it into U-law mode (write) */
-	if (ast_set_write_format(chan, AST_FORMAT_ULAW) < 0) {
-		ast_log(LOG_WARNING, "Unable to set '%s' to write ulaw mode\n", chan->name);
-		goto outrun;
-	}
-
-	/* Set it into U-law mode (read) */
-	if (ast_set_read_format(chan, AST_FORMAT_ULAW) < 0) {
-		ast_log(LOG_WARNING, "Unable to set '%s' to read ulaw mode\n", chan->name);
-		goto outrun;
-	}
-	ast_indicate(chan, -1);
-	retryzap = strcasecmp(chan->tech->type, "Zap");
-zapretry:
-	origfd = chan->fds[0];
-	if (retryzap) {
-		fd = open("/dev/zap/pseudo", O_RDWR);
-		if (fd < 0) {
-			ast_log(LOG_WARNING, "Unable to open pseudo channel: %s\n", strerror(errno));
-			goto outrun;
-		}
-		/* Make non-blocking */
-		flags = fcntl(fd, F_GETFL);
-		if (flags < 0) {
-			ast_log(LOG_WARNING, "Unable to get flags: %s\n", strerror(errno));
-			close(fd);
-			goto outrun;
-		}
-		if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
-			ast_log(LOG_WARNING, "Unable to set flags: %s\n", strerror(errno));
-			close(fd);
-			goto outrun;
-		}
-		/* Setup buffering information */
-		memset(&bi, 0, sizeof(bi));
-		bi.bufsize = CONF_SIZE;
-		bi.txbufpolicy = ZT_POLICY_IMMEDIATE;
-		bi.rxbufpolicy = ZT_POLICY_IMMEDIATE;
-		bi.numbufs = 4;
-		if (ioctl(fd, ZT_SET_BUFINFO, &bi)) {
-			ast_log(LOG_WARNING, "Unable to set buffering information: %s\n", strerror(errno));
-			close(fd);
-			goto outrun;
-		}
-		nfds = 1;
-	} else {
-		/* XXX Make sure we're not running on a pseudo channel XXX */
-		fd = chan->fds[0];
-		nfds = 0;
-	}
-	memset(&ztc, 0, sizeof(ztc));
-	/* Check to see if we're in a conference... */
-	ztc.chan = 0;	
-	if (ioctl(fd, ZT_GETCONF, &ztc)) {
-		ast_log(LOG_WARNING, "Error getting conference\n");
-		close(fd);
-		goto outrun;
-	}
-	if (ztc.confmode) {
-		/* Whoa, already in a conference...  Retry... */
-		if (!retryzap) {
-			ast_debug(1, "Zap channel is in a conference already, retrying with pseudo\n");
-			retryzap = 1;
-			goto zapretry;
-		}
-	}
-	memset(&ztc, 0, sizeof(ztc));
-	/* Add us to the conference */
-	ztc.chan = 0;	
-	ztc.confno = confno;
-	ztc.confmode = ZT_CONF_MONITORBOTH;
-
-	if (ioctl(fd, ZT_SETCONF, &ztc)) {
-		ast_log(LOG_WARNING, "Error setting conference\n");
-		close(fd);
-		goto outrun;
-	}
-	ast_debug(1, "Placed channel %s in ZAP channel %d monitor\n", chan->name, confno);
-
-	for(;;) {
-		outfd = -1;
-		ms = -1;
-		c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
-		if (c) {
-			if (c->fds[0] != origfd) {
-				if (retryzap) {
-					/* Kill old pseudo */
-					close(fd);
-				}
-				ast_debug(1, "Ooh, something swapped out under us, starting over\n");
-				retryzap = 0;
-				goto zapretry;
-			}
-			f = ast_read(c);
-			if (!f) 
-				break;
-			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) {
-				ret = 0;
-				ast_frfree(f);
-				break;
-			} else if (fd != chan->fds[0]) {
-				if (f->frametype == AST_FRAME_VOICE) {
-					if (f->subclass == AST_FORMAT_ULAW) {
-						/* Carefully write */
-						careful_write(fd, f->data.ptr, f->datalen);
-					} else
-						ast_log(LOG_WARNING, "Huh?  Got a non-ulaw (%d) frame in the conference\n", f->subclass);
-				}
-			}
-			ast_frfree(f);
-		} else if (outfd > -1) {
-			res = read(outfd, buf, CONF_SIZE);
-			if (res > 0) {
-				memset(&fr, 0, sizeof(fr));
-				fr.frametype = AST_FRAME_VOICE;
-				fr.subclass = AST_FORMAT_ULAW;
-				fr.datalen = res;
-				fr.samples = res;
-				fr.data.ptr = buf;
-				fr.offset = AST_FRIENDLY_OFFSET;
-				if (ast_write(chan, &fr) < 0) {
-					ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
-					/* break; */
-				}
-			} else 
-				ast_log(LOG_WARNING, "Failed to read frame: %s\n", strerror(errno));
-		}
-	}
-	if (fd != chan->fds[0])
-		close(fd);
-	else {
-		/* Take out of conference */
-		/* Add us to the conference */
-		ztc.chan = 0;	
-		ztc.confno = 0;
-		ztc.confmode = 0;
-		if (ioctl(fd, ZT_SETCONF, &ztc)) {
-			ast_log(LOG_WARNING, "Error setting conference\n");
-		}
-	}
-
-outrun:
-
-	return ret;
-}
-
-static int conf_exec(struct ast_channel *chan, void *data)
-{
-	int res=-1;
-	int retrycnt = 0;
-	int confflags = 0;
-	int confno = 0;
-	char confstr[80] = "";
-	
-	if (!ast_strlen_zero(data)) {
-		if ((sscanf(data, "Zap/%d", &confno) != 1) &&
-		    (sscanf(data, "%d", &confno) != 1)) {
-			ast_log(LOG_WARNING, "ZapBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data);
-			return 0;
-		}
-	}
-	
-	if (chan->_state != AST_STATE_UP)
-		ast_answer(chan);
-
-	while(!confno && (++retrycnt < 4)) {
-		/* Prompt user for conference number */
-		confstr[0] = '\0';
-		res = ast_app_getdata(chan, "conf-getchannel",confstr, sizeof(confstr) - 1, 0);
-		if (res <0) goto out;
-		if (sscanf(confstr, "%d", &confno) != 1)
-			confno = 0;
-	}
-	if (confno) {
-		/* XXX Should prompt user for pin if pin is required XXX */
-		/* Run the conference */
-		res = conf_run(chan, confno, confflags);
-	}
-out:
-	/* Do the conference */
-	return res;
-}
-
-static int unload_module(void)
-{
-	return ast_unregister_application(app);
-}
-
-static int load_module(void)
-{
-	return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on Zap channel application");