- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12676 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:52:53 2009 New Revision: 12676 Log: FSCORE-322 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mar 19 20:52:53 2009 @@ -303,14 +303,14 @@ switch_core_session_rwunlock(a_session); } - - if (tech_pvt->nh && !sofia_test_flag(tech_pvt, TFLAG_BYE)) { char reason[128] = ""; switch_stream_handle_t stream = { 0 }; switch_event_header_t *hi; char *bye_headers = NULL; + sofia_set_flag_locked(tech_pvt, TFLAG_BYE); + SWITCH_STANDARD_STREAM(stream); if ((hi = switch_channel_variable_first(channel))) { for (; hi; hi = hi->next) { @@ -337,7 +337,7 @@ switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } - if (sofia_test_flag(tech_pvt, TFLAG_ANS)) { + if (switch_channel_test_flag(channel, CF_ANSWERED)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); } @@ -347,11 +347,12 @@ TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), TAG_END()); } else { - if (sofia_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel)); if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel"); } + nua_cancel(tech_pvt->nh, SIPTAG_REASON_STR(reason), TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), @@ -362,14 +363,16 @@ if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse"); } - nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), - SIPTAG_REASON_STR(reason), - TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), - TAG_END()); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), + SIPTAG_REASON_STR(reason), + TAG_IF(!switch_strlen_zero(bye_headers), SIPTAG_HEADER_STR(bye_headers)), + TAG_END()); + } } } - sofia_set_flag(tech_pvt, TFLAG_BYE); + switch_safe_free(stream.data); } @@ -431,7 +434,7 @@ is_proxy = (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)); if (b_sdp && is_proxy) { - tech_pvt->local_sdp_str = switch_core_session_strdup(session, b_sdp); + sofia_glue_tech_set_local_sdp(tech_pvt, b_sdp, SWITCH_TRUE); if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { sofia_glue_tech_patch_sdp(tech_pvt); @@ -443,13 +446,16 @@ /* This if statement check and handles the 3pcc proxy mode */ if (sofia_test_pflag(tech_pvt->profile, PFLAG_3PCC_PROXY) && sofia_test_flag(tech_pvt, TFLAG_3PCC)) { /* Send the 200 OK */ - nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n"); - + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n"); + } + /* Unlock the session signal to allow the ack to make it in */ // Maybe we should timeout? switch_mutex_unlock(tech_pvt->sofia_mutex); @@ -520,15 +526,16 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - - nua_respond(tech_pvt->nh, SIP_200_OK, - NUTAG_AUTOANSWER(0), - TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), - NUTAG_SESSION_TIMER(session_timeout), - SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - sofia_set_flag_locked(tech_pvt, TFLAG_ANS); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_respond(tech_pvt->nh, SIP_200_OK, + NUTAG_AUTOANSWER(0), + TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), + NUTAG_SESSION_TIMER(session_timeout), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + sofia_set_flag_locked(tech_pvt, TFLAG_ANS); + } return SWITCH_STATUS_SUCCESS; } @@ -976,7 +983,7 @@ private_object_t *tech_pvt = switch_core_session_get_private(session); switch_status_t status = SWITCH_STATUS_SUCCESS; - if (switch_channel_down(channel) || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt || sofia_test_flag(tech_pvt, TFLAG_BYE)) { status = SWITCH_STATUS_FALSE; goto end; } @@ -1010,11 +1017,11 @@ default: break; } - + /* ones that do need to lock sofia mutex */ switch_mutex_lock(tech_pvt->sofia_mutex); - if (switch_channel_down(channel) || !tech_pvt) { + if (switch_channel_down(channel) || !tech_pvt || sofia_test_flag(tech_pvt, TFLAG_BYE)) { status = SWITCH_STATUS_FALSE; goto end_lock; } @@ -1046,11 +1053,13 @@ sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } - nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - switch_channel_mark_answered(channel); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_channel_mark_answered(channel); + } } break; case SWITCH_MESSAGE_INDICATE_NOMEDIA: @@ -1061,7 +1070,8 @@ const char *ip = NULL, *port = NULL; switch_channel_set_flag(channel, CF_PROXY_MODE); - tech_pvt->local_sdp_str = NULL; + sofia_glue_tech_set_local_sdp(tech_pvt, NULL, SWITCH_FALSE); + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); @@ -1085,7 +1095,8 @@ { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Sending media re-direct:\n%s\n", switch_channel_get_name(channel), msg->string_arg); - tech_pvt->local_sdp_str = switch_core_session_strdup(session, msg->string_arg); + sofia_glue_tech_set_local_sdp(tech_pvt, msg->string_arg, SWITCH_TRUE); + sofia_set_flag_locked(tech_pvt, TFLAG_SENT_UPDATE); sofia_glue_do_invite(session); } @@ -1112,7 +1123,7 @@ uint32_t send_invite = 1; switch_channel_clear_flag(channel, CF_PROXY_MODE); - tech_pvt->local_sdp_str = NULL; + sofia_glue_tech_set_local_sdp(tech_pvt, NULL, SWITCH_FALSE); if (!switch_channel_media_ready(channel)) { if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { @@ -1175,7 +1186,7 @@ break; case SWITCH_MESSAGE_INDICATE_REDIRECT: if (!switch_strlen_zero(msg->string_arg)) { - if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); sofia_set_flag_locked(tech_pvt, TFLAG_BYE); @@ -1212,7 +1223,7 @@ if (msg->numeric_arg || msg->string_arg) { int code = msg->numeric_arg; const char *reason = NULL; - + if (code) { reason = msg->string_arg; } else { @@ -1229,6 +1240,12 @@ code = 488; } + if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { + if (sofia_test_flag(tech_pvt, TFLAG_BYE)) { + goto end_lock; + } + } + if (switch_strlen_zero(reason) && code != 407 && code != 302) { reason = sip_status_phrase(code); if (switch_strlen_zero(reason)) { @@ -1260,11 +1277,12 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), - SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), - TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); - if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), + SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), + TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); + sofia_set_flag_locked(tech_pvt, TFLAG_BYE); } } else if (code == 302 && !switch_strlen_zero(msg->string_arg)) { @@ -1274,31 +1292,30 @@ msg->string_arg = p; switch_core_session_receive_message(session, msg); goto end_lock; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason); - - if (!switch_strlen_zero(((char *) msg->pointer_arg))) { - tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, (char *) msg->pointer_arg); - if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { - sofia_glue_tech_patch_sdp(tech_pvt); - sofia_glue_tech_proxy_remote_addr(tech_pvt); + } else if (!switch_channel_test_flag(channel, CF_ANSWERED)) { + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason); + if (!switch_strlen_zero(((char *) msg->pointer_arg))) { + sofia_glue_tech_set_local_sdp(tech_pvt, (char *) msg->pointer_arg, SWITCH_TRUE); + + if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { + sofia_glue_tech_patch_sdp(tech_pvt); + sofia_glue_tech_proxy_remote_addr(tech_pvt); + } + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + } else { + nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); } - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - } else { - nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); - } - if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { - sofia_set_flag_locked(tech_pvt, TFLAG_BYE); } } } break; case SWITCH_MESSAGE_INDICATE_RINGING: - if (!switch_channel_test_flag(channel, CF_RING_READY) && + if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); switch_channel_mark_ring_ready(channel); @@ -1321,10 +1338,12 @@ if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { const char *sdp = NULL; if ((sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE))) { - tech_pvt->local_sdp_str = switch_core_session_strdup(session, sdp); + sofia_glue_tech_set_local_sdp(tech_pvt, sdp, SWITCH_TRUE); } if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { + sofia_glue_tech_patch_sdp(tech_pvt); + if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) { status = SWITCH_STATUS_FALSE; goto end_lock; @@ -1369,16 +1388,17 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - - nua_respond(tech_pvt->nh, - SIP_183_SESSION_PROGRESS, - NUTAG_AUTOANSWER(0), - TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), - SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), - SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); + if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { + nua_respond(tech_pvt->nh, + SIP_183_SESSION_PROGRESS, + NUTAG_AUTOANSWER(0), + TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), + SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); + } } } break; @@ -1392,6 +1412,10 @@ end: + if (switch_channel_down(channel) || !tech_pvt || sofia_test_flag(tech_pvt, TFLAG_BYE)) { + status = SWITCH_STATUS_FALSE; + } + return status; } 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 Thu Mar 19 20:52:53 2009 @@ -510,8 +510,13 @@ char *rm_fmtp; char *fmtp_out; char *remote_sdp_str; + int crypto_tag; + unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; + unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; + switch_rtp_crypto_key_type_t crypto_send_type; + switch_rtp_crypto_key_type_t crypto_recv_type; + switch_rtp_crypto_key_type_t crypto_type; char *local_sdp_str; - char *orig_local_sdp_str; char *dest; char *dest_to; char *key; @@ -533,12 +538,6 @@ char *stun_ip; switch_port_t stun_port; uint32_t stun_flags; - int crypto_tag; - unsigned char local_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; - unsigned char remote_raw_key[SWITCH_RTP_MAX_CRYPTO_LEN]; - switch_rtp_crypto_key_type_t crypto_send_type; - switch_rtp_crypto_key_type_t crypto_recv_type; - switch_rtp_crypto_key_type_t crypto_type; unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; @@ -837,3 +836,4 @@ */ int sofia_get_loglevel(const char *name); sofia_cid_type_t sofia_cid_name2type(const char *name); +void sofia_glue_tech_set_local_sdp(private_object_t *tech_pvt, const char *sdp_str, switch_bool_t dup); 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 Mar 19 20:52:53 2009 @@ -342,8 +342,21 @@ } else if (!switch_strlen_zero(sofia_private->uuid)) { if ((session = switch_core_session_locate(sofia_private->uuid))) { tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt); - channel = switch_core_session_get_channel(tech_pvt->session); + channel = switch_core_session_get_channel(session); + if (tech_pvt) { + + if (status >= 300) { + sofia_set_flag_locked(tech_pvt, TFLAG_BYE); + } + + switch_mutex_lock(tech_pvt->sofia_mutex); + locked = 1; + } else { + switch_core_session_rwunlock(session); + return; + } + + if (status >= 180 && !*sofia_private->auth_gateway_name) { const char *gwname = switch_channel_get_variable(channel, "sip_use_gateway"); if (!switch_strlen_zero(gwname)) { @@ -369,11 +382,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); goto done; } - - if (tech_pvt) { - switch_mutex_lock(tech_pvt->sofia_mutex); - locked = 1; - } } else if (sofia_private && sofia_private->is_call) { sofia_private->destroy_me = 22; } @@ -542,13 +550,13 @@ sofia_reg_release_gateway(gateway); } + if (locked && tech_pvt) { + switch_mutex_unlock(tech_pvt->sofia_mutex); + } + if (session) { switch_core_session_rwunlock(session); } - - if (tech_pvt && locked) { - switch_mutex_unlock(tech_pvt->sofia_mutex); - } } void event_handler(switch_event_t *event) @@ -697,6 +705,8 @@ switch_thread_t *worker_thread; switch_status_t st; + + switch_mutex_lock(mod_sofia_globals.mutex); mod_sofia_globals.threads++; switch_mutex_unlock(mod_sofia_globals.mutex); @@ -2798,13 +2808,13 @@ if (session) { channel = switch_core_session_get_channel(session); tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); - if (!tech_pvt->nh) { + + if (!tech_pvt || !tech_pvt->nh) { goto done; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s]\n", - switch_channel_get_name(channel), nua_callstate_name(ss_state)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s][%d]\n", + switch_channel_get_name(channel), nua_callstate_name(ss_state), status); if (r_sdp) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp); @@ -2894,7 +2904,6 @@ if (!switch_channel_get_variable(other_channel, SWITCH_B_SDP_VARIABLE)) { switch_channel_set_variable(other_channel, SWITCH_B_SDP_VARIABLE, r_sdp); } - switch_channel_pre_answer(other_channel); switch_core_session_rwunlock(other_session); } @@ -3071,13 +3080,13 @@ if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_message_t msg = { 0 }; - + if (profile->media_options & MEDIA_OPT_MEDIA_ON_HOLD) { tech_pvt->hold_laps = 1; switch_channel_set_variable(channel, SWITCH_R_SDP_VARIABLE, r_sdp); switch_channel_clear_flag(channel, CF_PROXY_MODE); - tech_pvt->local_sdp_str = NULL; - + sofia_glue_tech_set_local_sdp(tech_pvt, NULL, SWITCH_FALSE); + 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); @@ -3329,44 +3338,44 @@ tech_pvt->q850_cause = SWITCH_CAUSE_MANDATORY_IE_MISSING; } case nua_callstate_terminated: - if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { - sofia_set_flag_locked(tech_pvt, TFLAG_BYE); - if (sofia_test_flag(tech_pvt, TFLAG_NOHUP)) { - sofia_clear_flag_locked(tech_pvt, TFLAG_NOHUP); + if (sofia_test_flag(tech_pvt, TFLAG_NOHUP)) { + sofia_clear_flag_locked(tech_pvt, TFLAG_NOHUP); + } else if (switch_channel_up(channel)) { + int cause; + if (tech_pvt->q850_cause) { + cause = tech_pvt->q850_cause; } else { - int cause; - if (tech_pvt->q850_cause) { - cause = tech_pvt->q850_cause; - } else { - cause = sofia_glue_sip_cause_to_freeswitch(status); - } - if (status) { - switch_snprintf(st, sizeof(st), "%d", status); - switch_channel_set_variable(channel, "sip_term_status", st); - switch_snprintf(st, sizeof(st), "sip:%d", status); - switch_channel_set_variable_partner(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); - switch_channel_set_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); - if (phrase) { - switch_channel_set_variable_partner(channel, "sip_hangup_phrase", phrase); - } + cause = sofia_glue_sip_cause_to_freeswitch(status); + } + if (status) { + switch_snprintf(st, sizeof(st), "%d", status); + switch_channel_set_variable(channel, "sip_term_status", st); + switch_snprintf(st, sizeof(st), "sip:%d", status); + switch_channel_set_variable_partner(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); + switch_channel_set_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); + if (phrase) { + switch_channel_set_variable_partner(channel, "sip_hangup_phrase", phrase); } - switch_snprintf(st, sizeof(st), "%d", cause); - switch_channel_set_variable(channel, "sip_term_cause", st); - switch_channel_hangup(channel, cause); } + switch_snprintf(st, sizeof(st), "%d", cause); + switch_channel_set_variable(channel, "sip_term_cause", st); + switch_channel_hangup(channel, cause); } + + if (ss_state == nua_callstate_terminated) { if (tech_pvt->sofia_private) { tech_pvt->sofia_private = NULL; } tech_pvt->nh = NULL; - + if (nh) { nua_handle_bind(nh, NULL); nua_handle_destroy(nh); } } + break; } @@ -4616,7 +4625,7 @@ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } - + if (!(sofia_private = malloc(sizeof(*sofia_private)))) { abort(); } 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 Mar 19 20:52:53 2009 @@ -103,8 +103,7 @@ t38_options->T38VendorInfo ); - - tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, buf); + sofia_glue_tech_set_local_sdp(tech_pvt, buf, SWITCH_TRUE); } void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32_t port, const char *sr, int force) @@ -392,8 +391,7 @@ } } } - - tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, buf); + sofia_glue_tech_set_local_sdp(tech_pvt, buf, SWITCH_TRUE); } void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) @@ -862,16 +860,17 @@ return new_uri; } +#define RA_PTR_LEN 512 switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt) { const char *err; - char rip[128] = ""; - char rp[128] = ""; - char rvp[128] = ""; - char *p, *ip_ptr = NULL, *port_ptr = NULL, *vid_port_ptr = NULL; + char rip[RA_PTR_LEN] = ""; + char rp[RA_PTR_LEN] = ""; + char rvp[RA_PTR_LEN] = ""; + char *p, *ip_ptr = NULL, *port_ptr = NULL, *vid_port_ptr = NULL, *pe; int x; const char *val; - + if (switch_strlen_zero(tech_pvt->remote_sdp_str)) { return SWITCH_STATUS_FALSE; } @@ -898,24 +897,34 @@ } p = ip_ptr; + pe = p + strlen(p); x = 0; - while (x < sizeof(rip) && p && *p && ((*p >= '0' && *p <= '9') || *p == '.' || *p == ':' || (*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F'))) { + while (x < sizeof(rip) - 1 && p && *p && ((*p >= '0' && *p <= '9') || *p == '.' || *p == ':' || (*p >= 'a' && *p <= 'f') || (*p >= 'A' && *p <= 'F'))) { rip[x++] = *p; p++; + if (p >= pe) { + return SWITCH_STATUS_FALSE; + } } p = port_ptr; x = 0; - while (x < sizeof(rp) && p && *p && (*p >= '0' && *p <= '9')) { + while (x < sizeof(rp) - 1 && p && *p && (*p >= '0' && *p <= '9')) { rp[x++] = *p; p++; + if (p >= pe) { + return SWITCH_STATUS_FALSE; + } } p = vid_port_ptr; x = 0; - while (x < sizeof(rvp) && p && *p && (*p >= '0' && *p <= '9')) { + while (x < sizeof(rvp) - 1 && p && *p && (*p >= '0' && *p <= '9')) { rvp[x++] = *p; p++; + if (p >= pe) { + return SWITCH_STATUS_FALSE; + } } if (!(*rip && *rp)) { @@ -965,12 +974,9 @@ tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); return SWITCH_STATUS_SUCCESS; } - - } - - if (switch_rtp_ready(tech_pvt->rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != - SWITCH_STATUS_SUCCESS) { + + if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, + tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP CHANGING DEST TO: [%s:%d]\n", @@ -990,17 +996,19 @@ void sofia_glue_tech_patch_sdp(private_object_t *tech_pvt) { switch_size_t len; - char *p, *q; + char *p, *q, *pe , *qe; int has_video=0,has_audio=0,has_ip=0; char port_buf[25] = ""; char vport_buf[25] = ""; + char *new_sdp; + int bad = 0; if (switch_strlen_zero(tech_pvt->local_sdp_str)) { return; } - len = strlen(tech_pvt->local_sdp_str) + 384; - + len = strlen(tech_pvt->local_sdp_str) * 2; + if (switch_stristr("sendonly", tech_pvt->local_sdp_str) || switch_stristr("0.0.0.0", tech_pvt->local_sdp_str)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n"); return; @@ -1016,14 +1024,26 @@ tech_pvt->codec_ms = 20; } + new_sdp = switch_core_session_alloc(tech_pvt->session, len); switch_snprintf(port_buf, sizeof(port_buf), "%u", tech_pvt->adv_sdp_audio_port); - tech_pvt->orig_local_sdp_str = tech_pvt->local_sdp_str; - tech_pvt->local_sdp_str = switch_core_session_alloc(tech_pvt->session, len); + - p = tech_pvt->orig_local_sdp_str; - q = tech_pvt->local_sdp_str; + p = tech_pvt->local_sdp_str; + q = new_sdp; + pe = p + strlen(p); + qe = q + len - 1; while(p && *p) { + if (p >= pe) { + bad = 1; + goto end; + } + + if (q >= qe) { + bad = 2; + goto end; + } + if (tech_pvt->adv_sdp_audio_ip && !strncmp("c=IN IP", p, 7)) { strncpy(q, p, 9); p += 9; @@ -1032,19 +1052,46 @@ q += strlen(tech_pvt->adv_sdp_audio_ip); while(p && *p && ((*p >= '0' && *p <= '9') || *p == '.' || *p == ':' || (*p >= 'A' && *p <= 'F') || (*p >= 'a' && *p <= 'f'))) { + if (p >= pe) { + bad = 3; + goto end; + } p++; } has_ip++; } else if (!strncmp("m=audio ", p, 8) || (!strncmp("m=image ", p, 8))) { - strncpy(q,p,8); + strncpy(q, p, 8); p += 8; + + if (p >= pe) { + bad = 4; + goto end; + } + + q += 8; + + if (q >= qe) { + bad = 5; + goto end; + } + + strncpy(q, port_buf, strlen(port_buf)); q += strlen(port_buf); + if (q >= qe) { + bad = 6; + goto end; + } + while (p && *p && (*p >= '0' && *p <= '9')) { + if (p >= pe) { + bad = 7; + goto end; + } p++; } @@ -1061,33 +1108,102 @@ strncpy(q, p, 8); p += 8; + + if (p >= pe) { + bad = 8; + goto end; + } + q += 8; + + if (q >= qe) { + bad = 9; + goto end; + } + strncpy(q, vport_buf, strlen(vport_buf)); q += strlen(vport_buf); + if (q >= qe) { + bad = 10; + goto end; + } + while (p && *p && (*p >= '0' && *p <= '9')) { + + if (p >= pe) { + bad = 11; + goto end; + } + p++; } - + has_video++; } while (p && *p && *p != '\n') { + + if (p >= pe) { + bad = 12; + goto end; + } + + if (q >= qe) { + bad = 13; + goto end; + } + *q++ = *p++; } + + if (p >= pe) { + bad = 14; + goto end; + } + + if (q >= qe) { + bad = 15; + goto end; + } *q++ = *p++; + } + end: + + if (bad) { + return; + } + + + if (switch_channel_down(tech_pvt->channel) || sofia_test_flag(tech_pvt, TFLAG_BYE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s too late.\n", switch_channel_get_name(tech_pvt->channel)); + return; + } + + if (!has_ip && !has_audio) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str); - tech_pvt->local_sdp_str = tech_pvt->orig_local_sdp_str; return; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Patched SDP\n---\n%s\n+++\n%s\n", - switch_channel_get_name(tech_pvt->channel), tech_pvt->orig_local_sdp_str, tech_pvt->local_sdp_str); + switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str, new_sdp); + + sofia_glue_tech_set_local_sdp(tech_pvt, new_sdp, SWITCH_FALSE); + +} + + +void sofia_glue_tech_set_local_sdp(private_object_t *tech_pvt, const char *sdp_str, switch_bool_t dup) +{ + switch_mutex_lock(tech_pvt->sofia_mutex); + tech_pvt->local_sdp_str = dup ? switch_core_session_strdup(tech_pvt->session, sdp_str) : (char *)sdp_str; + switch_mutex_unlock(tech_pvt->sofia_mutex); } @@ -1298,7 +1414,6 @@ SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END()); - if (tech_pvt->dest && (strstr(tech_pvt->dest, ";fs_nat") || strstr(tech_pvt->dest, ";received") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val)))) { @@ -1570,7 +1685,7 @@ } sdp_parser_free(parser); } - tech_pvt->local_sdp_str = switch_core_session_strdup(tech_pvt->session, sdp_str); + sofia_glue_tech_set_local_sdp(tech_pvt, sdp_str, SWITCH_TRUE); } } @@ -1883,6 +1998,11 @@ const char *var; switch_assert(tech_pvt != NULL); + + if (switch_channel_down(tech_pvt->channel) || sofia_test_flag(tech_pvt, TFLAG_BYE)) { + return SWITCH_STATUS_FALSE; + } + switch_mutex_lock(tech_pvt->sofia_mutex); if (switch_rtp_ready(tech_pvt->rtp_session)) { @@ -1893,7 +2013,6 @@ sofia_set_flag_locked(tech_pvt, TFLAG_SECURE); } - if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE)) { status = SWITCH_STATUS_SUCCESS; goto end; @@ -1997,6 +2116,7 @@ if ((status = sofia_glue_tech_proxy_remote_addr(tech_pvt)) != SWITCH_STATUS_SUCCESS) { goto end; } + if (!sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_RTP_AUTOADJ) && !((val = switch_channel_get_variable(tech_pvt->channel, "disable_rtp_auto_adjust")) && switch_true(val))) { flags = (switch_rtp_flag_t) (SWITCH_RTP_FLAG_PROXY_MEDIA | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_DATAWAIT); @@ -2005,7 +2125,8 @@ } timer_name = NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "PROXY AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "PROXY AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_audio_port, @@ -2014,20 +2135,23 @@ } else { timer_name = tech_pvt->profile->timer_name; - } - if ((var = switch_channel_get_variable(tech_pvt->channel, "rtp_timer_name"))) { - timer_name = (char *) var; + if ((var = switch_channel_get_variable(tech_pvt->channel, "rtp_timer_name"))) { + timer_name = (char *) var; + } } - tech_pvt->rtp_session = switch_rtp_new(tech_pvt->local_sdp_audio_ip, - tech_pvt->local_sdp_audio_port, - tech_pvt->remote_sdp_audio_ip, - tech_pvt->remote_sdp_audio_port, - tech_pvt->agreed_pt, - tech_pvt->read_impl.samples_per_packet, - tech_pvt->codec_ms * 1000, - (switch_rtp_flag_t) flags, timer_name, &err, switch_core_session_get_pool(tech_pvt->session)); + if (switch_channel_up(tech_pvt->channel) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) { + tech_pvt->rtp_session = switch_rtp_new(tech_pvt->local_sdp_audio_ip, + tech_pvt->local_sdp_audio_port, + tech_pvt->remote_sdp_audio_ip, + tech_pvt->remote_sdp_audio_port, + tech_pvt->agreed_pt, + tech_pvt->read_impl.samples_per_packet, + tech_pvt->codec_ms * 1000, + (switch_rtp_flag_t) flags, timer_name, &err, + switch_core_session_get_pool(tech_pvt->session)); + } if (switch_rtp_ready(tech_pvt->rtp_session)) { uint8_t vad_in = sofia_test_flag(tech_pvt, TFLAG_VAD_IN) ? 1 : 0; @@ -2223,19 +2347,18 @@ switch_assert(tech_pvt != NULL); switch_assert(r_sdp != NULL); - parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0); - if (switch_strlen_zero(r_sdp)) { return SWITCH_STATUS_FALSE; } - if (tech_pvt->num_codecs) { - if ((sdp = sdp_session(parser))) { - match = sofia_glue_negotiate_sdp(tech_pvt->session, sdp); + if ((parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) { + + if (tech_pvt->num_codecs) { + if ((sdp = sdp_session(parser))) { + match = sofia_glue_negotiate_sdp(tech_pvt->session, sdp); + } } - } - - if (parser) { + sdp_parser_free(parser); }

1 0

[commit] r12675 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:51:50 2009 New Revision: 12675 Log: use apr_pool_mutex_set to make pools thread safe Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Thu Mar 19 20:51:50 2009 @@ -39,13 +39,17 @@ //#define DEBUG_ALLOC2 //#define DESTROY_POOLS //#define INSTANTLY_DESTROY_POOLS -/*#define LOCK_MORE*/ +//#define LOCK_MORE +//#define USE_MEM_LOCK +//#define SWITCH_POOL_RECYCLE #ifndef SWITCH_POOL_RECYCLE #define PER_POOL_LOCK 1 #endif static struct { +#ifdef USE_MEM_LOCK switch_mutex_t *mem_lock; +#endif switch_queue_t *pool_queue; /* 8 ball break */ switch_queue_t *pool_recycle_queue; switch_memory_pool_t *memory_pool; @@ -69,8 +73,10 @@ switch_assert(session->pool != NULL); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif #ifdef DEBUG_ALLOC if (memory > 500) @@ -83,8 +89,10 @@ memset(ptr, 0, memory); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return ptr; } @@ -98,8 +106,10 @@ switch_assert(memory_manager.memory_pool != NULL); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif #ifdef DEBUG_ALLOC switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Perm Allocate %d\n", (int) memory); @@ -111,8 +121,10 @@ memset(ptr, 0, memory); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return ptr; } @@ -127,8 +139,10 @@ return NULL; #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif len = strlen(todup) + 1; duped = apr_pstrmemdup(memory_manager.memory_pool, todup, len); @@ -139,8 +153,10 @@ #endif #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return duped; } @@ -151,8 +167,10 @@ char *result = NULL; #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif switch_assert(session != NULL); switch_assert(session->pool != NULL); @@ -163,8 +181,10 @@ va_end(ap); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return result; } @@ -177,8 +197,10 @@ switch_assert(pool != NULL); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif va_start(ap, fmt); @@ -187,8 +209,10 @@ va_end(ap); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return result; } @@ -196,31 +220,37 @@ SWITCH_DECLARE(char *) switch_core_perform_session_strdup(switch_core_session_t *session, const char *todup, const char *file, const char *func, int line) { char *duped = NULL; - switch_size_t len; switch_assert(session != NULL); switch_assert(session->pool != NULL); +#ifdef DEBUG_ALLOC + switch_size_t len; +#endif if (!todup) { return NULL; } #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif - len = strlen(todup) + 1; + #ifdef DEBUG_ALLOC + len = strlen(todup); if (len > 500) switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Sess Strdup Allocate %d\n", (int) len); #endif - duped = apr_pstrmemdup(session->pool, todup, len); + duped = strdup(todup); switch_assert(duped != NULL); - - + #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return duped; } @@ -235,8 +265,10 @@ return NULL; } #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif len = strlen(todup) + 1; @@ -249,8 +281,10 @@ switch_assert(duped != NULL); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return duped; } @@ -275,7 +309,9 @@ void *pop = NULL; #endif +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); +#endif switch_assert(pool != NULL); #ifndef PER_POOL_LOCK @@ -286,21 +322,22 @@ #ifdef PER_POOL_LOCK if ((apr_allocator_create(&my_allocator)) != APR_SUCCESS) { - return SWITCH_STATUS_MEMERR; + abort(); } if ((apr_pool_create_ex(pool, NULL, NULL, my_allocator)) != APR_SUCCESS) { - apr_allocator_destroy(my_allocator); - my_allocator = NULL; - return SWITCH_STATUS_MEMERR; + abort(); } - if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_DEFAULT, *pool)) != APR_SUCCESS) { - return SWITCH_STATUS_MEMERR; + if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_NESTED, *pool)) != APR_SUCCESS) { + abort(); } apr_allocator_mutex_set(my_allocator, my_mutex); apr_allocator_owner_set(my_allocator, *pool); + + apr_pool_mutex_set(*pool, my_mutex); + #else apr_pool_create(pool, NULL); switch_assert(*pool != NULL); @@ -313,7 +350,11 @@ #endif tmp = switch_core_sprintf(*pool, "%s:%d", func, line); apr_pool_tag(*pool, tmp); + + +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); +#endif return SWITCH_STATUS_SUCCESS; } @@ -327,10 +368,22 @@ #endif #ifdef INSTANTLY_DESTROY_POOLS +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(*pool); +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif #else if ((memory_manager.pool_thread_running != 1) || (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS)) { +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(*pool); +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif } #endif @@ -346,8 +399,10 @@ switch_assert(pool != NULL); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); #endif +#endif #ifdef DEBUG_ALLOC if (memory > 500) @@ -360,8 +415,10 @@ memset(ptr, 0, memory); #ifdef LOCK_MORE +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); #endif +#endif return ptr; } @@ -379,7 +436,13 @@ if (!pool) { break; } +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(pool); +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif } #endif return; @@ -396,7 +459,9 @@ int x = len, done = 0; switch_yield(1000000); +#ifdef USE_MEM_LOCK switch_mutex_lock(memory_manager.mem_lock); +#endif while (x > 0) { void *pop = NULL; if (switch_queue_pop(memory_manager.pool_queue, &pop) != SWITCH_STATUS_SUCCESS || !pop) { @@ -405,16 +470,31 @@ } #if defined(PER_POOL_LOCK) || defined(DESTROY_POOLS) +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(pop); +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif #else apr_pool_clear(pop); if (switch_queue_trypush(memory_manager.pool_recycle_queue, pop) != SWITCH_STATUS_SUCCESS) { +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(pop); +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif + } #endif x--; } +#ifdef USE_MEM_LOCK switch_mutex_unlock(memory_manager.mem_lock); +#endif if (done) { goto done; } @@ -429,8 +509,15 @@ { void *pop = NULL; while (switch_queue_trypop(memory_manager.pool_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { +#ifdef USE_MEM_LOCK + switch_mutex_lock(memory_manager.mem_lock); +#endif apr_pool_destroy(pop); pop = NULL; +#ifdef USE_MEM_LOCK + switch_mutex_unlock(memory_manager.mem_lock); +#endif + } } @@ -439,14 +526,17 @@ return NULL; } +#ifndef INSTANTLY_DESTROY_POOLS static switch_thread_t *pool_thread_p = NULL; +#endif void switch_core_memory_stop(void) { +#ifndef INSTANTLY_DESTROY_POOLS switch_status_t st; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Stopping memory pool queue.\n"); -#ifndef INSTANTLY_DESTROY_POOLS + memory_manager.pool_thread_running = -1; switch_thread_join(&st, pool_thread_p); @@ -490,7 +580,9 @@ switch_assert(memory_manager.memory_pool != NULL); #endif +#ifdef USE_MEM_LOCK switch_mutex_init(&memory_manager.mem_lock, SWITCH_MUTEX_NESTED, memory_manager.memory_pool); +#endif #ifdef INSTANTLY_DESTROY_POOLS {

1 0

[commit] r12674 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:50:50 2009 New Revision: 12674 Log: make switch_channel_get_variable strdup so the pointer returned is safe and clean up the state locking Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Mar 19 20:50:50 2009 @@ -506,6 +506,9 @@ v = switch_core_get_variable(varname); } } + + if (v) v = switch_core_session_strdup(channel->session, v); + switch_mutex_unlock(channel->profile_mutex); return v; @@ -528,6 +531,8 @@ } } + if (val) val = switch_core_session_strdup(channel->session, val); + return val; } @@ -870,9 +875,7 @@ switch_channel_state_t state; switch_assert(channel != NULL); - switch_mutex_lock(channel->state_mutex); state = channel->state; - switch_mutex_unlock(channel->state_mutex); return state; } @@ -882,9 +885,7 @@ switch_channel_state_t state; switch_assert(channel != NULL); - switch_mutex_lock(channel->state_mutex); state = channel->running_state; - switch_mutex_unlock(channel->state_mutex); return state; } @@ -1201,9 +1202,8 @@ if (ok) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]); - switch_mutex_lock(channel->state_mutex); + channel->state = state; - switch_mutex_unlock(channel->state_mutex); if (state == CS_HANGUP && !channel->hangup_cause) { channel->hangup_cause = SWITCH_CAUSE_NORMAL_CLEARING; @@ -1228,7 +1228,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_basic_data(switch_channel_t *channel, switch_event_t *event) { switch_caller_profile_t *caller_profile, *originator_caller_profile = NULL, *originatee_caller_profile = NULL; - switch_codec_t *codec; + switch_codec_implementation_t impl = {0}; char state_num[25]; switch_mutex_lock(channel->profile_mutex); @@ -1258,14 +1258,18 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Answer-State", "ringing"); } - if ((codec = switch_core_session_get_read_codec(channel->session)) && codec->implementation) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Name", switch_str_nil(codec->implementation->iananame)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); + switch_core_session_get_read_impl(channel->session, &impl); + + if (impl.iananame) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Name", impl.iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Read-Codec-Rate", "%u", impl.actual_samples_per_second); } - if ((codec = switch_core_session_get_write_codec(channel->session)) && codec->implementation) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", switch_str_nil(codec->implementation->iananame)); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", codec->implementation->actual_samples_per_second); + switch_core_session_get_write_impl(channel->session, &impl); + + if (impl.iananame) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Name", impl.iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Write-Codec-Rate", "%u", impl.actual_samples_per_second); } /* Index Caller's Profile */ @@ -1584,22 +1588,23 @@ switch_assert(channel != NULL); switch_channel_clear_flag(channel, CF_BLOCK_STATE); - - switch_mutex_lock(channel->state_mutex); - - if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { - switch_mutex_lock(channel->profile_mutex); - channel->caller_profile->times->hungup = switch_micro_time_now(); - switch_mutex_unlock(channel->profile_mutex); - } - - switch_channel_stop_broadcast(channel); - + if (channel->state < CS_HANGUP) { switch_event_t *event; switch_channel_state_t last_state = channel->state; + if (channel->caller_profile && channel->caller_profile->times && !channel->caller_profile->times->hungup) { + switch_mutex_lock(channel->profile_mutex); + channel->caller_profile->times->hungup = switch_micro_time_now(); + switch_mutex_unlock(channel->profile_mutex); + } + + switch_channel_stop_broadcast(channel); + + switch_mutex_lock(channel->state_mutex); channel->state = CS_HANGUP; + switch_mutex_unlock(channel->state_mutex); + channel->hangup_cause = hangup_cause; switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause)); @@ -1620,8 +1625,6 @@ } - switch_mutex_unlock(channel->state_mutex); - return channel->state; }

