- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7875 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: brian Date: Wed Mar 12 01:19:57 2008 New Revision: 7875 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: woops thanks mikey :) Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Mar 12 01:19:57 2008 @@ -382,7 +382,7 @@ <action application="sleep" data="1000"/> <action application="send_display" data="Secure Music On Hold "/> <action application="gentones" data="${bong-ring}"/> - <anti-actin application="eval" data="not_secure"/> + <anti-action application="eval" data="not_secure"/> </condition> </extension>

1 0

[commit] r7874 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: brian Date: Wed Mar 12 01:18:30 2008 New Revision: 7874 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak, and yes this works too ;) Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Mar 12 01:18:30 2008 @@ -142,7 +142,7 @@ <extension name="cf"> <condition field="destination_number" expression="^cf$"> <action application="answer"/> - <action application="transfer" data="-both 3000"/> + <action application="transfer" data="-both 30${dialed_extension:2}"/> </condition> </extension>

1 0

[commit] r7873 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: brian Date: Wed Mar 12 01:14:48 2008 New Revision: 7873 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: more fun stuff *1, Transfer, *2, Record and *3 transfer to conference. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Mar 12 01:14:48 2008 @@ -119,6 +119,33 @@ </condition> </extension> +  + <extension name="dx"> + <condition field="destination_number" expression="^dx$"> + <action application="answer"/> + <action application="read" data="11 11 'tone_stream://%(10000,0,350,440)' digits 5000 #"/> +  + <action application="execute_extension" data="is_transfer XML default"/> + </condition> + </extension> + + <extension name="is_transfer"> + <condition field="destination_number" expression="^is_transfer$"/> + <condition field="${digits}" expression="^(\d+)$"> + <action application="transfer" data="-bleg ${digits}"/> + <anti-action application="eval" data="w00t"/> + </condition> + </extension> + + +  + <extension name="cf"> + <condition field="destination_number" expression="^cf$"> + <action application="answer"/> + <action application="transfer" data="-both 3000"/> + </condition> + </extension> + <!-- if the calling party is the called party, go to their VM if the calling party is NOT the called party dial the extension @@ -135,6 +162,9 @@ <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> + <anti-action application="bind_meta_app" data="1 a a execute_extension::dx"/> + <anti-action application="bind_meta_app" data="2 a a record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> + <anti-action application="bind_meta_app" data="3 a a execute_extension::cf"/> <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> @@ -352,6 +382,7 @@ <action application="sleep" data="1000"/> <action application="send_display" data="Secure Music On Hold "/> <action application="gentones" data="${bong-ring}"/> + <anti-actin application="eval" data="not_secure"/> </condition> </extension>

1 0

