- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9927 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 22:43:23 2008 New Revision: 9927 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: for the sake of consistency channel names lower case Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Oct 9 22:43:23 2008 @@ -1675,7 +1675,7 @@ if (outbound_profile) { char name[128]; - switch_snprintf(name, sizeof(name), "DingaLing/%s", outbound_profile->destination_number); + switch_snprintf(name, sizeof(name), "dingaling/%s", outbound_profile->destination_number); switch_channel_set_name(channel, name); caller_profile = switch_caller_profile_clone(*new_session, outbound_profile); @@ -2645,7 +2645,7 @@ ldl_session_get_value(dlsession, "aniii"), ldl_session_get_value(dlsession, "rdnis"), modname, context, exten)) != 0) { char name[128]; - switch_snprintf(name, sizeof(name), "DingaLing/%s", tech_pvt->caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "dingaling/%s", tech_pvt->caller_profile->destination_number); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); }

1 0

[commit] r9926 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 22:31:17 2008 New Revision: 9926 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: map unknown event to break 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 Thu Oct 9 22:31:17 2008 @@ -273,6 +273,7 @@ case nua_r_unsubscribe: case nua_r_publish: case nua_i_cancel: + case nua_r_cancel: case nua_i_error: case nua_i_active: case nua_i_ack:

1 0

[commit] r9925 - freeswitch/trunk/conf
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 21:28:35 2008 New Revision: 9925 Modified: freeswitch/trunk/conf/vars.xml Log: add sit tone to vars list Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Thu Oct 9 21:28:35 2008 @@ -114,6 +114,7 @@ <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/> <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/> <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> + <X-PRE-PROCESS cmd="set" data="sit=%(274,0,913.8);%(274,0,1370.6);%(380,0,1776.7)"/> <!-- Setting up your default sip provider is easy. Below are some values that should work in most cases.

1 0

[commit] r9924 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 21:07:49 2008 New Revision: 9924 Modified: freeswitch/trunk/conf/dialplan/features.xml Log: tweak 9999 to look at sip_via_protocol now Modified: freeswitch/trunk/conf/dialplan/features.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/features.xml (original) +++ freeswitch/trunk/conf/dialplan/features.xml Thu Oct 9 21:07:49 2008 @@ -40,7 +40,7 @@ <extension name="is_secure">  - <condition field="${sip_contact_params}" expression="transport=tls"/> + <condition field="${sip_via_protocol}" expression="tls"/> <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/>

1 0

