main/cdrs: Preserve context/extension when executing a Macro or GoSub
[asterisk/asterisk.git] / apps / app_echo.c
old mode 100755 (executable)
new mode 100644 (file)
index 7690209..d8b2079
@@ -1,98 +1,97 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
- * Echo application -- play back what you hear to evaluate latency
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@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
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <pthread.h>
-
+/*! \file
+ *
+ * \brief Echo application -- play back what you hear to evaluate latency
+ *
+ * \author Mark Spencer <markster@digium.com>
+ *
+ * \ingroup applications
+ */
 
-static char *tdesc = "Simple Echo Application";
+/*** MODULEINFO
+       <support_level>core</support_level>
+ ***/
 
-static char *app = "Echo";
+#include "asterisk.h"
 
-static char *synopsis = "Echo audio read back to the user";
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-static char *descrip = 
-"  Echo():  Echo audio read from channel back to the channel. Returns 0\n"
-"if the user exits with the '#' key, or -1 if the user hangs up.\n";
+#include "asterisk/file.h"
+#include "asterisk/module.h"
+#include "asterisk/channel.h"
 
-STANDARD_LOCAL_USER;
+/*** DOCUMENTATION
+       <application name="Echo" language="en_US">
+               <synopsis>
+                       Echo media, DTMF back to the calling party
+               </synopsis>
+               <syntax />
+               <description>
+                       <para>Echos back any media or DTMF frames read from the calling 
+                       channel back to itself. This will not echo CONTROL, MODEM, or NULL
+                       frames. Note: If '#' detected application exits.</para>
+                       <para>This application does not automatically answer and should be
+                       preceeded by an application such as Answer() or Progress().</para>
+               </description>
+       </application>
+ ***/
 
-LOCAL_USER_DECL;
+static const char app[] = "Echo";
 
-static int echo_exec(struct ast_channel *chan, void *data)
+static int echo_exec(struct ast_channel *chan, const char *data)
 {
-       int res=-1;
-       struct localuser *u;
-       struct ast_frame *f;
-       LOCAL_USER_ADD(u);
-       ast_set_write_format(chan, ast_best_codec(chan->nativeformats));
-       ast_set_read_format(chan, ast_best_codec(chan->nativeformats));
-       /* Do our thing here */
-       while(ast_waitfor(chan, -1) > -1) {
-               f = ast_read(chan);
-               if (!f)
+       int res = -1;
+
+       while (ast_waitfor(chan, -1) > -1) {
+               struct ast_frame *f = ast_read(chan);
+               if (!f) {
                        break;
-               if (f->frametype == AST_FRAME_VOICE) {
-                       if (ast_write(chan, f)) 
-                               break;
-               } else if (f->frametype == AST_FRAME_DTMF) {
-                       if (f->subclass == '#') {
-                               res = 0;
-                               break;
-                       } else
-                               if (ast_write(chan, f))
-                                       break;
+               }
+               f->delivery.tv_sec = 0;
+               f->delivery.tv_usec = 0;
+               if (f->frametype != AST_FRAME_CONTROL
+                       && f->frametype != AST_FRAME_MODEM
+                       && f->frametype != AST_FRAME_NULL
+                       && ast_write(chan, f)) {
+                       ast_frfree(f);
+                       goto end;
+               }
+               if ((f->frametype == AST_FRAME_DTMF) && (f->subclass.integer == '#')) {
+                       res = 0;
+                       ast_frfree(f);
+                       goto end;
                }
                ast_frfree(f);
        }
-       LOCAL_USER_REMOVE(u);
+end:
        return res;
 }
 
-int unload_module(void)
+static int unload_module(void)
 {
-       STANDARD_HANGUP_LOCALUSERS;
        return ast_unregister_application(app);
 }
 
-int load_module(void)
+static int load_module(void)
 {
-       return ast_register_application(app, echo_exec, synopsis, descrip);
+       return ast_register_application_xml(app, echo_exec);
 }
 
-char *description(void)
-{
-       return tdesc;
-}
-
-int usecount(void)
-{
-       int res;
-       STANDARD_USECOUNT(res);
-       return res;
-}
-
-char *key()
-{
-       return ASTERISK_GPL_KEY;
-}
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Echo Application");