[commit] r7872 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: anthm Date: Tue Mar 11 21:25:05 2008 New Revision: 7872 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: update Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Tue Mar 11 21:25:05 2008 @@ -121,6 +121,7 @@ } switch_caller_extension_add_application(session, *extension, application, data); + proceed = 1; } if (do_break_i == BREAK_ON_FALSE || do_break_i == BREAK_ALWAYS) { @@ -264,7 +265,7 @@ proceed = parse_exten(session, caller_profile, xexten, &extension); - if (proceed && !switch_true(cont)) { + if (proceed && !switch_true(cont)) { break; }

1 0

[commit] r7871 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: anthm Date: Tue Mar 11 20:30:52 2008 New Revision: 7871 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 11 20:30:52 2008 @@ -205,10 +205,15 @@ int argc; char *argv[4] = { 0 }; char *mydata; + int bleg = 0, both = 0; + if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { - if (!strcasecmp(argv[0], "-bleg")) { + bleg = !strcasecmp(argv[0], "-bleg"); + both = !strcasecmp(argv[0], "-both"); + + if (bleg || both) { const char *uuid; switch_channel_t *channel = switch_core_session_get_channel(session); if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { @@ -218,6 +223,9 @@ switch_core_session_rwunlock(b_session); } } + if (both) { + switch_ivr_session_transfer(session, argv[1], argv[2], argv[3]); + } } else { switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Mar 11 20:30:52 2008 @@ -314,8 +314,9 @@ if (!(stream = switch_channel_get_variable_partner(channel, SWITCH_HOLD_MUSIC_VARIABLE))) { stream = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE); } + if (stream) { - switch_ivr_broadcast(b_uuid, hold_bleg, SMF_ECHO_ALEG | SMF_LOOP); + switch_ivr_broadcast(b_uuid, stream, SMF_ECHO_ALEG | SMF_LOOP); } else { b_uuid = NULL; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 11 20:30:52 2008 @@ -1842,7 +1842,7 @@ if ((flags & SMF_HOLD_BLEG)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hold-bleg", "%s", "true"); } - + switch_core_session_queue_private_event(other_session, &event); } @@ -1861,6 +1861,10 @@ if ((flags & SMF_LOOP)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } + if ((flags & SMF_HOLD_BLEG)) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hold-bleg", "%s", "true"); + } + switch_core_session_queue_private_event(session, &event); } master = session;

1 0

[commit] r7870 - in freeswitch/trunk/src: . include
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: anthm Date: Tue Mar 11 20:11:33 2008 New Revision: 7870 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Mar 11 20:11:33 2008 @@ -245,7 +245,8 @@ SMF_ECHO_ALEG = (1 << 1), SMF_ECHO_BLEG = (1 << 2), SMF_FORCE = (1 << 3), - SMF_LOOP = (1 << 4) + SMF_LOOP = (1 << 4), + SMF_HOLD_BLEG = (1 << 5) } switch_media_flag_t; typedef enum { Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Mar 11 20:11:33 2008 @@ -291,6 +291,7 @@ char *app_name = switch_event_get_header(event, "execute-app-name"); char *app_arg = switch_event_get_header(event, "execute-app-arg"); char *loop_h = switch_event_get_header(event, "loops"); + char *hold_bleg = switch_event_get_header(event, "hold-bleg"); int loops = 1; if (loop_h) { @@ -301,8 +302,25 @@ if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { int x; + const char *b_uuid = NULL; + switch_core_session_t *b_session = NULL; + switch_channel_clear_flag(channel, CF_STOP_BROADCAST); switch_channel_set_flag(channel, CF_BROADCAST); + if (hold_bleg && switch_true(hold_bleg)) { + if ((b_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + const char *stream; + + if (!(stream = switch_channel_get_variable_partner(channel, SWITCH_HOLD_MUSIC_VARIABLE))) { + stream = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE); + } + if (stream) { + switch_ivr_broadcast(b_uuid, hold_bleg, SMF_ECHO_ALEG | SMF_LOOP); + } else { + b_uuid = NULL; + } + } + } for (x = 0; x < loops || loops < 0; x++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Command Execute %s(%s)\n", switch_channel_get_name(channel), app_name, app_arg); @@ -311,6 +329,14 @@ break; } } + if (b_uuid) { + if ((b_session = switch_core_session_locate(b_uuid))) { + switch_channel_t *b_channel = switch_core_session_get_channel(b_session); + switch_channel_stop_broadcast(b_channel); + switch_channel_wait_for_flag(b_channel, CF_BROADCAST, SWITCH_FALSE, 5000); + switch_core_session_rwunlock(b_session); + } + } switch_channel_clear_flag(channel, CF_BROADCAST); } } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 11 20:11:33 2008 @@ -1353,6 +1353,7 @@ if (!switch_strlen_zero(app)) { md->map[key].app = switch_core_session_strdup(session, app); md->map[key].flags = exec_b ? SMF_ECHO_BLEG : SMF_ECHO_ALEG; + md->map[key].flags |= SMF_HOLD_BLEG; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound: %d %s\n", key, app); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound: %d\n", key); @@ -1838,6 +1839,9 @@ if ((flags & SMF_LOOP)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1); } + if ((flags & SMF_HOLD_BLEG)) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "hold-bleg", "%s", "true"); + } switch_core_session_queue_private_event(other_session, &event); }

1 0

[commit] r7869 - freeswitch/trunk/src
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 19:49:06 2008 New Revision: 7869 Modified: freeswitch/trunk/src/switch_channel.c Log: update Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 11 19:49:06 2008 @@ -1561,6 +1561,10 @@ char *func_val = NULL; int nv = 0; + if (switch_strlen_zero(in)) { + return (char *)in; + } + q = in; while(q && *q) { if (!(p = strchr(q, '$'))) {

1 0

[commit] r7868 - freeswitch/trunk/src/mod/endpoints/mod_alsa
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 19:39:46 2008 New Revision: 7868 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Tue Mar 11 19:39:46 2008 @@ -637,7 +637,7 @@ globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; - switch_core_timer_check(&globals.timer); + switch_core_timer_check(&globals.timer, SWITCH_TRUE); globals.read_frame.timestamp = globals.timer.samplecount; *frame = &globals.read_frame;

1 0

[commit] r7867 - freeswitch/trunk/src
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 18:41:49 2008 New Revision: 7867 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: update Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 11 18:41:49 2008 @@ -692,8 +692,7 @@ uint8_t channels = read_codec->implementation->number_of_channels; if ((bug = switch_channel_get_private(channel, file))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n"); - return SWITCH_STATUS_FALSE; + return switch_ivr_stop_record_session(session, file); } if (!fh) {

1 0

[commit] r7866 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: anthm Date: Tue Mar 11 18:19:17 2008 New Revision: 7866 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c Log: death star will be in firing range in 10 minutes Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Mar 11 18:19:17 2008 @@ -747,7 +747,8 @@ uint32_t timeout, const char *valid_terminators); -SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, const char *app); +SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, + switch_bool_t dial_b, switch_bool_t exec_b, const char *app); SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 11 18:19:17 2008 @@ -79,19 +79,20 @@ } } -#define BIND_SYNTAX "<key> <app>" +#define BIND_SYNTAX "<key> [a|b] [a|b] <app>" SWITCH_STANDARD_APP(dtmf_bind_function) { - char *argv[2] = { 0 }; + char *argv[4] = { 0 }; int argc; char *lbuf = NULL; if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) - && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 2) { + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { int kval = atoi(argv[0]); - if (switch_ivr_bind_dtmf_meta_session(session, kval, argv[1]) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound: %s %s\n", argv[0], argv[1]); - } else { + char a1 = tolower(*argv[1]); + char a2 = tolower(*argv[2]); + + if (switch_ivr_bind_dtmf_meta_session(session, kval, a1 == 'b', a2 == 'b', argv[3]) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error!\n"); } } else { @@ -207,7 +208,19 @@ if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 1) { - switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + if (!strcasecmp(argv[0], "-bleg")) { + const char *uuid; + switch_channel_t *channel = switch_core_session_get_channel(session); + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + switch_core_session_t *b_session; + if ((b_session = switch_core_session_locate(uuid))) { + switch_ivr_session_transfer(b_session, argv[1], argv[2], argv[3]); + switch_core_session_rwunlock(b_session); + } + } + } else { + switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No extension specified.\n"); } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 11 18:19:17 2008 @@ -1260,6 +1260,7 @@ typedef struct { const char *app; + uint32_t flags; } dtmf_meta_app_t; typedef struct { @@ -1307,7 +1308,7 @@ if (md->map[dval].app) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Processing meta digit '%c' [%s]\n", switch_channel_get_name(channel), dtmf->digit, md->map[dval].app); - switch_ivr_broadcast(switch_core_session_get_uuid(session), md->map[dval].app, SMF_ECHO_ALEG); + switch_ivr_broadcast(switch_core_session_get_uuid(session), md->map[dval].app, md->map[dval].flags); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Ignoring meta digit '%c' not mapped\n", switch_channel_get_name(channel), dtmf->digit); @@ -1329,7 +1330,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, const char *app) +SWITCH_DECLARE(switch_status_t) switch_ivr_bind_dtmf_meta_session(switch_core_session_t *session, uint32_t key, + switch_bool_t dial_b, switch_bool_t exec_b, const char *app) { switch_channel_t *channel = switch_core_session_get_channel(session); dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY); @@ -1342,12 +1344,19 @@ if (!md) { md = switch_core_session_alloc(session, sizeof(*md)); switch_channel_set_private(channel, SWITCH_META_VAR_KEY, md); - switch_core_event_hook_add_recv_dtmf(session, meta_on_dtmf); + if (dial_b) { + switch_core_event_hook_add_send_dtmf(session, meta_on_dtmf); + } else { + switch_core_event_hook_add_recv_dtmf(session, meta_on_dtmf); + } } if (!switch_strlen_zero(app)) { md->map[key].app = switch_core_session_strdup(session, app); + md->map[key].flags = exec_b ? SMF_ECHO_BLEG : SMF_ECHO_ALEG; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound: %d %s\n", key, app); } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound: %d\n", key); md->map[key].app = NULL; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Tue Mar 11 18:19:17 2008 @@ -137,7 +137,7 @@ break; } - if (switch_channel_test_flag(chan_a, CF_TRANSFER)) { + if (switch_channel_test_flag(chan_a, CF_TRANSFER) || switch_channel_test_flag(chan_b, CF_TRANSFER)) { switch_channel_clear_flag(chan_a, CF_HOLD); switch_channel_clear_flag(chan_a, CF_SUSPEND); break;

1 0