- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10209 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 13:14:48 2008 New Revision: 10209 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Fri Oct 31 13:14:48 2008 @@ -4664,30 +4664,6 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_signal_lock(void * jarg1) { - int jresult ; - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - switch_status_t result; - - arg1 = (switch_core_session_t *)jarg1; - result = (switch_status_t)switch_core_session_signal_lock(arg1); - jresult = result; - return jresult; -} - - -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_signal_unlock(void * jarg1) { - int jresult ; - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - switch_status_t result; - - arg1 = (switch_core_session_t *)jarg1; - result = (switch_status_t)switch_core_session_signal_unlock(arg1); - jresult = result; - return jresult; -} - - SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Fri Oct 31 13:14:48 2008 @@ -970,16 +970,6 @@ return ret; } - public static switch_status_t switch_core_session_signal_lock(SWIGTYPE_p_switch_core_session session) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_signal_lock(SWIGTYPE_p_switch_core_session.getCPtr(session)); - return ret; - } - - public static switch_status_t switch_core_session_signal_unlock(SWIGTYPE_p_switch_core_session session) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_signal_unlock(SWIGTYPE_p_switch_core_session.getCPtr(session)); - return ret; - } - public static switch_status_t switch_core_session_read_lock(SWIGTYPE_p_switch_core_session session) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session)); return ret; @@ -5271,12 +5261,6 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_destroy")] public static extern int switch_core_destroy(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_signal_lock")] - public static extern int switch_core_session_signal_lock(HandleRef jarg1); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_signal_unlock")] - public static extern int switch_core_session_signal_unlock(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_read_lock")] public static extern int switch_core_session_read_lock(HandleRef jarg1); @@ -22730,7 +22714,8 @@ SWITCH_STATUS_NOTFOUND, SWITCH_STATUS_UNLOAD, SWITCH_STATUS_NOUNLOAD, - SWITCH_STATUS_IGNORE + SWITCH_STATUS_IGNORE, + SWITCH_STATUS_NOT_INITALIZED } }

1 0

[commit] r10208 - freeswitch/trunk/src
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 11:20:18 2008 New Revision: 10208 Modified: freeswitch/trunk/src/switch_core_session.c Log: one more for good measure Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Oct 31 11:20:18 2008 @@ -57,10 +57,11 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_channel_get_state(session->channel) >= CS_HANGUP || + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || + switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL;

1 0

