- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

07 Mar '08

Author: anthm Date: Fri Mar 7 13:43:28 2008 New Revision: 7830 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_pcm.c Log: fix rtp break on blocking sockets 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 13:43:28 2008 @@ -787,7 +787,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel)); return; } - tech_pvt->iananame = switch_core_session_strdup(tech_pvt->session, "NO-NAME"); + tech_pvt->iananame = switch_core_session_strdup(tech_pvt->session, "PROXY"); tech_pvt->rm_rate = 8000; tech_pvt->codec_ms = 20; } Modified: freeswitch/trunk/src/switch_pcm.c ============================================================================== --- freeswitch/trunk/src/switch_pcm.c (original) +++ freeswitch/trunk/src/switch_pcm.c Fri Mar 7 13:43:28 2008 @@ -94,33 +94,32 @@ -static switch_status_t switch_nn_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +static switch_status_t switch_proxy_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { return SWITCH_STATUS_SUCCESS; } -static switch_status_t switch_nn_encode(switch_codec_t *codec, +static switch_status_t switch_proxy_encode(switch_codec_t *codec, switch_codec_t *other_codec, void *decoded_data, uint32_t decoded_data_len, uint32_t decoded_rate, void *encoded_data, uint32_t * encoded_data_len, uint32_t * encoded_rate, unsigned int *flag) { - /* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */ - return SWITCH_STATUS_NOOP; + return SWITCH_STATUS_FALSE; } -static switch_status_t switch_nn_decode(switch_codec_t *codec, +static switch_status_t switch_proxy_decode(switch_codec_t *codec, switch_codec_t *other_codec, void *encoded_data, uint32_t encoded_data_len, uint32_t encoded_rate, void *decoded_data, uint32_t * decoded_data_len, uint32_t * decoded_rate, unsigned int *flag) { - return SWITCH_STATUS_NOOP; + return SWITCH_STATUS_FALSE; } -static switch_status_t switch_nn_destroy(switch_codec_t *codec) +static switch_status_t switch_proxy_destroy(switch_codec_t *codec) { return SWITCH_STATUS_SUCCESS; } @@ -300,11 +299,11 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_CODEC(codec_interface, "NO-NAME PASS-THROUGH"); + SWITCH_ADD_CODEC(codec_interface, "PROXY PASS-THROUGH"); switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 0, "NO-NAME", NULL, 8000, 8000, 0, + SWITCH_CODEC_TYPE_AUDIO, 0, "PROXY", NULL, 8000, 8000, 0, 20000, 160, 320, 320, 1, 1, 12, - switch_nn_init, switch_nn_encode, switch_nn_decode, switch_nn_destroy); + switch_proxy_init, switch_proxy_encode, switch_proxy_decode, switch_proxy_destroy); SWITCH_ADD_CODEC(codec_interface, "RAW Signed Linear (16 bit)");

1 0

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

07 Mar '08

