Remove many deprecated modules

Billing records are fair,
To get paid is quite bright,
You should really use ODBC;
Good-bye cdr_sqlite.

Microsoft did once push H.323,
Hell, we all remember NetMeeting.
But try to compile chan_h323 now
And you will take quite a beating.

The XMPP and SIP war was fierce,
And in the distant fray
Was birthed res_jabber/chan_jingle;
But neither to stay.

For everyone did care and chase what Google professed.
"Free Internet Calling" was what devotees cried,
But Google did change the specs so often
That the developers were happy the day chan_gtalk died.

And then there was that odd application
Dedicated to the Polish tongue.
app_saycountpl was subsumed by Say;
One could say its bell was rung.

To read and parse a file from the dialplan
You could (I guess) use an application.
app_readfile did fill that purpose, but I think
A function is perhaps better in its creation.

Barging is rude, I'm not sure why we do it.
Inwardly, the caller will probably sigh.
But if you really must do it,
Don't use app_dahdibarge, use ChanSpy.

We all despise the sound of tinny robots
It makes our queues so cold.
To control such an abomination
It's better to not use Wait/SetMusicOnHold.

It's often nice to know properties of a channel
It makes our calls right
We have a nice function called CHANNEL
And so SIPCHANINFO is sent off into the night.

And now things get odd;
Apparently one could delimit with a colon
Properties from the SIPPEER function!
Commas are in; all others are done.

Finally, a word on pipes and commas.
We're sorry. We can't say it enough.
But those compatibility options in asterisk.conf;
To maintain them forever was just too tough.

This patch removes:

* cdr_sqlite
* chan_gtalk
* chan_jingle
* chan_h323
* res_jabber
* app_saycountpl
* app_readfile
* app_dahdibarge

It removes the following applications/functions:

* WaitMusicOnHold
* SetMusicOnHold
* SIPCHANINFO

It removes the colon delimiter from the SIPPEER function.

Finally, it also removes all compatibility options that were configurable from
asterisk.conf, as these all applied to compatibility with Asterisk 1.4 systems.

Review: https://reviewboard.asterisk.org/r/3698/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418019 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 0 insertions, 311 deletions

diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
deleted file mode 100644
index cc05a63f8..000000000
--- a/apps/app_dahdibarge.c
+++ /dev/null
@@ -1,311 +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 DAHDI Barge support
- *
- * \author Mark Spencer <markster@digium.com>
- *
- * \note Special thanks to comphealth.com for sponsoring this
- * GPL application.
- * 
- * \ingroup applications
- */
-
-/*** MODULEINFO
-	<depend>dahdi</depend>
-	<defaultenabled>no</defaultenabled>
-	<support_level>deprecated</support_level>
-	<replacement>app_chanspy</replacement>
- ***/
-
-#include "asterisk.h"
-
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
-#include <dahdi/user.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"
-
-/*** DOCUMENTATION
-	<application name="DAHDIBarge" language="en_US">
-		<synopsis>
-			Barge in (monitor) DAHDI channel.
-		</synopsis>
-		<syntax>
-			<parameter name="channel">
-				<para>Channel to barge.</para>
-			</parameter>
-		</syntax>
-		<description>
-			<para>Barges in on a specified DAHDI <replaceable>channel</replaceable> or prompts
-			if one is not specified. Returns <literal>-1</literal> when caller user hangs
-			up and is independent of the state of the channel being monitored.
-			</para>
-		</description>
-	</application>
- ***/
-static const char app[] = "DAHDIBarge";
-
-#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 dahdi_confinfo dahdic;
-	struct ast_frame *f;
-	struct ast_channel *c;
-	struct ast_frame fr;
-	int outfd;
-	int ms;
-	int nfds;
-	int res;
-	int flags;
-	int retrydahdi;
-	int origfd;
-	int ret = -1;
-
-	struct dahdi_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_by_id(chan, AST_FORMAT_ULAW) < 0) {
-		ast_log(LOG_WARNING, "Unable to set '%s' to write ulaw mode\n", ast_channel_name(chan));
-		goto outrun;
-	}
-
-	/* Set it into U-law mode (read) */
-	if (ast_set_read_format_by_id(chan, AST_FORMAT_ULAW) < 0) {
-		ast_log(LOG_WARNING, "Unable to set '%s' to read ulaw mode\n", ast_channel_name(chan));
-		goto outrun;
-	}
-	ast_indicate(chan, -1);
-	retrydahdi = strcasecmp(ast_channel_tech(chan)->type, "DAHDI");
-dahdiretry:
-	origfd = ast_channel_fd(chan, 0);
-	if (retrydahdi) {
-		fd = open("/dev/dahdi/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 = DAHDI_POLICY_IMMEDIATE;
-		bi.rxbufpolicy = DAHDI_POLICY_IMMEDIATE;
-		bi.numbufs = 4;
-		if (ioctl(fd, DAHDI_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 = ast_channel_fd(chan, 0);
-		nfds = 0;
-	}
-	memset(&dahdic, 0, sizeof(dahdic));
-	/* Check to see if we're in a conference... */
-	dahdic.chan = 0;	
-	if (ioctl(fd, DAHDI_GETCONF, &dahdic)) {
-		ast_log(LOG_WARNING, "Error getting conference\n");
-		close(fd);
-		goto outrun;
-	}
-	if (dahdic.confmode) {
-		/* Whoa, already in a conference...  Retry... */
-		if (!retrydahdi) {
-			ast_debug(1, "DAHDI channel is in a conference already, retrying with pseudo\n");
-			retrydahdi = 1;
-			goto dahdiretry;
-		}
-	}
-	memset(&dahdic, 0, sizeof(dahdic));
-	/* Add us to the conference */
-	dahdic.chan = 0;	
-	dahdic.confno = confno;
-	dahdic.confmode = DAHDI_CONF_MONITORBOTH;
-
-	if (ioctl(fd, DAHDI_SETCONF, &dahdic)) {
-		ast_log(LOG_WARNING, "Error setting conference\n");
-		close(fd);
-		goto outrun;
-	}
-	ast_debug(1, "Placed channel %s in DAHDI channel %d monitor\n", ast_channel_name(chan), confno);
-
-	for(;;) {
-		outfd = -1;
-		ms = -1;
-		c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
-		if (c) {
-			if (ast_channel_fd(c, 0) != origfd) {
-				if (retrydahdi) {
-					/* Kill old pseudo */
-					close(fd);
-				}
-				ast_debug(1, "Ooh, something swapped out under us, starting over\n");
-				retrydahdi = 0;
-				goto dahdiretry;
-			}
-			f = ast_read(c);
-			if (!f) 
-				break;
-			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass.integer == '#')) {
-				ret = 0;
-				ast_frfree(f);
-				break;
-			} else if (fd != ast_channel_fd(chan, 0)) {
-				if (f->frametype == AST_FRAME_VOICE) {
-					if (f->subclass.format.id == AST_FORMAT_ULAW) {
-						/* Carefully write */
-						careful_write(fd, f->data.ptr, f->datalen);
-					} else
-						ast_log(LOG_WARNING, "Huh?  Got a non-ulaw (%s) frame in the conference\n", ast_getformatname(&f->subclass.format));
-				}
-			}
-			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;
-				ast_format_set(&fr.subclass.format, AST_FORMAT_ULAW, 0);
-				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 != ast_channel_fd(chan, 0))
-		close(fd);
-	else {
-		/* Take out of conference */
-		/* Add us to the conference */
-		dahdic.chan = 0;	
-		dahdic.confno = 0;
-		dahdic.confmode = 0;
-		if (ioctl(fd, DAHDI_SETCONF, &dahdic)) {
-			ast_log(LOG_WARNING, "Error setting conference\n");
-		}
-	}
-
-outrun:
-
-	return ret;
-}
-
-static int conf_exec(struct ast_channel *chan, const char *data)
-{
-	int res = -1;
-	int retrycnt = 0;
-	int confflags = 0;
-	int confno = 0;
-	char confnostr[80] = "";
-	
-	if (!ast_strlen_zero(data)) {
-		if ((sscanf(data, "DAHDI/%30d", &confno) != 1) &&
-		    (sscanf(data, "%30d", &confno) != 1)) {
-			ast_log(LOG_WARNING, "DAHDIBarge Argument (if specified) must be a channel number, not '%s'\n", (char *)data);
-			return 0;
-		}
-	}
-	
-	if (ast_channel_state(chan) != AST_STATE_UP)
-		ast_answer(chan);
-
-	while(!confno && (++retrycnt < 4)) {
-		/* Prompt user for conference number */
-		confnostr[0] = '\0';
-		res = ast_app_getdata(chan, "conf-getchannel",confnostr, sizeof(confnostr) - 1, 0);
-		if (res <0) goto out;
-		if (sscanf(confnostr, "%30d", &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_xml(app, conf_exec)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
-}
-
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on DAHDI channel application");