1 0

[commit] r12673 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:48:30 2009 New Revision: 12673 Log: make port allocator more random Modified: freeswitch/trunk/src/switch_core_port_allocator.c Modified: freeswitch/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/trunk/src/switch_core_port_allocator.c Thu Mar 19 20:48:30 2009 @@ -39,7 +39,7 @@ switch_port_t start; switch_port_t end; switch_port_t next; - switch_byte_t *track; + int8_t *track; uint32_t track_len; uint32_t track_used; switch_port_flag_t flags; @@ -118,12 +118,12 @@ int odd = switch_test_flag(alloc, SPF_ODD); switch_mutex_lock(alloc->mutex); - srand(getpid() + (unsigned) switch_epoch_time_now(NULL)); + srand((unsigned)(intptr_t)port_ptr + switch_thread_self() + switch_micro_time_now()); while (alloc->track_used < alloc->track_len) { uint32_t index; uint32_t tries = 0; - + /* randomly pick a port */ index = rand() % alloc->track_len; @@ -131,6 +131,9 @@ while (alloc->track[index] && tries < alloc->track_len) { tries++; + if (alloc->track[index] < 0) { + alloc->track[index]++; + } if (++index >= alloc->track_len) { index = 0; } @@ -179,8 +182,8 @@ } switch_mutex_lock(alloc->mutex); - if (alloc->track[index]) { - alloc->track[index] = 0; + if (alloc->track[index] > 0) { + alloc->track[index] = -4; alloc->track_used--; status = SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12672 - in freeswitch/trunk/libs/apr: include memory/unix
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:24:45 2009 New Revision: 12672 Log: add apr_pool_mutex_set() to our apr to fix thread-saftey issue Modified: freeswitch/trunk/libs/apr/include/apr_pools.h freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Modified: freeswitch/trunk/libs/apr/include/apr_pools.h ============================================================================== --- freeswitch/trunk/libs/apr/include/apr_pools.h (original) +++ freeswitch/trunk/libs/apr/include/apr_pools.h Thu Mar 19 20:24:45 2009 @@ -411,6 +411,17 @@ */ APR_DECLARE(void) apr_pool_tag(apr_pool_t *pool, const char *tag); +#if APR_HAS_THREADS +/** + * Add a mutex to a pool to make it suitable to use from multiple threads. + * @param pool The pool to add the mutex to + * @param mutex The mutex + * @remark The mutex does not protect the destroy operation just the low level allocs. + */ +APR_DECLARE(void) apr_pool_mutex_set(apr_pool_t *pool, + apr_thread_mutex_t *mutex); +#endif + /* * User data management @@ -435,6 +446,7 @@ * key names is a typical way to help ensure this uniqueness. * */ + APR_DECLARE(apr_status_t) apr_pool_userdata_set( const void *data, const char *key, Modified: freeswitch/trunk/libs/apr/memory/unix/apr_pools.c ============================================================================== --- freeswitch/trunk/libs/apr/memory/unix/apr_pools.c (original) +++ freeswitch/trunk/libs/apr/memory/unix/apr_pools.c Thu Mar 19 20:24:45 2009 @@ -449,7 +449,9 @@ apr_abortfunc_t abort_fn; apr_hash_t *user_data; const char *tag; - +#if APR_HAS_THREADS + apr_thread_mutex_t *user_mutex; +#endif #if !APR_POOL_DEBUG apr_memnode_t *active; apr_memnode_t *self; /* The node containing the pool itself */ @@ -471,6 +473,7 @@ #endif /* APR_POOL_DEBUG */ #ifdef NETWARE apr_os_proc_t owner_proc; + #endif /* defined(NETWARE) */ }; @@ -594,9 +597,11 @@ APR_DECLARE(void *) apr_palloc(apr_pool_t *pool, apr_size_t size) { apr_memnode_t *active, *node; - void *mem; + void *mem = NULL; apr_size_t free_index; - +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_lock(pool->user_mutex); +#endif size = APR_ALIGN_DEFAULT(size); active = pool->active; @@ -605,7 +610,7 @@ mem = active->first_avail; active->first_avail += size; - return mem; + goto end; } node = active->next; @@ -617,7 +622,8 @@ if (pool->abort_fn) pool->abort_fn(APR_ENOMEM); - return NULL; + mem = NULL; + goto end; } } @@ -636,7 +642,7 @@ active->free_index = (APR_UINT32_TRUNC_CAST)free_index; node = active->next; if (free_index >= node->free_index) - return mem; + goto end; do { node = node->next; @@ -646,6 +652,10 @@ list_remove(active); list_insert(active, node); + end: +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_unlock(pool->user_mutex); +#endif return mem; } @@ -678,7 +688,9 @@ APR_DECLARE(void) apr_pool_clear(apr_pool_t *pool) { apr_memnode_t *active; - +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_lock(pool->user_mutex); +#endif /* Destroy the subpools. The subpools will detach themselves from * this pool thus this loop is safe and easy. */ @@ -704,14 +716,27 @@ active->first_avail = pool->self_first_avail; if (active->next == active) - return; + goto end; *active->ref = NULL; allocator_free(pool->allocator, active->next); active->next = active; active->ref = &active->next; + + end: +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_unlock(pool->user_mutex); +#endif } +#if APR_HAS_THREADS +APR_DECLARE(void) apr_pool_mutex_set(apr_pool_t *pool, + apr_thread_mutex_t *mutex) +{ + pool->user_mutex = mutex; +} +#endif + APR_DECLARE(void) apr_pool_destroy(apr_pool_t *pool) { apr_memnode_t *active; @@ -820,7 +845,9 @@ pool->subprocesses = NULL; pool->user_data = NULL; pool->tag = NULL; - +#if APR_HAS_THREADS + pool->user_mutex = NULL; +#endif #ifdef NETWARE pool->owner_proc = (apr_os_proc_t)getnlmhandle(); #endif /* defined(NETWARE) */ @@ -963,6 +990,10 @@ apr_memnode_t *active, *node; apr_size_t free_index; +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_lock(pool->user_mutex); +#endif + ps.node = active = pool->active; ps.pool = pool; ps.vbuff.curpos = ps.node->first_avail; @@ -981,7 +1012,8 @@ pool->abort_fn(APR_ENOMEM); } - return NULL; + strp = NULL; + goto end; } } @@ -989,7 +1021,8 @@ if (pool->abort_fn) pool->abort_fn(APR_ENOMEM); - return NULL; + strp = NULL; + goto end; } strp = ps.vbuff.curpos; @@ -1006,8 +1039,8 @@ /* * Link the node in if it's a new one */ - if (!ps.got_a_new_node) - return strp; + if (!ps.got_a_new_node) + goto end; active = pool->active; node = ps.node; @@ -1025,7 +1058,7 @@ node = active->next; if (free_index >= node->free_index) - return strp; + goto end; do { node = node->next; @@ -1035,6 +1068,12 @@ list_remove(active); list_insert(active, node); + end: + +#if APR_HAS_THREADS + if (pool->user_mutex) apr_thread_mutex_unlock(pool->user_mutex); +#endif + return strp; }

1 0

[commit] r12671 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:23:38 2009 New Revision: 12671 Log: refactor signal_bridge Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Mar 19 20:23:38 2009 @@ -687,6 +687,29 @@ switch_core_session_t *other_session; switch_event_t *event; + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE))) { + switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); + } + + switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); + + if (uuid && (other_session = switch_core_session_locate(uuid))) { + switch_channel_t *other_channel = switch_core_session_get_channel(other_session); + const char *sbv = switch_channel_get_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); + + if (!switch_strlen_zero(sbv) && !strcmp(sbv, switch_core_session_get_uuid(session))) { + + switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); + switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); + + if (switch_channel_up(other_channel)) { + switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); + } + } + + switch_core_session_rwunlock(other_session); + } + 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) { @@ -694,29 +717,7 @@ switch_event_fire(&event); } } - - if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) - && (other_session = switch_core_session_locate(uuid))) { - switch_channel_t *other_channel = switch_core_session_get_channel(other_session); - const char *sbv = switch_channel_get_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); - - if (!switch_strlen_zero(sbv) && !strcmp(sbv, switch_core_session_get_uuid(session))) { - - switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - - switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); - switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); - - if (switch_channel_up(other_channel)) { - switch_channel_hangup(other_channel, switch_channel_get_cause(channel)); - } - } - - switch_channel_set_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL); - - switch_core_session_rwunlock(other_session); - } - + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12670 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 20:22:40 2009 New Revision: 12670 Log: make -vg imply -waste so valgrind runs won't re-exec Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Mar 19 20:22:40 2009 @@ -611,7 +611,7 @@ } #if defined(HAVE_SETRLIMIT) && !defined(__sun) - if (!waste) { + if (!waste && !(flags & SCF_VG)) { memset(&rlp, 0, sizeof(rlp)); getrlimit(RLIMIT_STACK, &rlp); if (rlp.rlim_max > SWITCH_THREAD_STACKSIZE) {

