March 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

08 Mar '08

Author: anthm Date: Fri Mar 7 20:34:08 2008 New Revision: 7840 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.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 Fri Mar 7 20:34:08 2008 @@ -1571,8 +1571,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_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, "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, "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);

1 0

[commit] r7839 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 08 Mar '08

08 Mar '08

Author: mikej Date: Fri Mar 7 19:12:57 2008 New Revision: 7839 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Log: revert part of the reverting from the reverted revert. (see r7833, the fun continues) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Fri Mar 7 19:12:57 2008 @@ -177,6 +177,7 @@ NHP_SET(nhp, refer_with_id, 1); NHP_SET(nhp, substate, nua_substate_active); + NHP_SET(nhp, sub_expires, 3600); NHP_SET(nhp, allow, sip_allow_make(home, nua_allow_str)); NHP_SET(nhp, supported, sip_supported_make(home, "timer, 100rel"));

1 0

[commit] r7838 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:34:14 2008 New Revision: 7838 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Mar 7 18:34:14 2008 @@ -1791,7 +1791,7 @@ if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { int num = atoi(voicemail_greeting_number); - if (num > 0 && num < VM_MAX_GREETINGS) { + if (num > 0 && num <= VM_MAX_GREETINGS) { greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); } } else {

1 0

[commit] r7837 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:21:08 2008 New Revision: 7837 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Mar 7 18:21:08 2008 @@ -44,6 +44,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load); SWITCH_MODULE_DEFINITION(mod_voicemail, mod_voicemail_load, NULL, NULL); +#define VM_MAX_GREETINGS 9 + static struct { switch_hash_t *profile_hash; int debug; @@ -1445,7 +1447,7 @@ num = atoi(input); file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); - if (num < 1 || num > 3) { + if (num < 1 || num > VM_MAX_GREETINGS) { status = SWITCH_STATUS_FALSE; } else { switch_file_handle_t fh = { 0 }; @@ -1472,7 +1474,7 @@ TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); num = atoi(input); - if (num < 1 || num > 9) { + if (num < 1 || num > VM_MAX_GREETINGS) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); @@ -1789,7 +1791,7 @@ if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { int num = atoi(voicemail_greeting_number); - if (num > 0 && num < 3) { + if (num > 0 && num < VM_MAX_GREETINGS) { greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); } } else {

1 0

