- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7786 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: brian Date: Tue Mar 4 17:41:18 2008 New Revision: 7786 Modified: freeswitch/trunk/docs/phrase/phrase_fr.xml Log: tweak, thanks mcollins Modified: freeswitch/trunk/docs/phrase/phrase_fr.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_fr.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_fr.xml Tue Mar 4 17:41:18 2008 @@ -80,17 +80,17 @@ <prompt phrase="Quatorze" filename="14.wav"/> <prompt phrase="Quinze" filename="15.wav"/> <prompt phrase="Seize" filename="16.wav"/> - <prompt phrase="Dix Sept" filename="17.wav"/> - <prompt phrase="Dix Huit" filename="18.wav"/> - <prompt phrase="Dix Neuf" filename="19.wav"/> + <prompt phrase="Dix-Sept" filename="17.wav"/> + <prompt phrase="Dix-Huit" filename="18.wav"/> + <prompt phrase="Dix-Neuf" filename="19.wav"/> <prompt phrase="Vingt" filename="20.wav"/> - <prompt phrase="Vingt et un" filename="30.wav"/> + <prompt phrase="Trente" filename="30.wav"/> <prompt phrase="Quarante" filename="40.wav"/> <prompt phrase="Cinquante" filename="50.wav"/> <prompt phrase="Soixante" filename="60.wav"/> <prompt phrase="Soixante Dix" filename="70.wav"/> - <prompt phrase="Quatre Vingt" filename="80.wav"/> - <prompt phrase="Quatre Vingt Dix" filename="90.wav"/> + <prompt phrase="Quatre-Vingt" filename="80.wav"/> + <prompt phrase="Quatre-Vingt-Dix" filename="90.wav"/> <prompt phrase="Point" filename="dot.wav"/> <prompt phrase="Premier" filename="h-1.wav"/> <prompt phrase="Second" filename="h-2.wav"/> @@ -108,12 +108,13 @@ <prompt phrase="Quatorzième" filename="h-14.wav"/> <prompt phrase="Quinzième" filename="h-15.wav"/> <prompt phrase="Seizième" filename="h-16.wav"/> - <prompt phrase="Dix Sepième" filename="h-17.wav"/> - <prompt phrase="Dix Huitième" filename="h-18.wav"/> - <prompt phrase="Dix Neuvième" filename="h-19.wav"/> + <prompt phrase="Dix-Septième" filename="h-17.wav"/> + <prompt phrase="Dix-Huitième" filename="h-18.wav"/> + <prompt phrase="Dix-Neuvième" filename="h-19.wav"/> <prompt phrase="Vingtième" filename="h-20.wav"/> <prompt phrase="Trentième" filename="h-30.wav"/> - <prompt phrase="Quarantième" filename="hundred.wav"/> + <prompt phrase="Quarantième" filename="hh-40.wav"/> + <prompt phrase="Cent" filename="hundred.wav"/> <prompt phrase="Million" filename="million.wav"/> <prompt phrase="Point Final" filename="period.wav"/> <prompt phrase="Point" filename="point.wav"/> @@ -143,7 +144,7 @@ <prompt phrase="Vendredi" filename="day-5.wav"/> <prompt phrase="Samedi" filename="day-6.wav"/> <prompt phrase="Heure" filename="hour.wav"/> - <prompt phrase="Houres" filename="hours.wav"/> + <prompt phrase="Heures" filename="hours.wav"/> <prompt phrase="Minute" filename="minute.wav"/> <prompt phrase="Minutes" filename="minutes.wav"/> <prompt phrase="Janvier" filename="mon-0.wav"/> @@ -209,4 +210,4 @@ <prompt phrase="message numéro" filename="vm-message_number.wav"/> </voicemail> </fr> -</language> \ No newline at end of file +</language>

1 0

