The assertion that peer was not found on final event
[asterisk/asterisk.git] / apps / app_ices.c
index fe900ef..d0fdf5c 100644 (file)
  *
  * \author Mark Spencer <markster@digium.com>
  * 
- * \extref ICES - http://www.icecast.org/ices.php
+ * ICES - http://www.icecast.org/ices.php
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+       <support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <string.h>
-#include <stdio.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
-#include <errno.h>
 
+#include "asterisk/paths.h"    /* use ast_config_AST_CONFIG_DIR */
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/frame.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/translate.h"
-#include "asterisk/options.h"
-
-#define ICES "/usr/bin/ices"
-#define LOCAL_ICES "/usr/local/bin/ices"
+#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 char *synopsis = "Encode and stream using 'ices'";
-
-static char *descrip = 
-"  ICES(config.xml) Streams to an icecast server using ices\n"
-"(available separately).  A configuration file must be supplied\n"
-"for ices (see examples/asterisk-ices.conf). \n";
-
-
 static int icesencode(char *filename, int fd)
 {
        int res;
-       int x;
-       sigset_t fullset, oldset;
 
-       sigfillset(&fullset);
-       pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
-
-       res = fork();
+       res = ast_safe_fork(0);
        if (res < 0) 
                ast_log(LOG_WARNING, "Fork failed\n");
        if (res) {
-               pthread_sigmask(SIG_SETMASK, &oldset, NULL);
                return res;
        }
 
-       /* Stop ignoring PIPE */
-       signal(SIGPIPE, SIG_DFL);
-       pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
-
        if (ast_opt_high_priority)
                ast_set_priority(0);
        dup2(fd, STDIN_FILENO);
-       for (x=STDERR_FILENO + 1;x<1024;x++) {
-               if ((x != STDIN_FILENO) && (x != STDOUT_FILENO))
-                       close(x);
-       }
-       /* Most commonly installed in /usr/local/bin */
-       execl(ICES, "ices", filename, (char *)NULL);
-       /* But many places has it in /usr/bin */
-       execl(LOCAL_ICES, "ices", filename, (char *)NULL);
-       /* As a last-ditch effort, try to use PATH */
-       execlp("ices", "ices", filename, (char *)NULL);
-       ast_log(LOG_WARNING, "Execute of ices failed\n");
+       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, void *data)
+static int ices_exec(struct ast_channel *chan, const char *data)
 {
        int res = 0;
        int fds[2];
        int ms = -1;
        int pid = -1;
        int flags;
-       int oreadformat;
-       struct timeval last;
+       struct ast_format *oreadformat;
        struct ast_frame *f;
        char filename[256]="";
        char *c;
@@ -119,8 +126,6 @@ static int ices_exec(struct ast_channel *chan, void *data)
                return -1;
        }
        
-       last = ast_tv(0, 0);
-       
        if (pipe(fds)) {
                ast_log(LOG_WARNING, "Unable to create pipe\n");
                return -1;
@@ -130,7 +135,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
        
        ast_stopstream(chan);
 
-       if (chan->_state != AST_STATE_UP)
+       if (ast_channel_state(chan) != AST_STATE_UP)
                res = ast_answer(chan);
                
        if (res) {
@@ -140,24 +145,24 @@ static int ices_exec(struct ast_channel *chan, void *data)
                return -1;
        }
 
-       oreadformat = chan->readformat;
-       res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
+       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", (char *)ast_config_AST_CONFIG_DIR, (char *)data);
+               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]);
-       close(fds[0]);
        if (res >= 0) {
                pid = res;
                for (;;) {
@@ -175,7 +180,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
                                break;
                        }
                        if (f->frametype == AST_FRAME_VOICE) {
-                               res = write(fds[1], f->data, f->datalen);
+                               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));
@@ -188,12 +193,14 @@ static int ices_exec(struct ast_channel *chan, void *data)
                        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;
 }
@@ -205,7 +212,8 @@ static int unload_module(void)
 
 static int load_module(void)
 {
-       return ast_register_application(app, ices_exec, synopsis, descrip);
+       return ast_register_application_xml(app, ices_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
+AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Encode and Stream via icecast and ices");
+