[Asterisk-code-review] app_ices: Remove deprecated module. (asterisk[19])
Joshua Colp
asteriskteam at digium.com
Mon Aug 16 12:47:11 CDT 2021
Joshua Colp has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/16291 )
Change subject: app_ices: Remove deprecated module.
......................................................................
app_ices: Remove deprecated module.
ASTERISK-29586
Change-Id: I1e0a4535135b00938b609fe0ccba9bbddbac93ad
---
D apps/app_ices.c
A doc/UPGRADE-staging/app_ices_removal.txt
2 files changed, 6 insertions(+), 216 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/91/16291/1
diff --git a/apps/app_ices.c b/apps/app_ices.c
deleted file mode 100644
index 38c68c0..0000000
--- a/apps/app_ices.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * Copyright (C) 1999 - 2005, Digium, Inc.
- *
- * Mark Spencer <markster at digium.com>
- *
- * 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 Stream to an icecast server via ICES (see contrib/asterisk-ices.xml)
- *
- * \author Mark Spencer <markster at digium.com>
- *
- * ICES - http://www.icecast.org/ices.php
- *
- * \ingroup applications
- */
-
-/*** MODULEINFO
- <support_level>deprecated</support_level>
- <deprecated_in>16</deprecated_in>
- <removed_in>19</removed_in>
- ***/
-
-#include "asterisk.h"
-
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/time.h>
-
-#include "asterisk/paths.h" /* use ast_config_AST_CONFIG_DIR */
-#include "asterisk/lock.h"
-#include "asterisk/file.h"
-#include "asterisk/channel.h"
-#include "asterisk/frame.h"
-#include "asterisk/pbx.h"
-#include "asterisk/module.h"
-#include "asterisk/translate.h"
-#include "asterisk/app.h"
-#include "asterisk/format_cache.h"
-
-/*** DOCUMENTATION
- <application name="ICES" language="en_US">
- <synopsis>
- Encode and stream using 'ices'.
- </synopsis>
- <syntax>
- <parameter name="config" required="true">
- <para>ICES configuration file.</para>
- </parameter>
- </syntax>
- <description>
- <para>Streams to an icecast server using ices (available separately).
- A configuration file must be supplied for ices (see contrib/asterisk-ices.xml).</para>
- <note><para>ICES version 2 client and server required.</para></note>
- </description>
- </application>
-
- ***/
-
-#define path_BIN "/usr/bin/"
-#define path_LOCAL "/usr/local/bin/"
-
-static char *app = "ICES";
-
-static int icesencode(char *filename, int fd)
-{
- int res;
-
- res = ast_safe_fork(0);
- if (res < 0)
- ast_log(LOG_WARNING, "Fork failed\n");
- if (res) {
- return res;
- }
-
- if (ast_opt_high_priority)
- ast_set_priority(0);
- dup2(fd, STDIN_FILENO);
- ast_close_fds_above_n(STDERR_FILENO);
-
- /* Most commonly installed in /usr/local/bin
- * But many places has it in /usr/bin
- * As a last-ditch effort, try to use PATH
- */
- execl(path_LOCAL "ices2", "ices", filename, SENTINEL);
- execl(path_BIN "ices2", "ices", filename, SENTINEL);
- execlp("ices2", "ices", filename, SENTINEL);
-
- ast_debug(1, "Couldn't find ices version 2, attempting to use ices version 1.\n");
-
- execl(path_LOCAL "ices", "ices", filename, SENTINEL);
- execl(path_BIN "ices", "ices", filename, SENTINEL);
- execlp("ices", "ices", filename, SENTINEL);
-
- ast_log(LOG_WARNING, "Execute of ices failed, could not find command.\n");
- close(fd);
- _exit(0);
-}
-
-static int ices_exec(struct ast_channel *chan, const char *data)
-{
- int res = 0;
- int fds[2];
- int ms = -1;
- int pid = -1;
- struct ast_format *oreadformat;
- struct ast_frame *f;
- char filename[256]="";
- char *c;
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
- return -1;
- }
-
- if (pipe(fds)) {
- ast_log(LOG_WARNING, "Unable to create pipe\n");
- return -1;
- }
- ast_fd_set_flags(fds[1], O_NONBLOCK);
-
- ast_stopstream(chan);
-
- if (ast_channel_state(chan) != AST_STATE_UP)
- res = ast_answer(chan);
-
- if (res) {
- close(fds[0]);
- close(fds[1]);
- ast_log(LOG_WARNING, "Answer failed!\n");
- return -1;
- }
-
- oreadformat = ao2_bump(ast_channel_readformat(chan));
- res = ast_set_read_format(chan, ast_format_slin);
- if (res < 0) {
- close(fds[0]);
- close(fds[1]);
- ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
- ao2_cleanup(oreadformat);
- return -1;
- }
- if (((char *)data)[0] == '/')
- ast_copy_string(filename, (char *) data, sizeof(filename));
- else
- snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_CONFIG_DIR, (char *)data);
- /* Placeholder for options */
- c = strchr(filename, '|');
- if (c)
- *c = '\0';
- res = icesencode(filename, fds[0]);
- if (res >= 0) {
- pid = res;
- for (;;) {
- /* Wait for audio, and stream */
- ms = ast_waitfor(chan, -1);
- if (ms < 0) {
- ast_debug(1, "Hangup detected\n");
- res = -1;
- break;
- }
- f = ast_read(chan);
- if (!f) {
- ast_debug(1, "Null frame == hangup() detected\n");
- res = -1;
- break;
- }
- if (f->frametype == AST_FRAME_VOICE) {
- res = write(fds[1], f->data.ptr, f->datalen);
- if (res < 0) {
- if (errno != EAGAIN) {
- ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno));
- res = -1;
- ast_frfree(f);
- break;
- }
- }
- }
- ast_frfree(f);
- }
- }
- close(fds[0]);
- close(fds[1]);
-
- if (pid > -1)
- kill(pid, SIGKILL);
- if (!res && oreadformat)
- ast_set_read_format(chan, oreadformat);
- ao2_cleanup(oreadformat);
-
- return res;
-}
-
-static int unload_module(void)
-{
- return ast_unregister_application(app);
-}
-
-static int load_module(void)
-{
- return ast_register_application_xml(app, ices_exec);
-}
-
-AST_MODULE_INFO_STANDARD_DEPRECATED(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
diff --git a/doc/UPGRADE-staging/app_ices_removal.txt b/doc/UPGRADE-staging/app_ices_removal.txt
new file mode 100644
index 0000000..79ab27b
--- /dev/null
+++ b/doc/UPGRADE-staging/app_ices_removal.txt
@@ -0,0 +1,6 @@
+Subject: app_ices
+Master-Only: True
+
+This module was deprecated in Asterisk 16
+and is now being removed in accordance with
+the Asterisk Module Deprecation policy.
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16291
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 19
Gerrit-Change-Id: I1e0a4535135b00938b609fe0ccba9bbddbac93ad
Gerrit-Change-Number: 16291
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210816/8089d2e9/attachment-0001.html>
More information about the asterisk-code-review
mailing list