March 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7880 - freeswitch/trunk/build
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: anthm Date: Wed Mar 12 09:43:52 2008 New Revision: 7880 Modified: freeswitch/trunk/build/turbo_build.sh Log: update Modified: freeswitch/trunk/build/turbo_build.sh ============================================================================== --- freeswitch/trunk/build/turbo_build.sh (original) +++ freeswitch/trunk/build/turbo_build.sh Wed Mar 12 09:43:52 2008 @@ -5,6 +5,7 @@ fi if [ -z $arg ] ; then + $MAKE clean $MAKE -j freeswitch MODS=`cat modules.conf | grep -v \#` for i in $MODS ; do

1 0

[commit] r7879 - freeswitch/trunk/src
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: anthm Date: Wed Mar 12 09:41:30 2008 New Revision: 7879 Modified: freeswitch/trunk/src/switch_rtp.c Log: sync Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 12 09:41:30 2008 @@ -1141,8 +1141,13 @@ if (bytes) { check++; switch_core_timer_sync(&rtp_session->timer); + } else { + check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS); } - check = (uint8_t) (switch_core_timer_check(&rtp_session->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS); + } + + if (check) { + do_2833(rtp_session); } if (bytes && rtp_session->recv_msg.header.version != 2) { @@ -1303,8 +1308,7 @@ } } - if (check) { - do_2833(rtp_session); + if (check || (bytes && !rtp_session->timer.interval)) { if (!bytes && rtp_session->max_missed_packets) { if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { ret = -2; @@ -1401,10 +1405,6 @@ *flags |= SFF_CNG; } - if (bytes > 0) { - do_2833(rtp_session); - } - ret = (int) bytes; } else { ret = -1;

1 0

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

12 Mar '08

Author: mikej Date: Wed Mar 12 03:48:38 2008 New Revision: 7878 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core_state_machine.c Log: add api_hangup_hook Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Mar 12 03:48:38 2008 @@ -102,6 +102,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_API_HANGUP_HOOK_VARIABLE "api_hangup_hook" #define SWITCH_PROCESS_CDR_VARIABLE "process_cdr" #define SWITCH_BRIDGE_CHANNEL_VARIABLE "bridge_channel" #define SWITCH_CHANNEL_NAME_VARIABLE "channel_name" Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Wed Mar 12 03:48:38 2008 @@ -412,6 +412,7 @@ case CS_HANGUP: /* Deactivate and end the thread */ { const char *var = switch_channel_get_variable(session->channel, SWITCH_PROCESS_CDR_VARIABLE); + const char *hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); if (!switch_strlen_zero(var)) { if (!strcasecmp(var, "a_only")) { @@ -429,6 +430,19 @@ switch_core_session_signal_lock(session); STATE_MACRO(hangup, "HANGUP"); switch_core_session_signal_unlock(session); + + if (!switch_strlen_zero(hook_var)) { + switch_stream_handle_t stream = { 0 }; + char *cmd = switch_core_session_strdup(session, hook_var); + char *arg = NULL; + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + } + SWITCH_STANDARD_STREAM(stream); + switch_api_execute(cmd, arg, session, &stream); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, arg, switch_str_nil((char *) stream.data)); + switch_safe_free(stream.data); + } } goto done; case CS_INIT: /* Basic setup tasks */

1 0

[commit] r7877 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: mikej Date: Wed Mar 12 03:03:11 2008 New Revision: 7877 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: let session.ready property work without throwing exception after a failed originate Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Mar 12 03:03:11 2008 @@ -1969,9 +1969,7 @@ { struct js_session *jss = JS_GetPrivate(cx, obj); - METHOD_SANITY_CHECK(); - - *rval = BOOLEAN_TO_JSVAL(switch_channel_ready(switch_core_session_get_channel(jss->session)) ? JS_TRUE : JS_FALSE); + *rval = BOOLEAN_TO_JSVAL((jss && jss->session && switch_channel_ready(switch_core_session_get_channel(jss->session))) ? JS_TRUE : JS_FALSE); return JS_TRUE; }

1 0

[commit] r7876 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 12 Mar '08

12 Mar '08

Author: mikej Date: Wed Mar 12 02:59:09 2008 New Revision: 7876 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: msvc build tweak 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 Wed Mar 12 02:59:09 2008 @@ -89,8 +89,8 @@ if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) { int kval = atoi(argv[0]); - char a1 = tolower(*argv[1]); - char a2 = tolower(*argv[2]); + char a1 = (char)tolower(*argv[1]); + char a2 = (char)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");

1 0

[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