[commit] r9923 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: brian Date: Thu Oct 9 21:06:03 2008 New Revision: 9923 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add sip_via_protocol variable and cleanup code 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 Thu Oct 9 21:06:03 2008 @@ -3519,6 +3519,10 @@ switch_channel_set_variable(channel, "sip_received_port", tmp); } + if (sip->sip_via) { + switch_channel_set_variable(channel, "sip_via_protocol", sofia_glue_transport2str(sofia_glue_via2transport(sip->sip_via))); + } + if (*key != '\0') { tech_pvt->key = switch_core_session_strdup(session, key); } 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 Thu Oct 9 21:06:03 2008 @@ -676,15 +676,10 @@ sofia_transport_t sofia_glue_via2transport(const sip_via_t *via) { char *ptr = NULL; - int tls = 0; if (!via || !via->v_protocol) return SOFIA_TRANSPORT_UNKNOWN; - if (!strncasecmp(via->v_protocol, "sips", 4)) { - tls++; - } - if ((ptr = strrchr(via->v_protocol, '/'))) { ptr++;

1 0

[commit] r9922 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 10 Oct '08

10 Oct '08

Author: mikej Date: Thu Oct 9 20:29:45 2008 New Revision: 9922 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_ivr_originate.c Log: windows build tweaks. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Oct 9 20:29:45 2008 @@ -2335,7 +2335,7 @@ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc != 2) { + if (argc != 2 || !argv[0]) { goto error; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Oct 9 20:29:45 2008 @@ -1280,7 +1280,6 @@ ok = 1; for (i = 0; i < and_argc; i++) { switch_channel_t *pchannel; - switch_call_cause_t cause; const char *cause_str; if (!peer_sessions[i]) { @@ -1289,8 +1288,7 @@ pchannel = switch_core_session_get_channel(peer_sessions[i]); if (switch_channel_get_state(pchannel) >= CS_HANGUP) { - cause = switch_channel_get_cause(pchannel); - cause_str = switch_channel_cause2str(cause); + cause_str = switch_channel_cause2str(switch_channel_get_cause(pchannel)); if (switch_stristr(cause_str, fail_on_single_reject_var)) { ok = 0; break;

1 0

[commit] r9921 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: anthm Date: Thu Oct 9 19:37:26 2008 New Revision: 9921 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: clean up some typos 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 Thu Oct 9 19:37:26 2008 @@ -706,7 +706,7 @@ expanded = switch_channel_expand_variables(channel, val); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, expanded ? expanded : "UNDEF"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF"); switch_channel_set_variable(channel, var, expanded); if (expanded && expanded != val) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 9 19:37:26 2008 @@ -409,7 +409,7 @@ } } } else { - if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (is_proxy) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Oct 9 19:37:26 2008 @@ -1459,7 +1459,7 @@ switch_event_t *event; if (!switch_channel_test_flag(channel, CF_RING_READY)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); switch_channel_set_flag(channel, CF_RING_READY); if (channel->caller_profile && channel->caller_profile->times) { switch_mutex_lock(channel->profile_mutex); @@ -1493,7 +1493,7 @@ { switch_event_t *event; - switch_channel_mark_ring_ready(channel); + switch_channel_perform_mark_ring_ready(channel, file, func, line); if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { const char *uuid; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Oct 9 19:37:26 2008 @@ -456,7 +456,7 @@ } olen = mlen; - if (ringback.fh->resampler) { + if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) { olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); } switch_core_file_read(ringback.fh, write_frame.data, &olen);

1 0

[commit] r9920 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: anthm Date: Thu Oct 9 19:12:37 2008 New Revision: 9920 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: around and around we go .... Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Thu Oct 9 19:12:37 2008 @@ -51,8 +51,7 @@ TFLAG_WRITE = (1 << 2), TFLAG_CNG = (1 << 3), TFLAG_BRIDGE = (1 << 4), - TFLAG_BOWOUT = (1 << 5), - TFLAG_NO_EARLY = (1 << 6) + TFLAG_BOWOUT = (1 << 5) } TFLAGS; struct private_object { @@ -74,7 +73,7 @@ switch_frame_t cng_frame; unsigned char cng_databuf[10]; - + switch_timer_t timer; switch_caller_profile_t *caller_profile; }; typedef struct private_object private_t; @@ -103,6 +102,7 @@ int interval = 20; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *channel = switch_core_session_get_channel(session); + const switch_codec_implementation_t *read_impl; if (codec) { iananame = codec->implementation->iananame; @@ -150,7 +150,6 @@ goto end; } - tech_pvt->read_frame.data = tech_pvt->databuf; tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); tech_pvt->read_frame.codec = &tech_pvt->read_codec; @@ -168,6 +167,17 @@ switch_core_session_set_read_codec(session, &tech_pvt->read_codec); switch_core_session_set_write_codec(session, &tech_pvt->write_codec); + if (tech_pvt->flag_mutex) { + switch_core_timer_destroy(&tech_pvt->timer); + } + + read_impl = tech_pvt->read_codec.implementation; + + switch_core_timer_init(&tech_pvt->timer, "soft", + read_impl->microseconds_per_frame / 1000, + read_impl->samples_per_frame *4, + switch_core_session_get_pool(session)); + if (!tech_pvt->flag_mutex) { switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); @@ -242,11 +252,6 @@ switch_set_flag_locked(b_tech_pvt, TFLAG_LINKED); switch_set_flag_locked(b_tech_pvt, TFLAG_OUTBOUND); - if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { - switch_set_flag_locked(b_tech_pvt, TFLAG_NO_EARLY); - switch_clear_flag_locked(tech_pvt, TFLAG_NO_EARLY); - } - switch_channel_set_flag(channel, CF_ACCEPT_CNG); switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); @@ -347,6 +352,8 @@ tech_pvt->other_session = NULL; } + switch_core_timer_destroy(&tech_pvt->timer); + return SWITCH_STATUS_SUCCESS; } @@ -378,6 +385,7 @@ default: break; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel)); @@ -467,7 +475,7 @@ switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - + channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -478,35 +486,46 @@ goto end; } - if (switch_test_flag(tech_pvt, TFLAG_NO_EARLY)) { - switch_set_flag(tech_pvt, TFLAG_CNG); - } - *frame = NULL; - - while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt && !switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + + while(switch_test_flag(tech_pvt, TFLAG_LINKED) && tech_pvt->other_tech_pvt) { if (!switch_channel_ready(channel)) { goto end; } if (switch_test_flag(tech_pvt, TFLAG_CNG)) { break; } + + if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + break; + } + + if (switch_core_timer_check(&tech_pvt->timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { + switch_set_flag(tech_pvt, TFLAG_CNG); + break; + } + switch_yield(1000); } - + if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { - if (switch_test_flag(tech_pvt, TFLAG_CNG)) { - *frame = &tech_pvt->cng_frame; - tech_pvt->cng_frame.codec = &tech_pvt->read_codec; - switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); - switch_clear_flag_locked(tech_pvt, TFLAG_CNG); - } else if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + if (tech_pvt->other_tech_pvt && switch_test_flag(tech_pvt->other_tech_pvt, TFLAG_WRITE)) { + switch_core_timer_sync(&tech_pvt->timer); *frame = &tech_pvt->other_tech_pvt->write_frame; switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + switch_clear_flag_locked(tech_pvt, TFLAG_CNG); } } - - if (*frame) { + + if (switch_test_flag(tech_pvt, TFLAG_CNG)) { + *frame = &tech_pvt->cng_frame; + tech_pvt->cng_frame.codec = &tech_pvt->read_codec; + switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); + switch_clear_flag_locked(tech_pvt, TFLAG_CNG); + } + + + if (*frame && switch_test_flag(tech_pvt, TFLAG_LINKED)) { status = SWITCH_STATUS_SUCCESS; } else { status = SWITCH_STATUS_FALSE; @@ -599,7 +618,6 @@ if (tech_pvt->other_channel) { if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { switch_channel_answer(tech_pvt->other_channel); - switch_clear_flag(tech_pvt, TFLAG_NO_EARLY); } } break; @@ -635,14 +653,16 @@ if (session) { - switch_channel_pre_answer(switch_core_session_get_channel(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + switch_channel_pre_answer(channel); } if ((*new_session = switch_core_session_request(loopback_endpoint_interface, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; - const char *var; switch_core_session_add_stream(*new_session, NULL); @@ -660,10 +680,6 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - if ((var = switch_event_get_header(var_event, "originate_early_media")) && !switch_true(var)) { - switch_set_flag(tech_pvt, TFLAG_NO_EARLY); - } - if (outbound_profile) { char *dialplan = NULL, *context = NULL;

1 0

[commit] r9919 - in freeswitch/trunk/src/mod: applications/mod_dptools endpoints/mod_sofia
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: anthm Date: Thu Oct 9 19:11:35 2008 New Revision: 9919 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: cancel proxy or no-media mode if you purposely answer or pre_answer 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 Thu Oct 9 19:11:35 2008 @@ -603,7 +603,10 @@ SWITCH_STANDARD_APP(answer_function) { - switch_channel_answer(switch_core_session_get_channel(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + switch_channel_answer(channel); } SWITCH_STANDARD_APP(presence_function) @@ -628,7 +631,10 @@ SWITCH_STANDARD_APP(pre_answer_function) { - switch_channel_pre_answer(switch_core_session_get_channel(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + switch_channel_pre_answer(channel); } SWITCH_STANDARD_APP(redirect_function) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 9 19:11:35 2008 @@ -1108,7 +1108,7 @@ } } } else { - if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);

1 0

[commit] r9918 - freeswitch/trunk/src
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: mikej Date: Thu Oct 9 18:50:44 2008 New Revision: 9918 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix resampler bug Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Oct 9 18:50:44 2008 @@ -1349,7 +1349,7 @@ } olen = mlen; - if (ringback.fh->resampler) { + if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) { olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); }

1 0