Author: anthm Date: Fri Mar 7 13:21:08 2008 New Revision: 7829 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_rtp.c Log: fix rtp break on blocking sockets Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Fri Mar 7 13:21:08 2008 @@ -191,6 +191,8 @@ */ SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session); +SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session); + /*! \brief Test if an RTP session is ready \param rtp_session an RTP session to test 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 Fri Mar 7 13:21:08 2008 @@ -644,10 +644,10 @@ switch (sig) { case SWITCH_SIG_BREAK: if (switch_rtp_ready(tech_pvt->rtp_session)) { - switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_rtp_break(tech_pvt->rtp_session); } if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - switch_rtp_set_flag(tech_pvt->video_rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_rtp_break(tech_pvt->rtp_session); } break; case SWITCH_SIG_KILL: 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:21:08 2008 @@ -1436,7 +1436,7 @@ } if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); - nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); } switch_core_session_rwunlock(other_session); } @@ -1780,7 +1780,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); - nua_respond(tech_pvt->nh, 488, "Hangup in progress", TAG_END()); + nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); } switch_core_session_rwunlock(other_session); } else { Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Mar 7 13:21:08 2008 @@ -804,14 +804,29 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) +{ + char o = 42; + switch_size_t len = sizeof(o); + + switch_assert(rtp_session != NULL); + switch_mutex_lock(rtp_session->flag_mutex); + if (rtp_session->sock) { + switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + switch_socket_sendto(rtp_session->sock, rtp_session->local_addr, 0, (void *) &o, &len); + } + switch_mutex_unlock(rtp_session->flag_mutex); +} + SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { switch_assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); - switch_assert(rtp_session->sock != NULL); - switch_socket_shutdown(rtp_session->sock, SWITCH_SHUTDOWN_READWRITE); + if (rtp_session->sock) { + switch_socket_shutdown(rtp_session->sock, SWITCH_SHUTDOWN_READWRITE); + } } switch_mutex_unlock(rtp_session->flag_mutex); } @@ -1081,6 +1096,13 @@ bytes = sizeof(rtp_msg_t); status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock, 0, (void *) &rtp_session->recv_msg, &bytes); + if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { + switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + bytes = 0; + do_cng = 1; + goto cng; + } + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA)) { /* Fast PASS! */ *flags |= SFF_PROXY_PACKET; @@ -1224,10 +1246,9 @@ do_cng = 1; } - - if (do_cng || (!bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK))) { - switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + cng: + if (do_cng) { memset(&rtp_session->recv_msg.body, 0, 2); rtp_session->recv_msg.body[0] = 127; rtp_session->recv_msg.header.pt = SWITCH_RTP_CNG_PAYLOAD;

1 0

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

07 Mar '08

Author: mikej Date: Fri Mar 7 12:52:20 2008 New Revision: 7828 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Log: Fri Mar 7 12:31:52 EST 2008 Pekka.Pessi(a)nokia.com * sres_blocking.c: validating calloc() return value Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_blocking.c Fri Mar 7 12:52:20 2008 @@ -113,6 +113,9 @@ { int i, N = b->n_sockets; + if (b == NULL) + return -1; + if (old_socket == new_socket) { if (old_socket == INVALID_SOCKET) { free(b); /* Destroy us */ @@ -233,11 +236,13 @@ /* Create a synchronous (blocking) interface towards resolver */ b = calloc(1, sizeof *b); - for (i = 0; i < SRES_MAX_NAMESERVERS; i++) - b->fds[i].fd = INVALID_SOCKET; + if (b) { + for (i = 0; i < SRES_MAX_NAMESERVERS; i++) + b->fds[i].fd = INVALID_SOCKET; - if (!sres_resolver_set_async(res, sres_blocking_update, b, 0)) { - free(b), b = NULL; + if (!sres_resolver_set_async(res, sres_blocking_update, b, 0)) { + free(b), b = NULL; + } } return b;

1 0

[commit] r7827 - in freeswitch/trunk/libs/sofia-sip: libsofia-sip-ua/su m4
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:50:32 2008 New Revision: 7827 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Log: Fri Mar 7 12:24:05 EST 2008 Pekka.Pessi(a)nokia.com * su_alloc.c: using safe free Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Mar 7 12:50:32 2008 @@ -203,6 +203,12 @@ void (*_su_home_destroy_mutexes)(void *mutex); +#if HAVE_FREE_NULL +#define safefree(x) free((x)) +#else +su_inline void safefree(void *b) { b ? free(b) : (void)0; } +#endif + #define MEMLOCK(h) \ ((void)((h) && (h)->suh_lock ? _su_home_locker((h)->suh_lock) : 0), (h)->suh_blocks) #define UNLOCK(h) ((void)((h) && (h)->suh_lock ? _su_home_unlocker((h)->suh_lock) : 0), NULL) @@ -457,7 +463,7 @@ home->suh_blocks = b2; if (sub && !sub->sub_auto) - free(sub); + safefree(sub); sub = b2; } @@ -500,7 +506,7 @@ subhome->suh_blocks = su_hash_alloc(SUB_N); if (!subhome->suh_blocks) - return (void)free(data), NULL; + return (void)safefree(data), NULL; subhome->suh_size = (unsigned)size; subhome->suh_blocks->sub_parent = home; @@ -555,7 +561,7 @@ if (home->suh_blocks) home->suh_blocks->sub_hauto = 0; else - free(home), home = NULL; + safefree(home), home = NULL; } return home; @@ -670,7 +676,7 @@ int hauto = sub->sub_hauto; _su_home_deinit(home); if (!hauto) - free(home); + safefree(home); /* UNLOCK(home); */ return 1; } @@ -827,7 +833,7 @@ UNLOCK(home); } - free(data); + safefree(data); } /** Check home consistency. @@ -977,8 +983,8 @@ } else if (su_is_preloaded(b, b->sub_nodes[i].sua_data)) continue; - safe_free(b->sub_nodes[i].sua_data); - + + safefree(b->sub_nodes[i].sua_data); } } Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Fri Mar 7 12:50:32 2008 @@ -202,6 +202,28 @@ Define this as 1 if your compiler puts the variable argument list nicely in memory]) fi +### ====================================================================== +### Test if free(0) fails +### + +AC_CACHE_CHECK([for graceful free(0)],[ac_cv_free_null],[ +ac_cv_free_null=no + +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <stdlib.h> + +int main(int avc, char **av) +{ + free(0); + return 0; +} +]])],[ac_cv_free_null=yes],[ac_cv_free_null=no],[ac_cv_free_null=no])]) + +if test $ac_cv_free_null = yes ; then +AC_DEFINE([HAVE_FREE_NULL], 1, [ +Define this as 1 if your c library does not crash with free(0)]) +fi + dnl ====================================================================== dnl Socket features

1 0

[commit] r7826 - freeswitch/trunk/libs/sofia-sip/tests
by Freeswitch SVN 07 Mar '08

07 Mar '08

Author: mikej Date: Fri Mar 7 12:47:44 2008 New Revision: 7826 Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Log: Fri Mar 7 11:49:17 EST 2008 Pekka.Pessi(a)nokia.com * tests/Makefile: using testsdir, installing check_sofia there Modified: freeswitch/trunk/libs/sofia-sip/tests/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/tests/Makefile.am Fri Mar 7 12:47:44 2008 @@ -5,7 +5,8 @@ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c TESTS = -check_PROGRAMS = +tests_PROGRAMS = +testsdir := ${libdir}/tests/libsofia-sip-ua-tests include $(top_srcdir)/rules/sofia.am @@ -14,20 +15,21 @@ AM_CFLAGS += @CHECK_CFLAGS@ if HAVE_CHECK + TESTS += check_sofia -check_PROGRAMS += check_sofia +tests_PROGRAMS += check_sofia check_sofia_SOURCES = check_sofia.c check_sofia.h \ suite_for_nua.c -${sofiabuilddir}/nua/libtestnua.la \ +CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \ ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la: + ${sofiabuilddir}/nua/libtestnat.la + +$(CHECKLIBS): cd ${sofiabuilddir}/nua && make checklib check_sofia_LDADD = \ - ${sofiabuilddir}/nua/libtestnua.la \ - ${sofiabuilddir}/nua/libtestproxy.la \ - ${sofiabuilddir}/nua/libtestnat.la \ - ${sofiabuilddir}/libsofia-sip-ua.la @CHECK_LIBS@ + $(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \ + @CHECK_LIBS@ endif

1 0