1 0

[commit] r12669 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: anthm Date: Thu Mar 19 13:30:56 2009 New Revision: 12669 Log: fix audio issue in portaudio Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Mar 19 13:30:56 2009 @@ -124,7 +124,8 @@ private_t *call_list; int ring_interval; GFLAGS flags; - switch_timer_t timer; + switch_timer_t read_timer; + switch_timer_t write_timer; switch_timer_t hold_timer; int dual_streams; time_t deactivate_timer; @@ -249,7 +250,7 @@ } while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { - switch_size_t olen = globals.timer.samples; + switch_size_t olen = globals.read_timer.samples; if (switch_micro_time_now() - last >= waitsec) { char buf[512]; @@ -268,7 +269,7 @@ } if (ring_file) { - if (switch_core_timer_next(&globals.timer) != SWITCH_STATUS_SUCCESS) { + if (switch_core_timer_next(&globals.read_timer) != SWITCH_STATUS_SUCCESS) { switch_core_file_close(&fh); break; } @@ -279,7 +280,7 @@ } if (globals.ring_stream) { - WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); + WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.write_timer); } } else { switch_yield(10000); @@ -355,8 +356,12 @@ switch_core_codec_destroy(&globals.write_codec); } - if (globals.timer.timer_interface) { - switch_core_timer_destroy(&globals.timer); + if (globals.read_timer.timer_interface) { + switch_core_timer_destroy(&globals.read_timer); + } + + if (globals.write_timer.timer_interface) { + switch_core_timer_destroy(&globals.write_timer); } if (globals.hold_timer.timer_interface) { @@ -597,14 +602,13 @@ switch_mutex_lock(globals.device_lock); samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, - globals.read_codec.implementation->samples_per_packet, &globals.timer); + globals.read_codec.implementation->samples_per_packet, &globals.read_timer); switch_mutex_unlock(globals.device_lock); if (samples) { globals.read_frame.datalen = samples * 2; globals.read_frame.samples = samples; - //switch_core_timer_check(&globals.timer, SWITCH_TRUE); *frame = &globals.read_frame; if (!switch_test_flag((&globals), GFLAG_MOUTH)) { @@ -649,7 +653,7 @@ if (globals.audio_stream) { if (switch_test_flag((&globals), GFLAG_EAR)) { - WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.timer); + WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.write_timer); } status = SWITCH_STATUS_SUCCESS; } @@ -1278,8 +1282,12 @@ destroy_codecs(); } - if (globals.timer.timer_interface) { - switch_core_timer_sync(&globals.timer); + if (globals.read_timer.timer_interface) { + switch_core_timer_sync(&globals.read_timer); + } + + if (globals.write_timer.timer_interface) { + switch_core_timer_sync(&globals.write_timer); } if (globals.audio_stream) { @@ -1310,13 +1318,26 @@ } } - if (!globals.timer.timer_interface) { - if (switch_core_timer_init(&globals.timer, + if (!globals.read_timer.timer_interface) { + if (switch_core_timer_init(&globals.read_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); + return SWITCH_STATUS_FALSE; + } + } + + + if (!globals.write_timer.timer_interface) { + if (switch_core_timer_init(&globals.write_timer, globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, module_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); + switch_core_timer_destroy(&globals.read_timer); return SWITCH_STATUS_FALSE; } } @@ -1328,7 +1349,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.read_timer); + switch_core_timer_destroy(&globals.write_timer); return SWITCH_STATUS_FALSE; } } @@ -1366,7 +1388,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n"); switch_core_codec_destroy(&globals.read_codec); switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); + switch_core_timer_destroy(&globals.read_timer); + switch_core_timer_destroy(&globals.write_timer); switch_core_timer_destroy(&globals.hold_timer); return SWITCH_STATUS_FALSE; } @@ -1963,8 +1986,8 @@ playfile, seconds, samples, globals.read_codec.implementation->actual_samples_per_second); while (switch_core_file_read(&fh, abuf, &olen) == SWITCH_STATUS_SUCCESS) { - WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.timer); - switch_core_timer_next(&globals.timer); + WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.read_timer); + switch_core_timer_next(&globals.read_timer); samples -= (int) olen; if (samples <= 0) { break; @@ -1993,8 +2016,8 @@ int i; for(i = 0; i < 400; i++) { if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, - globals.read_codec.implementation->samples_per_packet, &globals.timer))) { - WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.timer); + globals.read_codec.implementation->samples_per_packet, &globals.read_timer))) { + WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.write_timer); success = 1; } switch_yield(10000); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Thu Mar 19 13:30:56 2009 @@ -146,17 +146,15 @@ char *p = (char *) data; long numBytes = aStream->bytesPerFrame * numFrames; - while (numBytes > 0) { - bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); - numBytes -= bytesWritten; - p += bytesWritten; - if (numBytes > 0) { - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - PaUtil_FlushRingBuffer(&aStream->outFIFO); - return 0; - } - switch_cond_next(); - } + switch_core_timer_next(timer); + + bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); + numBytes -= bytesWritten; + p += bytesWritten; + + if (numBytes > 0) { + PaUtil_FlushRingBuffer(&aStream->outFIFO); + return 0; } return numFrames; } @@ -170,30 +168,31 @@ long bytesRead = 0; char *p = (char *) data; long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; + int max = 5000; - for (;;) { - avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); - - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - break; - } + switch_core_timer_next(timer); + + while(totalBytes < neededBytes && --max > 0) { + avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); + //printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max); if (avail >= neededBytes * 6) { PaUtil_FlushRingBuffer(&aStream->inFIFO); avail = 0; - } - - bytesRead = 0; + } else { - if (totalBytes < neededBytes && avail >= neededBytes) { - bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); - totalBytes += bytesRead; - } + bytesRead = 0; + + if (totalBytes < neededBytes && avail >= neededBytes) { + bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); + totalBytes += bytesRead; + } - if (bytesRead) { - p += bytesRead; - } else { - switch_cond_next(); + if (bytesRead) { + p += bytesRead; + } else { + switch_cond_next(); + } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 19 13:30:56 2009 @@ -1990,12 +1990,12 @@ } if (rtp_session->timer.interval && - (rtp_session->timer.samplecount - rtp_session->last_write_samplecount) > rtp_session->samples_per_interval * 2) { + (rtp_session->timer.samplecount - rtp_session->last_write_samplecount) > rtp_session->samples_per_interval * 10) { m++; } if (!rtp_session->timer.interval && - ((unsigned)((switch_micro_time_now() - rtp_session->last_write_timestamp))) > (rtp_session->ms_per_packet *2)) { + ((unsigned)((switch_micro_time_now() - rtp_session->last_write_timestamp))) > (rtp_session->ms_per_packet * 10)) { m++; }

1 0

[commit] r12668 - freeswitch/trunk/patches
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: anthm Date: Thu Mar 19 11:20:43 2009 New Revision: 12668 Log: update Modified: freeswitch/trunk/patches/pa.diff Modified: freeswitch/trunk/patches/pa.diff ============================================================================== --- freeswitch/trunk/patches/pa.diff (original) +++ freeswitch/trunk/patches/pa.diff Thu Mar 19 11:20:43 2009 @@ -195,60 +195,60 @@ + bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); + numBytes -= bytesWritten; + p += bytesWritten; -+ ++ + if (numBytes > 0) { + PaUtil_FlushRingBuffer(&aStream->outFIFO); + return 0; } return numFrames; } -@@ -171,32 +169,28 @@ +@@ -170,31 +168,32 @@ + long bytesRead = 0; char *p = (char *) data; long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; ++ int max = 5000; - for (;;) { - avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); -+ switch_core_timer_next(timer); -+ -+ avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); - +- - if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { - break; - } -+ if (avail >= neededBytes * 6) { -+ PaUtil_FlushRingBuffer(&aStream->inFIFO); -+ avail = 0; -+ } ++ switch_core_timer_next(timer); -- if (avail >= neededBytes * 6) { -- PaUtil_FlushRingBuffer(&aStream->inFIFO); -- avail = 0; ++ while(totalBytes < neededBytes && --max > 0) { ++ ++ avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); ++ //printf("AVAILABLE BYTES %ld pass %d\n", avail, 5000 - max); + if (avail >= neededBytes * 6) { + PaUtil_FlushRingBuffer(&aStream->inFIFO); + avail = 0; - } -+ bytesRead = 0; ++ } else { - bytesRead = 0; -- ++ bytesRead = 0; ++ ++ if (totalBytes < neededBytes && avail >= neededBytes) { ++ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); ++ totalBytes += bytesRead; ++ } + - if (totalBytes < neededBytes && avail >= neededBytes) { - bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); - totalBytes += bytesRead; -- } ++ if (bytesRead) { ++ p += bytesRead; ++ } else { ++ switch_cond_next(); ++ } + } - - if (bytesRead) { - p += bytesRead; - } else { - switch_cond_next(); - } -+ if (totalBytes < neededBytes && avail >= neededBytes) { -+ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); -+ totalBytes += bytesRead; } -+ if (bytesRead) { -+ p += bytesRead; -+ } else { -+ switch_cond_next(); -+ } -+ return totalBytes / aStream->bytesPerFrame; - } -

1 0

[commit] r12667 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: mrene Date: Wed Mar 18 23:15:14 2009 New Revision: 12667 Log: tweaqk Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.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 Wed Mar 18 23:15:14 2009 @@ -1163,8 +1163,8 @@ /* Open the config from the xml registry */ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Menu-Name", name); switch_assert(params); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Menu-Name", name); switch_channel_event_set_data(channel, params); if ((cxml = switch_xml_open_cfg(ivr_cf_name, &cfg, params)) != NULL) {

1 0