diff --git a/build/modules.conf.in b/build/modules.conf.in
index 7520cb1221..a90e7bd068 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -4,6 +4,7 @@ applications/mod_commands
applications/mod_conference
applications/mod_dptools
applications/mod_enum
+applications/mode_fifo
#applications/mod_ivrtest
#applications/mod_soundtouch
#applications/mod_rss
@@ -54,4 +55,3 @@ timers/mod_softtimer
#xml_int/mod_xml_curl
#xml_int/mod_xml_cdr
say/mod_say_en
-
diff --git a/conf/modules.conf.xml b/conf/modules.conf.xml
index b0e3fd2389..cf62367522 100644
--- a/conf/modules.conf.xml
+++ b/conf/modules.conf.xml
@@ -36,6 +36,7 @@
+
diff --git a/src/mod/applications/mod_fifo/Makefile b/src/mod/applications/mod_fifo/Makefile
new file mode 100644
index 0000000000..c6d645e6aa
--- /dev/null
+++ b/src/mod/applications/mod_fifo/Makefile
@@ -0,0 +1,2 @@
+BASE=../../../..
+include /usr/src/freeswitch.trunk/build/modmake.rules
diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
new file mode 100644
index 0000000000..1a8ed38790
--- /dev/null
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -0,0 +1,197 @@
+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005/2006, Anthony Minessale II
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Anthony Minessale II
+ * Neal Horman
+ *
+ *
+ * mod_fifo.c -- FIFO
+ *
+ */
+#include
+
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fifo_shutdown);
+SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load);
+SWITCH_MODULE_DEFINITION(mod_fifo, mod_fifo_load, mod_fifo_shutdown, NULL);
+
+static struct {
+ switch_hash_t *fifo_hash;
+ switch_memory_pool_t *pool;
+} globals;
+
+#define FIFO_DESC "Fifo for stacking parked calls."
+#define FIFO_USAGE " [in | out [nowait]]"
+SWITCH_STANDARD_APP(fifo_function)
+{
+ int argc;
+ char *mydata = NULL, *argv[4] = { 0 };
+ switch_queue_t *fifo;
+ switch_channel_t *channel;
+ int nowait = 0;
+
+ if (switch_strlen_zero(data)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Args\n");
+ return;
+ }
+
+ mydata = switch_core_session_strdup(session, data);
+ assert(mydata);
+ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+ return;
+ }
+
+ if (!(fifo = switch_core_hash_find(globals.fifo_hash, argv[0]))) {
+ switch_queue_create(&fifo, SWITCH_CORE_QUEUE_LEN, globals.pool);
+ assert(fifo);
+ switch_core_hash_insert(globals.fifo_hash, argv[0], fifo);
+ }
+
+ channel = switch_core_session_get_channel(session);
+
+
+ if (argc > 2) {
+ nowait = !strcasecmp(argv[2], "nowait");
+ }
+
+ if (!strcasecmp(argv[1], "in")) {
+ char *uuid = strdup(switch_core_session_get_uuid(session));
+ char *moh = NULL;
+
+ switch_channel_answer(channel);
+
+ moh = switch_channel_get_variable(channel, "fifo_music");
+
+ if (argc > 2) {
+ moh = argv[2];
+ }
+
+ if (moh) {
+ switch_ivr_broadcast(uuid, moh, SMF_LOOP | SMF_ECHO_ALEG);
+ }
+
+ switch_queue_push(fifo, uuid);
+ switch_ivr_park(session, NULL);
+ return;
+ } else if (!strcasecmp(argv[1], "out")) {
+ void *pop;
+ switch_frame_t *read_frame;
+ switch_status_t status;
+ char *uuid;
+ int done = 0;
+ switch_core_session_t *other_session;
+
+ if (!nowait) {
+ switch_channel_answer(channel);
+ }
+
+ for (;;) {
+ if (switch_queue_trypop(fifo, &pop) != SWITCH_STATUS_SUCCESS) {
+ if (nowait) {
+ return;
+ }
+ status = switch_core_session_read_frame(session, &read_frame, -1, 0);
+ if (!SWITCH_READ_ACCEPTABLE(status)) {
+ return;
+ }
+ continue;
+ }
+ if (!pop) {
+ return;
+ }
+
+ uuid = (char *) pop;
+
+ if ((other_session = switch_core_session_locate(uuid))) {
+ switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
+ switch_channel_clear_flag(other_channel, CF_CONTROLLED);
+ switch_channel_clear_flag(other_channel, CF_BROADCAST);
+ switch_channel_set_flag(other_channel, CF_BREAK);
+ switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK);
+ switch_ivr_multi_threaded_bridge(session, other_session, NULL, NULL, NULL);
+ switch_core_session_rwunlock(other_session);
+ done = 1;
+ }
+
+ switch_safe_free(uuid);
+
+ if (done) {
+ break;
+ }
+ }
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "USAGE %s\n", FIFO_USAGE);
+ }
+
+}
+
+SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load)
+{
+ switch_application_interface_t *app_interface;
+
+ switch_core_new_memory_pool(&globals.pool);
+ switch_core_hash_init(&globals.fifo_hash, globals.pool);
+
+ /* connect my internal structure to the blank pointer passed to me */
+ *module_interface = switch_loadable_module_create_module_interface(pool, modname);
+ SWITCH_ADD_APP(app_interface, "fifo", "Park with FIFO", FIFO_DESC, fifo_function, FIFO_USAGE, SAF_NONE);
+
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+/*
+ Called when the system shuts down
+*/
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_fifo_shutdown)
+{
+ switch_hash_index_t *hi;
+ void *val, *pop;
+ switch_queue_t *fifo;
+
+ /* Cleanup*/
+ for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) {
+ switch_hash_this(hi, NULL, NULL, &val);
+ fifo = (switch_queue_t *) val;
+ while (switch_queue_trypop(fifo, &pop) == SWITCH_STATUS_SUCCESS) {
+ free(pop);
+ }
+ }
+ switch_core_hash_destroy(&globals.fifo_hash);
+ switch_core_destroy_memory_pool(&globals.pool);
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:nil
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab:
+ */