[commit] r10207 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 19:37:16 2008 New Revision: 10207 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update filters to have optional - prefix to omit a match within a match from the positive filter Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Oct 30 19:37:16 2008 @@ -239,22 +239,51 @@ } } - if (send && l->filters) { + if (send && l->filters && l->filters->headers) { switch_event_header_t *hp; const char *hval; send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp && !send; hp = hp->next) { + for (hp = l->filters->headers; hp; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { + const char *comp_to = hp->value; + int pos = 1, cmp = 0; + + while (comp_to && *comp_to) { + if (*comp_to == '+') { + pos = 1; + } else if (*comp_to == '-') { + pos = 0; + } else if (*comp_to != ' ') { + break; + } + comp_to++; + } + + if (send && pos) { + continue; + } + + if (!comp_to) { + continue; + } + if (*hp->value == '/') { switch_regex_t *re = NULL; int ovector[30]; - send = switch_regex_perform(hval, hp->value, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); + cmp = !!switch_regex_perform(hval, comp_to, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); switch_regex_safe_free(re); } else { - if (!strcasecmp(hp->value, hval)) { + cmp = !strcasecmp(hval, comp_to); + } + + if (cmp) { + if (pos) { send = 1; + } else { + send = 0; + break; } } }

1 0

[commit] r10206 - in freeswitch/trunk/src: . include include/private mod/endpoints/mod_iax mod/endpoints/mod_sofia
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 18:40:39 2008 New Revision: 10206 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c 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 freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c Log: redo some stuff Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu Oct 30 18:40:39 2008 @@ -121,7 +121,6 @@ switch_mutex_t *mutex; switch_mutex_t *resample_mutex; - switch_mutex_t *signal_mutex; switch_thread_cond_t *cond; switch_thread_rwlock_t *rwlock; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 30 18:40:39 2008 @@ -297,9 +297,6 @@ ///\ingroup core1 ///\{ -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session); -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session); - #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(_In_ switch_core_session_t *session, const char *file, const char *func, int line); #endif Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Oct 30 18:40:39 2008 @@ -938,7 +938,6 @@ if ((tech_pvt = iax_get_private(iaxevent->session))) { channel = switch_core_session_get_channel(tech_pvt->session); - switch_core_session_signal_lock(tech_pvt->session); } if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) { @@ -1122,9 +1121,6 @@ } iax_event_free(iaxevent); switch_mutex_unlock(globals.mutex); - if (tech_pvt && tech_pvt->session) { - switch_core_session_signal_unlock(tech_pvt->session); - } } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Oct 30 18:40:39 2008 @@ -292,7 +292,7 @@ switch_core_session_rwunlock(a_session); } - switch_mutex_lock(tech_pvt->profile->flag_mutex); + if (tech_pvt->nh && !switch_test_flag(tech_pvt, TFLAG_BYE)) { char reason[128] = ""; @@ -326,6 +326,7 @@ switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } + switch_mutex_lock(tech_pvt->sofia_mutex); if (switch_test_flag(tech_pvt, TFLAG_ANS)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); @@ -357,10 +358,12 @@ TAG_END()); } } + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag(tech_pvt, TFLAG_BYE); switch_safe_free(stream.data); } + switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_clear_flag(tech_pvt, TFLAG_IO); tech_pvt->profile->inuse--; switch_mutex_unlock(tech_pvt->profile->flag_mutex); @@ -416,23 +419,21 @@ /* This if statement check and handles the 3pcc proxy mode */ if ((tech_pvt->profile->pflags & PFLAG_3PCC_PROXY) && switch_test_flag(tech_pvt, TFLAG_3PCC)) { /* Send the 200 OK */ + switch_mutex_lock(tech_pvt->sofia_mutex); 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_mutex_unlock(tech_pvt->sofia_mutex); 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_core_session_signal_unlock(session); + while(switch_channel_ready(channel) && !switch_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { switch_yield(1000); } - // if we never got the ack should we PUNT? - /* Get the lock back before we continue */ - switch_core_session_signal_lock(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n"); } @@ -452,7 +453,9 @@ if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + //switch_mutex_lock(tech_pvt->sofia_mutex); //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //switch_mutex_unlock(tech_pvt->sofia_mutex); return SWITCH_STATUS_FALSE; } } @@ -491,7 +494,7 @@ } - + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_AUTOANSWER(0), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), @@ -499,7 +502,7 @@ 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_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_ANS); return SWITCH_STATUS_SUCCESS; @@ -796,7 +799,9 @@ case DTMF_INFO: snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); break; default: break; @@ -831,10 +836,15 @@ " <media_control>\r\n" " <vc_primitive>\r\n" " <to_encoder>\r\n" - " <picture_fast_update>\r\n" " </picture_fast_update>\r\n" " </to_encoder>\r\n" " </vc_primitive>\r\n" " </media_control>\r\n"; + " <picture_fast_update>\r\n" + " </picture_fast_update>\r\n" + " </to_encoder>\r\n" + " </vc_primitive>\r\n" + " </media_control>\r\n"; + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/media_control+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); - + switch_mutex_unlock(tech_pvt->sofia_mutex); } break; @@ -851,10 +861,12 @@ if (ip && port) { sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } + switch_mutex_lock(tech_pvt->sofia_mutex); 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_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_answered(channel); } break; @@ -936,7 +948,9 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -948,7 +962,9 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -1007,7 +1023,9 @@ if (!switch_strlen_zero(msg->string_arg)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_BYE); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg); @@ -1024,8 +1042,9 @@ } else { switch_set_string(ref_to, msg->string_arg); } - + switch_mutex_lock(tech_pvt->sofia_mutex); nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } break; @@ -1082,9 +1101,11 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); + switch_mutex_lock(tech_pvt->sofia_mutex); 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()); + switch_mutex_unlock(tech_pvt->sofia_mutex); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } @@ -1104,12 +1125,16 @@ sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt); } + switch_mutex_lock(tech_pvt->sofia_mutex); 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()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } else { + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); @@ -1121,7 +1146,9 @@ case SWITCH_MESSAGE_INDICATE_RINGING: if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_ring_ready(channel); } break; @@ -1161,7 +1188,9 @@ sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + //switch_mutex_lock(tech_pvt->sofia_mutex); //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //switch_mutex_unlock(tech_pvt->sofia_mutex); status = SWITCH_STATUS_FALSE; goto end; } @@ -1190,6 +1219,7 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), @@ -1199,6 +1229,7 @@ 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()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -1225,11 +1256,13 @@ } if (tech_pvt->hash_key) { + switch_mutex_lock(tech_pvt->sofia_mutex); msg_nh = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_FROM_STR(tech_pvt->chat_from), NUTAG_URL(tech_pvt->chat_to), SIPTAG_TO_STR(tech_pvt->chat_to), SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private); nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } return SWITCH_STATUS_SUCCESS; @@ -1946,6 +1979,7 @@ goto error; } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); + switch_mutex_init(&tech_pvt->sofia_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); data = switch_core_session_strdup(nsession, outbound_profile->destination_number); if ((dest_to = strchr(data, '^'))) { 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 Oct 30 18:40:39 2008 @@ -467,6 +467,7 @@ unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; + switch_mutex_t *sofia_mutex; switch_payload_t te; switch_payload_t bte; switch_payload_t cng_pt; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Oct 30 18:40:39 2008 @@ -180,6 +180,7 @@ } 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); if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); @@ -196,7 +197,7 @@ } if (session) { - switch_core_session_signal_lock(session); + switch_mutex_lock(tech_pvt->sofia_mutex); if (channel && switch_channel_get_state(channel) >= CS_HANGUP) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); @@ -353,7 +354,7 @@ } if (session) { - switch_core_session_signal_unlock(session); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_core_session_rwunlock(session); } } @@ -3486,6 +3487,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_mutex_init(&tech_pvt->sofia_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); tech_pvt->remote_port = network_port; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 30 18:40:39 2008 @@ -1702,9 +1702,7 @@ const char *var; switch_assert(tech_pvt != NULL); - - switch_core_session_signal_lock(tech_pvt->session); - + switch_mutex_lock(tech_pvt->sofia_mutex); if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { switch_set_flag_locked(tech_pvt, TFLAG_SECURE); @@ -2027,7 +2025,7 @@ end: - switch_core_session_signal_unlock(tech_pvt->session); + switch_mutex_unlock(tech_pvt->sofia_mutex); return status; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Oct 30 18:40:39 2008 @@ -390,7 +390,9 @@ { switch_channel_flush_dtmf(channel); switch_core_hash_destroy(&channel->private_hash); + switch_mutex_lock(channel->profile_mutex); switch_event_destroy(&channel->variables); + switch_mutex_unlock(channel->profile_mutex); } SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, switch_core_session_t *session, switch_channel_state_t state, @@ -562,7 +564,7 @@ { switch_assert(channel != NULL); - if (!switch_strlen_zero(varname)) { + if (channel->variables && !switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); if (!switch_strlen_zero(value)) { @@ -584,7 +586,7 @@ va_list ap; switch_assert(channel != NULL); - if (!switch_strlen_zero(varname)) { + if (channel->variables && !switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Thu Oct 30 18:40:39 2008 @@ -35,15 +35,6 @@ #include <switch.h> #include "private/switch_core_pvt.h" -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session) -{ - return switch_mutex_lock(session->signal_mutex); -} - -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session) -{ - return switch_mutex_unlock(session->signal_mutex); -} #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(switch_core_session_t *session, const char *file, const char *func, int line) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Oct 30 18:40:39 2008 @@ -57,9 +57,10 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || + switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL; @@ -418,8 +419,6 @@ return status; } - switch_core_session_signal_lock(session); - if (session->endpoint_interface->io_routines->receive_message) { status = session->endpoint_interface->io_routines->receive_message(session, message); } @@ -433,9 +432,6 @@ } switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); - - switch_core_session_signal_unlock(session); - switch_core_session_rwunlock(session); return status; @@ -988,7 +984,6 @@ switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool); - switch_mutex_init(&session->signal_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_thread_rwlock_create(&session->bug_rwlock, session->pool); switch_thread_cond_create(&session->cond, session->pool); switch_thread_rwlock_create(&session->rwlock, session->pool); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Oct 30 18:40:39 2008 @@ -396,9 +396,8 @@ do_extra_handlers = 0; } } - switch_core_session_signal_lock(session); + STATE_MACRO(hangup, "HANGUP"); - switch_core_session_signal_unlock(session); hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); @@ -418,19 +417,13 @@ } goto done; case CS_INIT: /* Basic setup tasks */ - switch_core_session_signal_lock(session); STATE_MACRO(init, "INIT"); - switch_core_session_signal_unlock(session); break; case CS_ROUTING: /* Look for a dialplan and find something to do */ - switch_core_session_signal_lock(session); STATE_MACRO(routing, "ROUTING"); - switch_core_session_signal_unlock(session); break; case CS_RESET: /* Reset */ - switch_core_session_signal_lock(session); STATE_MACRO(reset, "RESET"); - switch_core_session_signal_unlock(session); break; /* These other states are intended for prolonged durations so we do not signal lock for them */ case CS_EXECUTE: /* Execute an Operation */

1 0

[commit] r10205 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: brian Date: Thu Oct 30 13:37:52 2008 New Revision: 10205 Modified: freeswitch/trunk/src/switch_core_file.c Log: revert previous change so voicemail length check works Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Oct 30 13:37:52 2008 @@ -285,8 +285,6 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } - memset(fh, 0, sizeof(*fh)); - return status; }

1 0

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

30 Oct '08

Author: anthm Date: Thu Oct 30 12:40:54 2008 New Revision: 10204 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: whatcha talking bout Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Thu Oct 30 12:40:54 2008 @@ -1215,7 +1215,7 @@ } } switch_url_decode(route); - route_uri = strdup(route); + route_uri = route; if ((p = strchr(route_uri, ','))) { while (*(p-1) == ' ') { p--; @@ -1240,7 +1240,6 @@ switch_safe_free(contact); switch_safe_free(id); switch_safe_free(route); - switch_safe_free(route_uri); if (ext_profile) { sofia_glue_release_profile(ext_profile); }

1 0

[commit] r10203 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 11:18:07 2008 New Revision: 10203 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix typo thanks MichaelGG Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 30 11:18:07 2008 @@ -1639,7 +1639,7 @@ if (!(x_caller_profile = switch_xml_add_child_d(x_o, "originatee_caller_profile", off++))) { goto error; } - switch_ivr_set_xml_profile_data(x_caller_profile, caller_profile->originatee_caller_profile, 0); + switch_ivr_set_xml_profile_data(x_caller_profile, cp, 0); } }