[commit] r7836 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 18:17:01 2008 New Revision: 7836 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: udpate Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Mar 7 18:17:01 2008 @@ -1472,7 +1472,7 @@ TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); num = atoi(input); - if (num < 1 || num > 3) { + if (num < 1 || num > 9) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { file_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext);

1 0

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

07 Mar '08

Author: anthm Date: Fri Mar 7 17:40:20 2008 New Revision: 7835 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_ivr_play_say.c Log: fix MODLANG-53 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Fri Mar 7 17:40:20 2008 @@ -297,6 +297,7 @@ char *handler; int64_t pos; switch_buffer_t *audio_buffer; + switch_buffer_t *sp_audio_buffer; uint32_t thresh; uint32_t silence_hits; uint32_t offset_pos; 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 Fri Mar 7 17:40:20 2008 @@ -914,10 +914,13 @@ memset(abuf, 0, framelen); olen = ilen; do_speed = 0; + } else if (fh->sp_audio_buffer && (switch_buffer_inuse(fh->sp_audio_buffer) > (switch_size_t) (framelen))) { + switch_buffer_read(fh->sp_audio_buffer, abuf, framelen); + olen = asis ? framelen : ilen; + do_speed = 0; } else if (fh->audio_buffer && (switch_buffer_inuse(fh->audio_buffer) > (switch_size_t) (framelen))) { switch_buffer_read(fh->audio_buffer, abuf, framelen); olen = asis ? framelen : ilen; - do_speed = 0; } else { olen = FILE_STARTSAMPLES; if (!asis) { @@ -945,7 +948,7 @@ } if (!asis && fh->audio_buffer && last_speed > -1 && last_speed != fh->speed) { - switch_buffer_zero(fh->audio_buffer); + switch_buffer_zero(fh->sp_audio_buffer); } if (switch_test_flag(fh, SWITCH_FILE_SEEK)) { @@ -954,6 +957,7 @@ switch_clear_flag(fh, SWITCH_FILE_SEEK); } + if (!asis && fh->speed && do_speed) { float factor = 0.25f * abs(fh->speed); switch_size_t newlen, supplement, step; @@ -961,11 +965,19 @@ switch_size_t wrote = 0; supplement = (int) (factor * olen); + if (!supplement) { + supplement = 1; + } newlen = (fh->speed > 0) ? olen - supplement : olen + supplement; + step = (fh->speed > 0) ? (newlen / supplement) : (olen / supplement); + if (!fh->sp_audio_buffer) { + switch_buffer_create_dynamic(&fh->sp_audio_buffer, 1024, 1024, 0); + } + while ((wrote + step) < newlen) { - switch_buffer_write(fh->audio_buffer, bp, step * 2); + switch_buffer_write(fh->sp_audio_buffer, bp, step * 2); wrote += step; bp += step; if (fh->speed > 0) { @@ -976,13 +988,13 @@ f = (float) (*bp + *(bp + 1) + *(bp - 1)); f /= 3; s = (short) f; - switch_buffer_write(fh->audio_buffer, &s, 2); + switch_buffer_write(fh->sp_audio_buffer, &s, 2); wrote++; } } if (wrote < newlen) { switch_size_t r = newlen - wrote; - switch_buffer_write(fh->audio_buffer, bp, r * 2); + switch_buffer_write(fh->sp_audio_buffer, bp, r * 2); wrote += r; } last_speed = fh->speed; @@ -1064,6 +1076,7 @@ switch_core_file_close(fh); switch_buffer_destroy(&fh->audio_buffer); + switch_buffer_destroy(&fh->sp_audio_buffer); if (!asis) { switch_core_codec_destroy(&codec); }

1 0

[commit] r7834 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 15:13:40 2008 New Revision: 7834 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: late neg + video issues 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 Fri Mar 7 15:13:40 2008 @@ -532,6 +532,7 @@ return SWITCH_STATUS_FALSE; } sdp_port = tech_pvt->local_sdp_video_port; + if (tech_pvt->profile->extrtpip) { if (sofia_glue_ext_address_lookup(&ip, &sdp_port, tech_pvt->profile->extrtpip, switch_core_session_get_pool(tech_pvt->session)) != @@ -1633,6 +1634,10 @@ sofia_glue_check_video_codecs(tech_pvt); + if (!tech_pvt->local_sdp_video_port) { + sofia_glue_tech_choose_video_port(tech_pvt); + } + if (switch_test_flag(tech_pvt, TFLAG_VIDEO) && tech_pvt->video_rm_encoding) { flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_USE_TIMER | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_NOBLOCK | SWITCH_RTP_FLAG_RAW_WRITE); @@ -1662,10 +1667,14 @@ if (switch_rtp_ready(tech_pvt->video_rtp_session)) { switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err)); + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + goto end; } } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s]\n", switch_str_nil(err)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err)); switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_clear_flag_locked(tech_pvt, TFLAG_IO); status = SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 7 15:13:40 2008 @@ -428,6 +428,11 @@ *err = NULL; + if (switch_strlen_zero(host) || !port) { + *err = "Address Error"; + goto done; + } + if (switch_sockaddr_info_get(&rtp_session->local_addr, host, SWITCH_UNSPEC, port, 0, rtp_session->pool) != SWITCH_STATUS_SUCCESS) { *err = "Local Address Error!"; goto done; @@ -468,17 +473,13 @@ break; } - if (++x > 500) { + if (++x > 1000) { break; } switch_yield(1000); } switch_socket_opt_set(new_sock, SWITCH_SO_NONBLOCK, FALSE); - if (!ilen) { - *err = "Send myself a packet failed!"; - goto done; - } #endif old_sock = rtp_session->sock; @@ -740,13 +741,28 @@ switch_memory_pool_t *pool) { switch_rtp_t *rtp_session = NULL; - - if (switch_rtp_create(&rtp_session, payload, samples_per_interval, ms_per_packet, flags, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { + + if (switch_strlen_zero(rx_host)) { + *err = "Missing local host"; + goto end; + } + + if (!rx_port) { + *err = "Missing local port"; + goto end; + } + + if (switch_strlen_zero(tx_host)) { + *err = "Missing remote host"; + goto end; + } + + if (!tx_port) { + *err = "Missing local port"; goto end; } - if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { - rtp_session = NULL; + if (switch_rtp_create(&rtp_session, payload, samples_per_interval, ms_per_packet, flags, timer_name, err, pool) != SWITCH_STATUS_SUCCESS) { goto end; } @@ -754,6 +770,11 @@ rtp_session = NULL; } + if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { + rtp_session = NULL; + goto end; + } + end: if (rtp_session) {