[commit] r7785 - freeswitch/trunk/src
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: anthm Date: Tue Mar 4 14:05:27 2008 New Revision: 7785 Modified: freeswitch/trunk/src/switch_rtp.c Log: update Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Mar 4 14:05:27 2008 @@ -1346,7 +1346,7 @@ do_continue: - switch_yield(5000); + switch_yield(1000); } if (switch_rtp_ready(rtp_session)) {

1 0

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

04 Mar '08

Author: anthm Date: Tue Mar 4 13:55:16 2008 New Revision: 7784 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add read app 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 4 13:55:16 2008 @@ -735,6 +735,16 @@ SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t *session, switch_core_session_t *peer_session); +SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, + uint32_t min_digits, + uint32_t max_digits, + const char *prompt_audio_file, + const char *var_name, + char *digit_buffer, + switch_size_t digit_buffer_length, + uint32_t timeout, + const char *valid_terminators); + /** @} */ 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 4 13:55:16 2008 @@ -1057,6 +1057,70 @@ switch_ivr_speak_text(session, engine, voice, text, &args); } + +SWITCH_STANDARD_APP(read_function) +{ + char *mydata; + char *argv[6] = { 0 }; + int argc; + int32_t min_digits = 0; + int32_t max_digits = 0; + int timeout = 1000; + char digit_buffer[128] = ""; + const char *prompt_audio_file = NULL; + const char *var_name = NULL; + const char *valid_terminators = NULL; + + if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No file specified.\n"); + return; + } + + min_digits = atoi(argv[0]); + + if (argc > 1) { + max_digits = atoi(argv[1]); + } + + if (argc > 2) { + prompt_audio_file = argv[2]; + } + + if (argc > 3) { + var_name = argv[3]; + } + + if (argc > 4) { + timeout = atoi(argv[4]); + } + + if (argc > 5) { + valid_terminators = argv[5]; + } + + if (min_digits <= 1) { + min_digits = 1; + } + + if (max_digits < min_digits) { + max_digits = min_digits; + } + + if (timeout <= 1000) { + timeout = 1000; + } + + if (switch_strlen_zero(valid_terminators)) { + valid_terminators = "#"; + } + + switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, var_name, digit_buffer, sizeof(digit_buffer), timeout, valid_terminators); + +} + + SWITCH_STANDARD_APP(playback_function) { switch_input_args_t args = { 0 }; @@ -1550,6 +1614,7 @@ SWITCH_ADD_APP(app_interface, "park_state", "Park State", "Park State", park_state_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "gentones", "Generate Tones", "Generate tones to the channel", gentones_function, "<tgml_script>[|<loops>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); + SWITCH_ADD_APP(app_interface, "read", "Read Digits", "Read Digits", read_function, "<min> <max> <file> <var name> <timeout> <terminators>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "record_session", "Record Session", SESS_REC_DESC, record_session_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "record", "Record File", "Record a file from the channels input", record_function, "<path> [<time_limit_secs>] [<silence_thresh>] [<silence_hits>]", SAF_NONE); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Mar 4 13:55:16 2008 @@ -647,7 +647,7 @@ digit_started = switch_timestamp_now(); } - for (y = 0; y < maxdigits; y++) { + for (y = 0; y <= maxdigits; y++) { if (switch_channel_dequeue_dtmf(channel, &dtmf) != SWITCH_STATUS_SUCCESS) { break; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Mar 4 13:55:16 2008 @@ -887,7 +887,7 @@ if (args->input_callback) { status = args->input_callback(session, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen); } else { - switch_copy_string((char *) args->buf, (void *)&dtmf, args->buflen); + *((char *)args->buf) = dtmf.digit; status = SWITCH_STATUS_BREAK; } } @@ -1081,6 +1081,65 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, + uint32_t min_digits, + uint32_t max_digits, + const char *prompt_audio_file, + const char *var_name, + char *digit_buffer, + switch_size_t digit_buffer_length, + uint32_t timeout, + const char *valid_terminators) +{ + switch_channel_t *channel; + switch_input_args_t args = { 0 }; + switch_status_t status = SWITCH_STATUS_SUCCESS; + char terminator; + int len; + + switch_assert(session); + + channel = switch_core_session_get_channel(session); + + if (digit_buffer_length < min_digits || digit_buffer_length < max_digits) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Buffer too small!\n"); + return SWITCH_STATUS_FALSE; + } + + switch_channel_pre_answer(channel); + + memset(digit_buffer, 0, digit_buffer_length); + args.buf = digit_buffer; + args.buflen = digit_buffer_length; + + if (!switch_strlen_zero(prompt_audio_file)) { + status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args); + } + + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + goto end; + } + + len = strlen(digit_buffer); + + if (len < min_digits && len < max_digits) { + args.buf = digit_buffer + len; + args.buflen = digit_buffer_length - len; + status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); + } + + + end: + + if (var_name && !switch_strlen_zero(digit_buffer)) { + switch_channel_set_variable(channel, var_name, digit_buffer); + } + + return status; + +} + + SWITCH_DECLARE(switch_status_t) switch_play_and_get_digits(switch_core_session_t *session, uint32_t min_digits, uint32_t max_digits,

1 0

[commit] r7783 - freeswitch/trunk
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: mikej Date: Tue Mar 4 11:20:43 2008 New Revision: 7783 Modified: freeswitch/trunk/freeswitch.spec Log: don't build mod that does not exist Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Tue Mar 4 11:20:43 2008 @@ -156,7 +156,7 @@ SPIDERMONKEY_MODULES="languages/mod_spidermonkey languages/mod_spidermonkey_curl languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone" APPLICATIONS_MODULES="applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail" ASR_TTS_MODULES="asr_tts/mod_openmrcp" -CODECS_MODULES="codecs/mod_gsm codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex" +CODECS_MODULES="codecs/mod_ilbc codecs/mod_h26x codecs/mod_voipcodecs codecs/mod_speex" DIALPLANS_MODULES="dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml" DIRECTORIES_MODULES= DOTNET_MODULES=

1 0

[commit] r7782 - freeswitch/trunk/conf
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: brian Date: Tue Mar 4 02:25:23 2008 New Revision: 7782 Modified: freeswitch/trunk/conf/vars.xml Log: cleanup Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Tue Mar 4 02:25:23 2008 @@ -3,13 +3,6 @@ --> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/> -  - <X-PRE-PROCESS cmd="set" data="sip_profile=$${domain}"/> - <X-PRE-PROCESS cmd="set" data="nat_sip_profile=nat_$${domain}"/>  - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i,H263"/> - <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU@20i,PCMA@20i"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM,H263"/> + <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>  <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/> - <X-PRE-PROCESS cmd="set" data="outbound_caller_id=8777423583"/> + <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/> <X-PRE-PROCESS cmd="set" data="call_debug=false"/>

1 0

[commit] r7781 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: brian Date: Tue Mar 4 00:23:52 2008 New Revision: 7781 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: add more comments to brian user Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Tue Mar 4 00:23:52 2008 @@ -65,8 +65,11 @@    - -  +  +    </variables>

1 0

[commit] r7780 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: anthm Date: Mon Mar 3 20:23:55 2008 New Revision: 7780 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add accept-blind-auth Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Mon Mar 3 20:23:55 2008 @@ -71,6 +71,9 @@    + +  +   <param name="nonce-ttl" value="60"/> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Mar 3 20:23:55 2008 @@ -129,7 +129,8 @@ PFLAG_SUPRESS_CNG = (1 << 12), PFLAG_TLS = (1 << 13), PFLAG_CHECKUSER = (1 << 14), - PFLAG_SECURE = (1 << 15) + PFLAG_SECURE = (1 << 15), + PFLAG_BLIND_AUTH = (1 << 16) } PFLAGS; typedef enum { 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 Mon Mar 3 20:23:55 2008 @@ -1099,6 +1099,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_REG; } + } else if (!strcasecmp(var, "accept-blind-auth")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_BLIND_AUTH; + } } else if (!strcasecmp(var, "auth-all-packets")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_ALL; @@ -2374,7 +2378,7 @@ get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); - if ((profile->pflags & PFLAG_AUTH_CALLS) || sip->sip_proxy_authorization || sip->sip_authorization) { + if ((profile->pflags & PFLAG_AUTH_CALLS) || (!(profile->pflags & PFLAG_BLIND_AUTH) && (sip->sip_proxy_authorization || sip->sip_authorization))) { if (strcmp(network_ip, profile->sipip)) { if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) { if (v_event) {

1 0

[commit] r7779 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 04 Mar '08

04 Mar '08

Author: anthm Date: Mon Mar 3 19:52:54 2008 New Revision: 7779 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr_bridge.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 Mon Mar 3 19:52:54 2008 @@ -1507,8 +1507,8 @@ SWITCH_ADD_APP(app_interface, "strftime", NULL, NULL, strftime_function, NULL, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "phrase", "Say a Phrase", "Say a Phrase", phrase_function, "<macro_name>,<data>", SAF_NONE); SWITCH_ADD_APP(app_interface, "eval", "Do Nothing", "Do Nothing", eval_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA); - SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set_name", "Name the channel", "Name the channel", set_name_function, "<name>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs a channel variable", LOG_LONG_DESC, log_function, "<varname>", SAF_SUPPORT_NOMEDIA); 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 Mon Mar 3 19:52:54 2008 @@ -712,13 +712,6 @@ goto end; } - if (msg->message_id == SWITCH_MESSAGE_INDICATE_ANSWER || msg->message_id == SWITCH_MESSAGE_INDICATE_PROGRESS) { - const char *var; - if ((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { - switch_set_flag_locked(tech_pvt, TFLAG_SECURE); - } - } - switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: { @@ -794,10 +787,26 @@ case SWITCH_MESSAGE_INDICATE_MEDIA: { - uint32_t count = 0; - + uint32_t count = 0, send_invite = 1; + switch_channel_clear_flag(channel, CF_PROXY_MODE); tech_pvt->local_sdp_str = NULL; + + if (!switch_channel_media_ready(channel)) { + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { + const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); + + tech_pvt->num_codecs = 0; + sofia_glue_tech_prepare_codecs(tech_pvt); + if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + status = SWITCH_STATUS_FALSE; + goto end; + } + send_invite = 0; + } + } + if (!switch_rtp_ready(tech_pvt->rtp_session)) { sofia_glue_tech_prepare_codecs(tech_pvt); if ((status = sofia_glue_tech_choose_port(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) { @@ -806,20 +815,22 @@ } } sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1); - sofia_glue_do_invite(session); - /* wait for rtp to start and first real frame to arrive */ - tech_pvt->read_frame.datalen = 0; - while (switch_test_flag(tech_pvt, TFLAG_IO) && switch_channel_get_state(channel) < CS_HANGUP && !switch_rtp_ready(tech_pvt->rtp_session)) { - if (++count > 1000) { - status = SWITCH_STATUS_FALSE; - goto end; - } - if (!switch_rtp_ready(tech_pvt->rtp_session)) { - switch_yield(1000); - continue; + if (send_invite) { + sofia_glue_do_invite(session); + /* wait for rtp to start and first real frame to arrive */ + tech_pvt->read_frame.datalen = 0; + while (switch_test_flag(tech_pvt, TFLAG_IO) && switch_channel_get_state(channel) < CS_HANGUP && !switch_rtp_ready(tech_pvt->rtp_session)) { + if (++count > 1000) { + status = SWITCH_STATUS_FALSE; + goto end; + } + if (!switch_rtp_ready(tech_pvt->rtp_session)) { + switch_yield(1000); + continue; + } + break; } - break; } } break; 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 Mon Mar 3 19:52:54 2008 @@ -1422,11 +1422,18 @@ uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; uint32_t rtp_hold_timeout_sec = tech_pvt->profile->rtp_hold_timeout_sec; char *timer_name; + const char *var; switch_assert(tech_pvt != NULL); switch_core_session_signal_lock(tech_pvt->session); + + if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { + switch_set_flag_locked(tech_pvt, TFLAG_SECURE); + } + + if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) { status = SWITCH_STATUS_SUCCESS; goto end; 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 Mon Mar 3 19:52:54 2008 @@ -137,8 +137,7 @@ while (switch_channel_get_state(session->channel) == CS_EXECUTE && extension->current_application) { char *expanded = NULL; - int nomedia = 0; - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Execute %s(%s)\n", switch_channel_get_name(session->channel), extension->current_application->application_name, switch_str_nil(extension->current_application->application_data)); if ((application_interface = switch_loadable_module_get_application_interface(extension->current_application->application_name)) == 0) { @@ -155,7 +154,6 @@ if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) { switch_ivr_media(session->uuid_str, SMF_NONE); - nomedia++; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n", extension->current_application->application_name, switch_channel_get_name(session->channel)); } else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) { @@ -189,12 +187,6 @@ goto top; } - if (nomedia) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Releasing media\n", - extension->current_application->application_name); - switch_ivr_nomedia(session->uuid_str, SMF_NONE); - } - extension->current_application = extension->current_application->next; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Mar 3 19:52:54 2008 @@ -496,7 +496,7 @@ switch_core_session_t *other_session; switch_event_t *event; - if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { + if (switch_channel_test_flag(channel, CF_ORIGINATOR)) { switch_channel_clear_flag(channel, CF_ORIGINATOR); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); @@ -514,17 +514,10 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - assert (!switch_channel_test_flag(other_channel, CF_TRANSFER)); + if (switch_channel_get_state(other_channel) < CS_HANGUP) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } - if (!switch_channel_test_flag(other_channel, CF_TRANSFER)) { - if (switch_channel_test_flag(other_channel, CF_ANSWERED) && - switch_channel_get_state(other_channel) < CS_HANGUP && - switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); - } else { - switch_channel_set_state(other_channel, CS_EXECUTE); - } - } switch_core_session_rwunlock(other_session); }