1 0

[commit] r10202 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 08:46:09 2008 New Revision: 10202 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_core_timer.c Log: patch for FSCORE-205 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 Oct 30 08:46:09 2008 @@ -308,10 +308,30 @@ static void deactivate_audio_device(void) { switch_mutex_lock(globals.device_lock); + /* LOCKED ************************************************************************************************** */ + if (globals.audio_stream) { CloseAudioStream(globals.audio_stream); globals.audio_stream = NULL; } + + if (globals.read_codec.implementation) { + switch_core_codec_destroy(&globals.read_codec); + } + + if (globals.write_codec.implementation) { + switch_core_codec_destroy(&globals.write_codec); + } + + if (globals.timer.timer_interface) { + switch_core_timer_destroy(&globals.timer); + } + + if (globals.hold_timer.timer_interface) { + switch_core_timer_destroy(&globals.hold_timer); + } + + /* UNLOCKED ************************************************************************************************* */ switch_mutex_unlock(globals.device_lock); } @@ -1142,13 +1162,17 @@ codec_ms = globals.codec_ms; } - if (switch_core_codec_init(&globals.read_codec, - "L16", - NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, - NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); - return SWITCH_STATUS_FALSE; - } else { + if (!globals.read_codec.implementation) { + if (switch_core_codec_init(&globals.read_codec, + "L16", + NULL, sample_rate, codec_ms, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n"); + return SWITCH_STATUS_FALSE; + } + } + + if (!globals.write_codec.implementation) { if (switch_core_codec_init(&globals.write_codec, "L16", NULL, @@ -1160,25 +1184,29 @@ } } - if (switch_core_timer_init(&globals.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.timer.timer_interface) { + if (switch_core_timer_init(&globals.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 (switch_core_timer_init(&globals.hold_timer, + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_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 hold timer failed!\n"); - switch_core_codec_destroy(&globals.read_codec); - switch_core_codec_destroy(&globals.write_codec); - switch_core_timer_destroy(&globals.timer); - return SWITCH_STATUS_FALSE; + module_pool) != SWITCH_STATUS_SUCCESS) { + 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); + return SWITCH_STATUS_FALSE; + } } - + globals.read_frame.rate = sample_rate; globals.read_frame.codec = &globals.read_codec; @@ -1204,7 +1232,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.hold_timer); return SWITCH_STATUS_FALSE; } } Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Oct 30 08:46:09 2008 @@ -285,6 +285,8 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } + memset(fh, 0, sizeof(*fh)); + return status; } Modified: freeswitch/trunk/src/switch_core_timer.c ============================================================================== --- freeswitch/trunk/src/switch_core_timer.c (original) +++ freeswitch/trunk/src/switch_core_timer.c Thu Oct 30 08:46:09 2008 @@ -125,6 +125,8 @@ switch_core_destroy_memory_pool(&timer->memory_pool); } + memset(timer, 0, sizeof(*timer)); + return SWITCH_STATUS_SUCCESS; }

