March 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

11 Mar '08

Author: anthm Date: Tue Mar 11 17:32:56 2008 New Revision: 7865 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Log: update 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 17:32:56 2008 @@ -747,6 +747,10 @@ 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_unbind_dtmf_meta_session(switch_core_session_t *session); + + /** @} */ SWITCH_END_EXTERN_C 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 17:32:56 2008 @@ -79,6 +79,26 @@ } } +#define BIND_SYNTAX "<key> <app>" +SWITCH_STANDARD_APP(dtmf_bind_function) +{ + char *argv[2] = { 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) { + 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 { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bind Error!\n"); + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", BIND_SYNTAX); + } +} + #define INTERCEPT_SYNTAX "<uuid>" SWITCH_STANDARD_APP(intercept_function) { @@ -1609,6 +1629,7 @@ SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "bind_meta_app", "Bind a key to an application", "Bind a key to an application", dtmf_bind_function, BIND_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "intercept", "intercept", "intercept", intercept_function, INTERCEPT_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "eavesdrop", "eavesdrop on a uuid", "eavesdrop on a uuid", eavesdrop_function, eavesdrop_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "three_way", "three way call with a uuid", "three way call with a uuid", three_way_function, eavesdrop_SYNTAX, SAF_NONE); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 11 17:32:56 2008 @@ -1913,15 +1913,17 @@ switch_time_t uduration = 0, legbillusec = 0, billusec = 0; time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; + if (!(caller_profile = switch_channel_get_caller_profile(channel))) { + return SWITCH_STATUS_FALSE; + } - caller_profile = switch_channel_get_caller_profile(channel); if (!(ocp = switch_channel_get_originatee_caller_profile(channel))) { ocp = switch_channel_get_originator_caller_profile(channel); } if (!switch_strlen_zero(caller_profile->caller_id_name)) { cid_buf = switch_core_session_sprintf(channel->session, "\"%s\" <%s>", caller_profile->caller_id_name, - switch_str_nil(caller_profile->caller_id_number)); + switch_str_nil(caller_profile->caller_id_number)); } else { cid_buf = caller_profile->caller_id_number; } 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 17:32:56 2008 @@ -1258,6 +1258,104 @@ return SWITCH_STATUS_SUCCESS; } +typedef struct { + const char *app; +} dtmf_meta_app_t; + +typedef struct { + dtmf_meta_app_t map[10]; + time_t last_digit; + switch_bool_t meta_on; +} dtmf_meta_data_t; + +#define SWITCH_META_VAR_KEY "__dtmf_meta" + +static switch_status_t meta_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY); + time_t now = switch_timestamp(NULL); + char digit[2] = ""; + int dval; + + if (!md) { + return SWITCH_STATUS_SUCCESS; + } + + if (md->meta_on && now - md->last_digit > 5) { + md->meta_on = SWITCH_FALSE; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Meta digit timeout parsing %c\n", switch_channel_get_name(channel), dtmf->digit); + return SWITCH_STATUS_SUCCESS; + } + + md->last_digit = now; + + if (dtmf->digit == '*') { + if (md->meta_on) { + md->meta_on = SWITCH_FALSE; + return SWITCH_STATUS_SUCCESS; + } else { + md->meta_on = SWITCH_TRUE; + return SWITCH_STATUS_FALSE; + } + } + + if (md->meta_on) { + if (dtmf->digit >= '0' && dtmf->digit <= '9') { + *digit = dtmf->digit; + dval = atoi(digit); + 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); + } 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); + + } + } + md->meta_on = SWITCH_FALSE; + return SWITCH_STATUS_FALSE; + } + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_unbind_dtmf_meta_session(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_private(channel, SWITCH_META_VAR_KEY, NULL); + + 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_channel_t *channel = switch_core_session_get_channel(session); + dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY); + + if (key > 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid key %u\n", key); + return SWITCH_STATUS_FALSE; + } + + 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 (!switch_strlen_zero(app)) { + md->map[key].app = switch_core_session_strdup(session, app); + } else { + md->map[key].app = NULL; + } + + return SWITCH_STATUS_SUCCESS; +} + + + struct speech_thread_handle { switch_core_session_t *session; switch_asr_handle_t *ah;

1 0

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

11 Mar '08

Author: anthm Date: Tue Mar 11 17:15:34 2008 New Revision: 7864 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Mar 11 17:15:34 2008 @@ -2515,8 +2515,8 @@ tech_pvt->key = switch_core_session_strdup(session, key); } - channel = switch_core_session_get_channel(session); - + channel = tech_pvt->channel = switch_core_session_get_channel(session); + if (is_auth) { switch_channel_set_variable(channel, "sip_authorized", "true"); }

1 0

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

11 Mar '08

Author: brian Date: Tue Mar 11 15:45:32 2008 New Revision: 7863 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: silence as a hold class means NO MUSIC Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Mar 11 15:45:32 2008 @@ -1829,7 +1829,7 @@ stream = tech_pvt->profile->hold_music; } - if (stream) { + if (stream && strcasecmp(stream, "silence")) { switch_ivr_broadcast(switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE), stream, SMF_ECHO_ALEG | SMF_LOOP); } }

1 0

[commit] r7862 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 11 Mar '08

11 Mar '08

Author: brian Date: Tue Mar 11 15:05:20 2008 New Revision: 7862 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak default intercom config Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Mar 11 15:05:20 2008 @@ -110,7 +110,10 @@  <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> +  +  <action application="export"><![CDATA[sip_h_Call-Info=<sip:$${domain}>;answer-after=0]]></action> + <action application="export" data="sip_invite_params=intercom=true"/> <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition>

1 0

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

11 Mar '08

Author: anthm Date: Tue Mar 11 14:36:56 2008 New Revision: 7861 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: double sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Mar 11 14:36:56 2008 @@ -915,6 +915,7 @@ char *rpid_domain = "cluecon.com", *p; const char *priv = "off"; const char *screen = "no"; + const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); @@ -980,11 +981,11 @@ } } - url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, - switch_channel_get_variable(tech_pvt->channel, "sip_invite_params")); + url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE, NULL); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, NULL); + to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_params); + /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,

1 0