1 0

[commit] r7833 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 14:20:27 2008 New Revision: 7833 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: revert for now the following patch which introduces a segfault: Tue Feb 26 11:09:37 EST 2008 Pekka.Pessi(a)nokia.com * nua: initial fix for sf.net bug #1827511 BYE can now be challenged. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c Fri Mar 7 14:20:27 2008 @@ -379,12 +379,8 @@ /* Destroy saved client request */ if (cr0 != du->du_cr && nua_client_is_bound(du->du_cr)) { nua_client_bind(cr = du->du_cr, NULL); - - if (nua_client_is_queued(cr)) - nua_client_request_complete(cr); - else if (nua_client_is_reporting(cr)) - ; - else + if (!nua_client_is_queued(cr) && + !nua_client_is_reporting(cr)) nua_client_request_destroy(cr); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Fri Mar 7 14:20:27 2008 @@ -177,7 +177,6 @@ NHP_SET(nhp, refer_with_id, 1); NHP_SET(nhp, substate, nua_substate_active); - NHP_SET(nhp, sub_expires, 3600); NHP_SET(nhp, allow, sip_allow_make(home, nua_allow_str)); NHP_SET(nhp, supported, sip_supported_make(home, "timer, 100rel")); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri Mar 7 14:20:27 2008 @@ -247,8 +247,7 @@ cr = du->du_cr; - if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200 && - cr->cr_method == sip_method_invite) { + if (cr != cr0 && cr && cr->cr_orq && cr->cr_status >= 200) { ss->ss_reporting = 1; nua_invite_client_ack(cr, NULL); ss->ss_reporting = 0; @@ -267,13 +266,11 @@ if (cr == du->du_cr && cr->cr_orq) continue; - if (cr->cr_status < 200) { - nua_stack_event(nh->nh_nua, nh, - NULL, - cr->cr_event, - SIP_481_NO_TRANSACTION, - NULL); - } + nua_stack_event(nh->nh_nua, nh, + NULL, + cr->cr_event, + SIP_481_NO_TRANSACTION, + NULL); nua_client_request_destroy(cr); @@ -729,15 +726,10 @@ if (!du) return -1; - ss = nua_dialog_usage_private(du); - - if (ss->ss_state >= nua_callstate_terminating) - return nua_client_return(cr, 900, "Session is terminating", msg); - if (nua_client_bind(cr, du) < 0) return nua_client_return(cr, 900, "INVITE already in progress", msg); - cr->cr_neutral = 0; + ss = nua_dialog_usage_private(du); session_timer_preferences(ss->ss_timer, sip, @@ -747,6 +739,8 @@ NH_PGET(nh, refresher), NH_PGET(nh, min_se)); + cr->cr_neutral = 0; + return 0; } @@ -763,9 +757,6 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); - if (ss->ss_state >= nua_callstate_terminating) - return nua_client_return(cr, 900, "Session is terminating", msg); - assert(ss); invite_timeout = NH_PGET(nh, invite_timeout); @@ -1178,7 +1169,7 @@ if (error < 0) { if (ss->ss_reason == NULL) ss->ss_reason = "SIP;cause=500;text=\"Internal Error\""; - ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ + ss->ss_reporting = 1; /* We report state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; signal_call_state_change(nh, ss, 500, "Internal Error", @@ -1221,7 +1212,6 @@ char const *invite_branch; assert(cr->cr_orq); - assert(cr->cr_method == sip_method_invite); if (!ds->ds_leg) { @@ -1678,8 +1668,6 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); assert(ss); - if (ss->ss_state >= nua_callstate_terminating) - return nua_client_return(cr, 900, "Session is terminating", msg); cri = du->du_cr; @@ -2470,7 +2458,7 @@ nua_stack_event(nh->nh_nua, nh, NULL, nua_i_media_error, status, phrase, NULL); - ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ + ss->ss_reporting = 1; /* We report state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; @@ -2567,7 +2555,7 @@ /* send BYE, too, if 200 OK (or 183 to re-INVITE) timeouts */ ss->ss_reason = reason; - ss->ss_reporting = 1; /* We report terminated state here if BYE fails */ + ss->ss_reporting = 1; /* We report state here if BYE fails */ error = nua_client_create(nh, nua_r_bye, &nua_bye_client_methods, NULL); ss->ss_reporting = 0; @@ -3139,8 +3127,6 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); assert(ss); - if (ss->ss_state >= nua_callstate_terminating) - return nua_client_return(cr, 900, "Session is terminating", msg); cri = du->du_cr; @@ -3601,9 +3587,7 @@ if (nh->nh_soa) soa_terminate(nh->nh_soa, 0); - - du->du_cr = NULL; - nua_client_bind(cr, du); + cr->cr_usage = du; return 0; } @@ -3675,23 +3659,17 @@ else { nua_session_usage_t *ss = nua_dialog_usage_private(du); - if (ss->ss_reporting) { - return 1; /* Somebody else's problem */ - } - else if (cr->cr_waiting) { - return 1; /* Application problem */ - } - signal_call_state_change(nh, ss, status, "to BYE", nua_callstate_terminated); - if (du && - (du->du_cr == NULL || - !nua_client_is_queued(du->du_cr) || - du->du_cr->cr_status >= 200)) { - /* INVITE is completed, we can zap the session... */; - cr->cr_usage = NULL; - nua_session_usage_destroy(nh, ss); + if (ss && !ss->ss_reporting) { + if (du->du_cr == NULL || + !nua_client_is_queued(du->du_cr) || + du->du_cr->cr_status >= 200) { + /* INVITE is completed, we can zap the session... */; + cr->cr_usage = NULL; + nua_session_usage_destroy(nh, ss); + } } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Fri Mar 7 14:20:27 2008 @@ -2078,7 +2078,6 @@ void nua_client_request_complete(nua_client_request_t *cr) { - nua_client_request_remove(cr); if (cr && cr->cr_methods->crm_complete) cr->cr_methods->crm_complete(cr); } @@ -2096,6 +2095,7 @@ nua_destroy_signal(cr->cr_signal); + nua_client_request_remove(cr); nua_client_bind(cr, NULL); if (cr->cr_msg) @@ -2104,6 +2104,7 @@ if (cr->cr_orq) nta_outgoing_destroy(cr->cr_orq); + cr->cr_orq = NULL; if (cr->cr_timer)

1 0

[commit] r7832 - freeswitch/trunk/src
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: anthm Date: Fri Mar 7 14:17:10 2008 New Revision: 7832 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 Fri Mar 7 14:17:10 2008 @@ -1280,6 +1280,7 @@ } if (check) { + do_2833(rtp_session); if (!bytes && rtp_session->max_missed_packets) { if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { ret = -2;

1 0

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

07 Mar '08

Author: anthm Date: Fri Mar 7 13:55:47 2008 New Revision: 7831 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: opposite day 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 Fri Mar 7 13:55:47 2008 @@ -1981,7 +1981,7 @@ char *full_ref_by = NULL; char *full_ref_to = NULL; - if (profile->mflags & MFLAG_REFER) { + if (!profile->mflags & MFLAG_REFER) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto done; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Mar 7 13:55:47 2008 @@ -638,7 +638,7 @@ char key[128] = ""; switch_event_t *v_event = NULL; - if (profile->mflags & MFLAG_REGISTER) { + if (!profile->mflags & MFLAG_REGISTER) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; }

1 0