1 0

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

30 Oct '08

Author: anthm Date: Wed Oct 29 23:12:52 2008 New Revision: 10201 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: add path thing for mwi Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Oct 29 23:12:52 2008 @@ -1193,7 +1193,8 @@ nua_handle_t *nh; struct mwi_helper *h = (struct mwi_helper *) pArg; sofia_profile_t *ext_profile = NULL, *profile = h->profile; - + char *route = NULL, *route_uri = NULL; + char *p; if (profile_name && strcasecmp(profile_name, h->profile->name)) { if ((ext_profile = sofia_glue_find_profile(profile_name))) { @@ -1204,17 +1205,42 @@ id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(o_contact, 1); + if ((route = strstr(o_contact, ";fs_path="))) { + route = strdup(route + 9); + + for (p = route; p && *p ; p++) { + if (*p == '>' || *p == ';') { + *p = '\0'; + break; + } + } + switch_url_decode(route); + route_uri = strdup(route); + if ((p = strchr(route_uri, ','))) { + while (*(p-1) == ' ') { + p--; + } + if (*p) { + *p = '\0'; + } + } + } + + if (!route_uri && strstr(o_contact, ";fs_nat")) { + route_uri = contact; + } nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); nua_notify(nh, NUTAG_NEWSUB(1), - TAG_IF(strstr(o_contact, ";fs_nat"), NUTAG_PROXY(contact)), + TAG_IF(route_uri, NUTAG_PROXY(route_uri)), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); switch_safe_free(contact); switch_safe_free(id); - + switch_safe_free(route); + switch_safe_free(route_uri); if (ext_profile) { sofia_glue_release_profile(ext_profile); }

1 0

[commit] r10200 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: mikej Date: Wed Oct 29 22:27:22 2008 New Revision: 10200 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: bug found by pyite in new filter feature. Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Oct 29 22:27:22 2008 @@ -177,8 +177,8 @@ if (listener->event_queue) { while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - if (!pop) continue; switch_event_t *pevent = (switch_event_t *) pop; + if (!pop) continue; switch_event_destroy(&pevent); } } @@ -214,7 +214,7 @@ switch_mutex_lock(listen_list.mutex); while(lp) { - uint8_t send = 0; + int send = 0; l = lp; lp = lp->next; @@ -245,7 +245,7 @@ send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp; hp = hp->next) { + for (hp = l->filters->headers; hp && !send; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { if (*hp->value == '/') { switch_regex_t *re = NULL;

1 0