1 0

[commit] r7778 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: anthm Date: Mon Mar 3 18:13:12 2008 New Revision: 7778 Modified: freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 3 18:13:12 2008 @@ -1023,7 +1023,10 @@ rtp_session->dtmf_data.out_digit = rdigit->digit; rtp_session->dtmf_data.out_digit_packet[0] = (unsigned char) switch_char_to_rfc2833(rdigit->digit); rtp_session->dtmf_data.out_digit_packet[1] = 7; + rtp_session->dtmf_data.out_digit_packet[2] = (unsigned char) (rtp_session->dtmf_data.out_digit_sub_sofar >> 8); + rtp_session->dtmf_data.out_digit_packet[3] = (unsigned char) rtp_session->dtmf_data.out_digit_sub_sofar; + rtp_session->dtmf_data.timestamp_dtmf = rtp_session->last_write_ts + samples; if (rtp_session->timer.interval) { switch_core_timer_check(&rtp_session->timer); @@ -1721,7 +1724,6 @@ if (send) { send_msg->header.seq = htons(++rtp_session->seq); - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND)) { int sbytes = (int) bytes; err_status_t stat;

1 0

[commit] r7776 - freeswitch/trunk/src
by Freeswitch SVN 03 Mar '08

03 Mar '08

Author: mikej Date: Mon Mar 3 15:51:50 2008 New Revision: 7776 Modified: freeswitch/trunk/src/switch_core.c Log: initialize event engine and logs earlier Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Mar 3 15:51:50 2008 @@ -726,6 +726,9 @@ switch_core_set_variable("local_ip_v6", guess_ip); switch_core_set_variable("base_dir", SWITCH_GLOBAL_dirs.base_dir); + switch_log_init(runtime.memory_pool); + switch_event_init(runtime.memory_pool); + if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; @@ -803,10 +806,6 @@ runtime.console = stdout; } - switch_assert(runtime.memory_pool != NULL); - switch_log_init(runtime.memory_pool); - switch_event_init(runtime.memory_pool); - if (switch_test_flag((&runtime), SCF_USE_SQL)) { switch_core_sqldb_start(runtime.memory_pool); }

1 0