- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r1664 - in freeswitch/trunk/src: include mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_portaudio mod/endpoints/mod_wanpipe mod/endpoints/mod_woomera
by anthm＠freeswitch.org 23 Jun '06

23 Jun '06

Author: anthm Date: Fri Jun 23 12:59:47 2006 New Revision: 1664 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: add more mutexed flag ops Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Jun 23 12:59:47 2006 @@ -117,7 +117,10 @@ \param obj the object to set the flags on \param flag the or'd list of flags to set */ -#define switch_set_flag_locked(obj, flag) switch_mutex_lock(obj->flag_mutex); (obj)->flags |= (flag); switch_mutex_unlock(obj->flag_mutex); +#define switch_set_flag_locked(obj, flag) assert(obj->flag_mutex != NULL);\ +switch_mutex_lock(obj->flag_mutex);\ +(obj)->flags |= (flag);\ +switch_mutex_unlock(obj->flag_mutex); /*! \brief Clear a flag on an arbitrary object Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Fri Jun 23 12:59:47 2006 @@ -138,6 +138,7 @@ char *recip; char *dnis; uint16_t stun_port; + switch_mutex_t *flag_mutex; }; struct rfc2833_digit { @@ -309,7 +310,7 @@ switch_rtp_activate_ice(tech_pvt->rtp_session, tech_pvt->remote_user, tech_pvt->local_user); if ((vad_in && inb) || (vad_out && !inb)) { switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING); - switch_set_flag(tech_pvt, TFLAG_VAD); + switch_set_flag_locked(tech_pvt, TFLAG_VAD); } } @@ -333,7 +334,7 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE)) { return -1; } - switch_set_flag(tech_pvt, TFLAG_DO_CAND); + switch_set_flag_locked(tech_pvt, TFLAG_DO_CAND); if (force || !switch_test_flag(tech_pvt, TFLAG_RTP_READY)) { ldl_candidate_t cand[1]; @@ -393,9 +394,9 @@ cand[0].protocol = "udp"; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address, cand[0].port, cand[0].username); tech_pvt->cand_id = ldl_session_candidates(tech_pvt->dlsession, cand, 1); - switch_set_flag(tech_pvt, TFLAG_RTP_READY); + switch_set_flag_locked(tech_pvt, TFLAG_RTP_READY); } - switch_clear_flag(tech_pvt, TFLAG_DO_CAND); + switch_clear_flag_locked(tech_pvt, TFLAG_DO_CAND); return 0; } @@ -425,13 +426,13 @@ } memset(payloads, 0, sizeof(payloads)); - switch_set_flag(tech_pvt, TFLAG_DO_CAND); + switch_set_flag_locked(tech_pvt, TFLAG_DO_CAND); if (!tech_pvt->num_codecs) { get_codecs(tech_pvt); if (!tech_pvt->num_codecs) { switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); return -1; } } @@ -455,9 +456,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Describe [%s]\n", payloads[0].name); tech_pvt->desc_id = ldl_session_describe(tech_pvt->dlsession, payloads, 1, switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? LDL_DESCRIPTION_INITIATE : LDL_DESCRIPTION_ACCEPT); - switch_set_flag(tech_pvt, TFLAG_CODEC_READY); + switch_set_flag_locked(tech_pvt, TFLAG_CODEC_READY); } - switch_clear_flag(tech_pvt, TFLAG_DO_CAND); + switch_clear_flag_locked(tech_pvt, TFLAG_DO_CAND); return 0; } @@ -477,7 +478,7 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_set_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_IO); started = switch_time_now(); @@ -513,8 +514,8 @@ } if (elapsed > 60000) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); return NULL; } if (switch_test_flag(tech_pvt, TFLAG_BYE) || ! switch_test_flag(tech_pvt, TFLAG_IO)) { @@ -624,9 +625,9 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_clear_flag(tech_pvt, TFLAG_VOICE); - switch_set_flag(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (tech_pvt->dlsession) { ldl_session_terminate(tech_pvt->dlsession); @@ -659,9 +660,9 @@ if ((channel = switch_core_session_get_channel(session))) { if ((tech_pvt = switch_core_session_get_private(session))) { - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_clear_flag(tech_pvt, TFLAG_VOICE); - switch_set_flag(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); if (tech_pvt->dlsession) { ldl_session_terminate(tech_pvt->dlsession); @@ -749,7 +750,7 @@ } tech_pvt->read_frame.datalen = 0; - switch_set_flag(tech_pvt, TFLAG_READING); + switch_set_flag_locked(tech_pvt, TFLAG_READING); bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; samples = tech_pvt->read_codec.implementation->samples_per_frame; @@ -770,11 +771,11 @@ char dtmf[128]; switch_rtp_dequeue_dtmf(tech_pvt->rtp_session, dtmf, sizeof(dtmf)); switch_channel_queue_dtmf(channel, dtmf); - switch_set_flag(tech_pvt, TFLAG_DTMF); + switch_set_flag_locked(tech_pvt, TFLAG_DTMF); } if (switch_test_flag(tech_pvt, TFLAG_DTMF)) { - switch_clear_flag(tech_pvt, TFLAG_DTMF); + switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); return SWITCH_STATUS_BREAK; } @@ -798,7 +799,7 @@ } - switch_clear_flag(tech_pvt, TFLAG_READING); + switch_clear_flag_locked(tech_pvt, TFLAG_READING); if (switch_test_flag(tech_pvt, TFLAG_BYE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); @@ -838,7 +839,7 @@ return SWITCH_STATUS_FALSE; } - switch_set_flag(tech_pvt, TFLAG_WRITING); + switch_set_flag_locked(tech_pvt, TFLAG_WRITING); bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; @@ -852,7 +853,7 @@ } tech_pvt->timestamp_send += (int) samples; - switch_clear_flag(tech_pvt, TFLAG_WRITING); + switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); //switch_mutex_unlock(tech_pvt->rtp_lock); return status; } @@ -1022,6 +1023,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); tech_pvt->flags |= globals.flags; tech_pvt->flags |= mdl_profile->flags; channel = switch_core_session_get_channel(*new_session); @@ -1053,7 +1055,7 @@ } switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_stun_random_string(sess_id, 10, "0123456789"); @@ -1466,6 +1468,7 @@ switch_core_session_add_stream(session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->flags |= globals.flags; tech_pvt->flags |= profile->flags; channel = switch_core_session_get_channel(session); @@ -1474,7 +1477,7 @@ tech_pvt->codec_index = -1; tech_pvt->profile = profile; tech_pvt->local_port = switch_rtp_request_port(); - switch_set_flag(tech_pvt, TFLAG_ANSWER); + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); tech_pvt->recip = switch_core_session_strdup(session, from); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n"); @@ -1495,7 +1498,7 @@ if (msg) { if (*msg == '+') { switch_channel_queue_dtmf(channel, msg + 1); - switch_set_flag(tech_pvt, TFLAG_DTMF); + switch_set_flag_locked(tech_pvt, TFLAG_DTMF); switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "SESSION MSG [%s]\n", msg); @@ -1519,7 +1522,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { if (!strcasecmp(msg, "accept")) { - switch_set_flag(tech_pvt, TFLAG_ANSWER); + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); do_candidates(tech_pvt, 0); } } @@ -1665,7 +1668,7 @@ } if (lanaddr) { - switch_set_flag(tech_pvt, TFLAG_LANADDR); + switch_set_flag_locked(tech_pvt, TFLAG_LANADDR); } if (!tech_pvt->num_codecs) { @@ -1683,7 +1686,7 @@ if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { do_candidates(tech_pvt, 0); } - switch_set_flag(tech_pvt, TFLAG_TRANSPORT); + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT); return LDL_STATUS_SUCCESS; } @@ -1696,8 +1699,10 @@ if (channel) { switch_channel_state_t state = switch_channel_get_state(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT); + switch_mutex_lock(tech_pvt->flag_mutex); switch_set_flag(tech_pvt, TFLAG_BYE); switch_clear_flag(tech_pvt, TFLAG_IO); + switch_mutex_unlock(tech_pvt->flag_mutex); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); if (state <= CS_INIT && !switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { 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 Fri Jun 23 12:59:47 2006 @@ -90,6 +90,7 @@ unsigned int codecs; unsigned short samprate; switch_mutex_t *mutex; + switch_mutex_t *flag_mutex; //switch_thread_cond_t *cond; }; @@ -344,7 +345,7 @@ } if (!strcasecmp(dname, "l16")) { - switch_set_flag(tech_pvt, TFLAG_LINEAR); + switch_set_flag_locked(tech_pvt, TFLAG_LINEAR); } if (switch_core_codec_init(&tech_pvt->read_codec, dname, @@ -376,7 +377,7 @@ tech_pvt->read_frame.codec = &tech_pvt->read_codec; switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); - switch_set_flag(tech_pvt, TFLAG_CODEC); + switch_set_flag_locked(tech_pvt, TFLAG_CODEC); } tech_pvt->codec = chosen; tech_pvt->codecs = local_cap; @@ -437,7 +438,7 @@ tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); iax_set_private(tech_pvt->iax_session, tech_pvt); - switch_set_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_IO); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); //switch_thread_cond_create(&tech_pvt->cond, switch_core_session_get_pool(session)); @@ -494,8 +495,8 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_clear_flag(tech_pvt, TFLAG_VOICE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); //switch_thread_cond_signal(tech_pvt->cond); if (tech_pvt->read_codec.implementation) { @@ -509,7 +510,7 @@ if (tech_pvt->iax_session) { if (!switch_test_flag(tech_pvt, TFLAG_HANGUP)) { iax_hangup(tech_pvt->iax_session, "Hangup"); - switch_set_flag(tech_pvt, TFLAG_HANGUP); + switch_set_flag_locked(tech_pvt, TFLAG_HANGUP); } iax_session_destroy(&tech_pvt->iax_session); } @@ -530,8 +531,8 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_clear_flag(tech_pvt, TFLAG_VOICE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); //switch_thread_cond_signal(tech_pvt->cond); @@ -612,7 +613,7 @@ } if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { - switch_clear_flag(tech_pvt, TFLAG_VOICE); + switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { continue; } @@ -737,6 +738,7 @@ if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); channel = switch_core_session_get_channel(*new_session); switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; @@ -781,7 +783,7 @@ caller_profile->caller_id_name, caller_profile->destination_number, NULL, 0, req, cap); switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -988,6 +990,7 @@ (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; @@ -1041,12 +1044,15 @@ case IAX_EVENT_HANGUP: if (tech_pvt) { switch_channel_t *channel; - + + switch_mutex_lock(tech_pvt->flag_mutex); switch_clear_flag(tech_pvt, TFLAG_IO); switch_clear_flag(tech_pvt, TFLAG_VOICE); + switch_mutex_unlock(tech_pvt->flag_mutex); + if ((channel = switch_core_session_get_channel(tech_pvt->session)) != 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hangup %s\n", switch_channel_get_name(channel)); - switch_set_flag(tech_pvt, TFLAG_HANGUP); + switch_set_flag_locked(tech_pvt, TFLAG_HANGUP); switch_channel_hangup(channel, iaxevent->etype == IAX_EVENT_HANGUP ? SWITCH_CAUSE_NORMAL_CLEARING : SWITCH_CAUSE_FACILITY_REJECTED); //switch_thread_cond_signal(tech_pvt->cond); iaxevent->session = NULL; @@ -1079,7 +1085,7 @@ tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; memcpy(tech_pvt->read_frame.data, iaxevent->data, iaxevent->datalen); /* wake up the i/o thread */ - switch_set_flag(tech_pvt, TFLAG_VOICE); + switch_set_flag_locked(tech_pvt, TFLAG_VOICE); //switch_thread_cond_signal(tech_pvt->cond); } } 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 Fri Jun 23 12:59:47 2006 @@ -92,6 +92,7 @@ PABLIO_Stream *audio_out; int indev; int outdev; + switch_mutex_t *flag_mutex; }; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan) @@ -177,7 +178,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { switch_channel_hangup(channel, SWITCH_CAUSE_NO_ANSWER); } else { - switch_set_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_IO); /* Move Channel's State Machine to RING */ switch_channel_set_state(channel, CS_RING); @@ -245,7 +246,7 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_core_hash_delete(globals.call_hash, tech_pvt->call_id); switch_core_codec_destroy(&tech_pvt->read_codec); @@ -269,7 +270,7 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); deactivate_audio_device(tech_pvt); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); @@ -425,7 +426,7 @@ case SWITCH_MESSAGE_INDICATE_PROGRESS: { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n"); - switch_set_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_IO); } default: break; @@ -524,6 +525,7 @@ if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); channel = switch_core_session_get_channel(*new_session); switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; @@ -550,7 +552,7 @@ } switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -838,6 +840,7 @@ switch_core_session_add_stream(session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; @@ -947,7 +950,7 @@ if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid)) != 0) { channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); - switch_set_flag(tech_pvt, TFLAG_ANSWER); + switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); switch_channel_answer(channel); } else { stream->write_function(stream, "NO SUCH CALL"); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Fri Jun 23 12:59:47 2006 @@ -116,6 +116,7 @@ switch_buffer_t *dtmf_buffer; unsigned int skip_read_frames; unsigned int skip_write_frames; + switch_mutex_t *flag_mutex; #ifdef DOTRACE int fd; int fd2; @@ -337,7 +338,7 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_set_flag(tech_pvt, TFLAG_BYE); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (!switch_test_flag(tech_pvt, TFLAG_NOSIG)) { chanmap = tech_pvt->spri->private_info; @@ -656,9 +657,11 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - + switch_mutex_lock(tech_pvt->flag_mutex); switch_set_flag(tech_pvt, TFLAG_BYE); switch_clear_flag(tech_pvt, TFLAG_MEDIA); + switch_mutex_unlock(tech_pvt->flag_mutex); + sangoma_socket_close(&tech_pvt->socket); return SWITCH_STATUS_SUCCESS; @@ -737,6 +740,7 @@ switch_core_session_add_stream(*new_session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); channel = switch_core_session_get_channel(*new_session); switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; @@ -806,7 +810,7 @@ switch_core_session_destroy(new_session); return SWITCH_STATUS_GENERR; } - switch_set_flag(tech_pvt, TFLAG_NOSIG); + switch_set_flag_locked(tech_pvt, TFLAG_NOSIG); snprintf(name, sizeof(name), "WanPipe/%s/nosig-%04x", bchan, rand() & 0xffff); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, caller_profile); @@ -901,7 +905,7 @@ } switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -1118,6 +1122,7 @@ switch_core_session_add_stream(session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object)))) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt); sprintf(name, "s%dc%d", spri->span, event->ring.channel); @@ -1148,7 +1153,7 @@ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } - switch_set_flag(tech_pvt, TFLAG_INBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_INBOUND); tech_pvt->spri = spri; tech_pvt->cause = -1; Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Fri Jun 23 12:59:47 2006 @@ -154,6 +154,7 @@ char dtmfbuf[WOOMERA_STRLEN]; switch_caller_profile_t *caller_profile; struct woomera_event_queue event_queue; + switch_mutex_t *flag_mutex; }; typedef struct private_object private_object; @@ -230,7 +231,7 @@ switch_core_session_set_write_codec(session, &tech_pvt->write_codec); - switch_set_flag(tech_pvt, TFLAG_ACTIVATE); + switch_set_flag_locked(tech_pvt, TFLAG_ACTIVATE); switch_core_session_launch_thread(session, woomera_channel_thread_run, session); @@ -483,6 +484,7 @@ if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); tech_pvt->profile = &default_profile; channel = switch_core_session_get_channel(*new_session); switch_core_session_set_private(*new_session, tech_pvt); @@ -510,7 +512,7 @@ } switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -907,13 +909,13 @@ woomera_message_parse(tech_pvt->command_channel, &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue); } else { - switch_set_flag(tech_pvt, TFLAG_PARSE_INCOMING); + switch_set_flag_locked(tech_pvt, TFLAG_PARSE_INCOMING); woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "LISTEN%s", WOOMERA_RECORD_SEPERATOR); if (woomera_message_parse(tech_pvt->command_channel, &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name); - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); globals.panic = 1; } } @@ -949,7 +951,7 @@ for (;;) { if (globals.panic) { - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); } if (switch_test_flag(tech_pvt, TFLAG_ABORT)) { @@ -959,12 +961,12 @@ } if (switch_test_flag(tech_pvt, TFLAG_ACTIVATE)) { - switch_clear_flag(tech_pvt, TFLAG_ACTIVATE); + switch_clear_flag_locked(tech_pvt, TFLAG_ACTIVATE); tech_activate(tech_pvt); } if (switch_test_flag(tech_pvt, TFLAG_ANSWER)) { - switch_clear_flag(tech_pvt, TFLAG_ANSWER); + switch_clear_flag_locked(tech_pvt, TFLAG_ANSWER); #ifdef USE_ANSWER woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "ANSWER %s%s", tech_pvt->call_info.callid, WOOMERA_RECORD_SEPERATOR); @@ -973,7 +975,7 @@ &tech_pvt->event_queue) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name); - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); globals.panic = 1; continue; } @@ -989,11 +991,11 @@ &tech_pvt->event_queue) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name); - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); globals.panic = 1; continue; } - switch_clear_flag(tech_pvt, TFLAG_DTMF); + switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); memset(tech_pvt->dtmfbuf, 0, sizeof(tech_pvt->dtmfbuf)); switch_mutex_unlock(tech_pvt->iolock); } @@ -1007,7 +1009,7 @@ ((tech_pvt->started.tv_sec * 1000) + tech_pvt->started.tv_usec / 1000)); if (elapsed > tech_pvt->timeout) { /* call timed out! */ - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); } } #endif @@ -1020,7 +1022,7 @@ (res = woomera_message_parse(tech_pvt->command_channel, &wmsg, 100, tech_pvt->profile, NULL)) != 0) { if (res < 0 || !strcasecmp(wmsg.command, "HANGUP")) { - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); continue; } else if (!strcasecmp(wmsg.command, "DTMF")) { /* @@ -1043,8 +1045,8 @@ char *cid_num; char *ip; char *p; - switch_clear_flag(tech_pvt, TFLAG_PARSE_INCOMING); - switch_set_flag(tech_pvt, TFLAG_INCOMING); + switch_clear_flag_locked(tech_pvt, TFLAG_PARSE_INCOMING); + switch_set_flag_locked(tech_pvt, TFLAG_INCOMING); tech_pvt->call_info = wmsg; exten = woomera_message_header(&wmsg, "Local-Number"); @@ -1088,7 +1090,7 @@ &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ALERT, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name); - switch_set_flag(tech_pvt, TFLAG_ABORT); + switch_set_flag_locked(tech_pvt, TFLAG_ABORT); globals.panic = 1; continue; } @@ -1242,6 +1244,7 @@ if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { memset(tech_pvt, 0, sizeof(*tech_pvt)); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->profile = &default_profile; channel = switch_core_session_get_channel(session); switch_core_session_set_private(session, tech_pvt);

1 0

[commit] r1663 - freeswitch/trunk/src/mod/endpoints/mod_exosip
by anthm＠freeswitch.org 23 Jun '06

23 Jun '06

Author: anthm Date: Fri Jun 23 00:28:15 2006 New Revision: 1663 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: doh wrong pool Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Fri Jun 23 00:28:15 2006 @@ -1049,7 +1049,7 @@ switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; tech_pvt->te = globals.te; - switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(new_session); @@ -1184,7 +1184,7 @@ switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; tech_pvt->te = globals.te; - switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(&session);

1 0

[commit] r1662 - in freeswitch/trunk/src: . mod/endpoints/mod_exosip
by anthm＠freeswitch.org 22 Jun '06

22 Jun '06

Author: anthm Date: Thu Jun 22 19:56:09 2006 New Revision: 1662 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/trunk/src/switch_channel.c Log: put some mutexes on some flags Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Thu Jun 22 19:56:09 2006 @@ -141,6 +141,7 @@ switch_codec_interface_t *codecs[SWITCH_MAX_CODECS]; int num_codecs; switch_payload_t te; + switch_mutex_t *flag_mutex; }; @@ -410,7 +411,7 @@ } /* Let Media Work */ - switch_set_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_IO); /* Move Channel's State Machine to RING */ switch_channel_set_state(channel, CS_RING); @@ -448,8 +449,8 @@ deactivate_rtp(tech_pvt); eXosip_lock(); switch_core_hash_delete(globals.call_hash, tech_pvt->call_id); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); i = eXosip_call_terminate(tech_pvt->cid, tech_pvt->did); eXosip_unlock(); @@ -530,8 +531,8 @@ if (!(key = (char *) switch_core_hash_find(globals.srtp_hash, tech_pvt->realm))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "undefined Realm %s\n", tech_pvt->realm); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); return SWITCH_STATUS_FALSE; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "using Realm %s\n", tech_pvt->realm); @@ -563,7 +564,7 @@ uint8_t inb = switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? 0 : 1; tech_pvt->ssrc = switch_rtp_get_ssrc(tech_pvt->rtp_session); - switch_set_flag(tech_pvt, TFLAG_RTP); + switch_set_flag_locked(tech_pvt, TFLAG_RTP); if (tech_pvt->te > 96) { switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); @@ -571,14 +572,14 @@ if ((vad_in && inb) || (vad_out && !inb)) { switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING); - switch_set_flag(tech_pvt, TFLAG_VAD); + switch_set_flag_locked(tech_pvt, TFLAG_VAD); } } else { switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP REPORTS ERROR: [%s]\n", err); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); return SWITCH_STATUS_FALSE; } @@ -612,7 +613,7 @@ free(buf); eXosip_call_send_answer(tech_pvt->tid, 200, answer); eXosip_unlock(); - switch_set_flag(tech_pvt, TFLAG_ANS); + switch_set_flag_locked(tech_pvt, TFLAG_ANS); sdp_message_to_str(tech_pvt->local_sdp, &sdp_str); if (sdp_str) { @@ -645,7 +646,7 @@ assert(tech_pvt != NULL); tech_pvt->read_frame.datalen = 0; - switch_set_flag(tech_pvt, TFLAG_READING); + switch_set_flag_locked(tech_pvt, TFLAG_READING); if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) { bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; @@ -722,7 +723,7 @@ } - switch_clear_flag(tech_pvt, TFLAG_READING); + switch_clear_flag_locked(tech_pvt, TFLAG_READING); if (switch_test_flag(tech_pvt, TFLAG_BYE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); @@ -762,7 +763,7 @@ return SWITCH_STATUS_FALSE; } - switch_set_flag(tech_pvt, TFLAG_WRITING); + switch_set_flag_locked(tech_pvt, TFLAG_WRITING); if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) { bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; @@ -780,7 +781,7 @@ tech_pvt->timestamp_send += (int) samples; - switch_clear_flag(tech_pvt, TFLAG_WRITING); + switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); return status; } @@ -797,8 +798,8 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_set_flag(tech_pvt, TFLAG_BYE); + switch_clear_flag_locked(tech_pvt, TFLAG_IO); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); if (tech_pvt->rtp_session) { switch_rtp_kill_socket(tech_pvt->rtp_session); @@ -903,7 +904,7 @@ osip_message_set_content_type(progress, "application/sdp"); free(buf); eXosip_call_send_answer(tech_pvt->tid, 183, progress); - switch_set_flag(tech_pvt, TFLAG_EARLY_MEDIA); + switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_set_flag(channel, CF_EARLY_MEDIA); sdp_message_to_str(tech_pvt->local_sdp, &sdp_str); if (sdp_str) { @@ -1048,6 +1049,7 @@ switch_core_session_set_private(*new_session, tech_pvt); tech_pvt->session = *new_session; tech_pvt->te = globals.te; + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, module_pool); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(new_session); @@ -1097,7 +1099,7 @@ } switch_channel_set_flag(channel, CF_OUTBOUND); - switch_set_flag(tech_pvt, TFLAG_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_channel_set_state(channel, CS_INIT); return SWITCH_STATUS_SUCCESS; } @@ -1182,6 +1184,7 @@ switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; tech_pvt->te = globals.te; + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, module_pool); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(&session); @@ -1238,7 +1241,7 @@ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); } - switch_set_flag(tech_pvt, TFLAG_INBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_INBOUND); tech_pvt->did = event->did; tech_pvt->cid = event->cid; tech_pvt->tid = event->tid; @@ -1401,7 +1404,7 @@ } else { int ms; tech_pvt->read_frame.rate = rate; - switch_set_flag(tech_pvt, TFLAG_USING_CODEC); + switch_set_flag_locked(tech_pvt, TFLAG_USING_CODEC); ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Inbound Codec %s/%d %d ms\n", dname, rate, ms); tech_pvt->read_frame.codec = &tech_pvt->read_codec; @@ -1721,7 +1724,7 @@ } else { int ms; tech_pvt->read_frame.rate = rate; - switch_set_flag(tech_pvt, TFLAG_USING_CODEC); + switch_set_flag_locked(tech_pvt, TFLAG_USING_CODEC); ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Outbound Codec %s/%d %d ms\n", dname, rate, ms); tech_pvt->read_frame.codec = &tech_pvt->read_codec; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Jun 22 19:56:09 2006 @@ -90,6 +90,7 @@ char *name; switch_buffer_t *dtmf_buffer; switch_mutex_t *dtmf_mutex; + switch_mutex_t *flag_mutex; switch_mutex_t *profile_mutex; switch_core_session_t *session; switch_channel_state_t state; @@ -162,6 +163,7 @@ switch_core_hash_init(&(*channel)->variables, pool); switch_buffer_create(pool, &(*channel)->dtmf_buffer, 128); switch_mutex_init(&(*channel)->dtmf_mutex, SWITCH_MUTEX_NESTED, pool); + switch_mutex_init(&(*channel)->flag_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&(*channel)->profile_mutex, SWITCH_MUTEX_NESTED, pool); (*channel)->hangup_cause = SWITCH_CAUSE_UNALLOCATED; @@ -352,13 +354,13 @@ SWITCH_DECLARE(void) switch_channel_set_flag(switch_channel_t *channel, switch_channel_flag_t flags) { assert(channel != NULL); - switch_set_flag(channel, flags); + switch_set_flag_locked(channel, flags); } SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flags) { assert(channel != NULL); - switch_clear_flag(channel, flags); + switch_clear_flag_locked(channel, flags); } SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_state(switch_channel_t *channel)

1 0

[commit] r1661 - freeswitch/trunk/src/include
by anthm＠freeswitch.org 22 Jun '06

22 Jun '06

Author: anthm Date: Thu Jun 22 19:38:44 2006 New Revision: 1661 Modified: freeswitch/trunk/src/include/switch_utils.h Log: add set/clear flag locked macros Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Jun 22 19:38:44 2006 @@ -113,7 +113,21 @@ #define switch_set_flag(obj, flag) (obj)->flags |= (flag) /*! + \brief Set a flag on an arbitrary object while locked + \param obj the object to set the flags on + \param flag the or'd list of flags to set +*/ +#define switch_set_flag_locked(obj, flag) switch_mutex_lock(obj->flag_mutex); (obj)->flags |= (flag); switch_mutex_unlock(obj->flag_mutex); + +/*! \brief Clear a flag on an arbitrary object + \param obj the object to test + \param flag the or'd list of flags to clear +*/ +#define switch_clear_flag_locked(obj, flag) switch_mutex_lock(obj->flag_mutex); (obj)->flags &= ~(flag); switch_mutex_unlock(obj->flag_mutex); + +/*! + \brief Clear a flag on an arbitrary object while locked \param obj the object to test \param flag the or'd list of flags to clear */

1 0

[commit] r1660 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by anthm＠freeswitch.org 22 Jun '06

22 Jun '06

Author: anthm Date: Thu Jun 22 17:57:40 2006 New Revision: 1660 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: dingaling tweak Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Jun 22 17:57:40 2006 @@ -549,7 +549,7 @@ handle->features = iks_stream_features(node); if (opt_use_tls && !iks_is_secure(handle->parser)) break; - if (ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) { + if (ldl_test_flag(handle, LDL_FLAG_CONNECTED)) { iks *t; if (handle->features & IKS_STREAM_BIND) { t = iks_make_resource_bind(handle->acc); @@ -576,14 +576,22 @@ } } else if (strcmp("success", iks_name(node)) == 0) { globals.logger(DL_LOG_DEBUG, "XMPP server connected\n"); + iks_send_header(handle->parser, handle->acc->server); + ldl_set_flag(handle, LDL_FLAG_CONNECTED); if (handle->session_callback) { - handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "core", "Login Success", handle->login); + handle->session_callback(handle, NULL, LDL_SIGNAL_CONNECTED, "core", "Server Connected", handle->login); } - iks_send_header(handle->parser, handle->acc->server); - ldl_set_flag(handle, LDL_FLAG_AUTHORIZED); } else { ikspak *pak; + if (!ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) { + if (handle->session_callback) { + handle->session_callback(handle, NULL, LDL_SIGNAL_LOGIN_SUCCESS, "core", "Login Success", handle->login); + } + globals.logger(DL_LOG_DEBUG, "XMPP authenticated\n"); + ldl_set_flag(handle, LDL_FLAG_AUTHORIZED); + } + pak = iks_packet(node); iks_filter_packet(handle->filter, pak); if (handle->job_done == 1) @@ -803,7 +811,7 @@ ldl_flush_queue(handle); } - if (!ldl_test_flag(handle, LDL_FLAG_AUTHORIZED)) { + if (!ldl_test_flag(handle, LDL_FLAG_CONNECTED)) { if (IKS_NET_TLSFAIL == e) { globals.logger(DL_LOG_DEBUG, "tls handshake failed\n"); microsleep(500); @@ -820,6 +828,7 @@ iks_disconnect(handle->parser); iks_parser_delete(handle->parser); + ldl_clear_flag(handle, LDL_FLAG_CONNECTED); ldl_clear_flag(handle, LDL_FLAG_AUTHORIZED); } Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Thu Jun 22 17:57:40 2006 @@ -99,7 +99,8 @@ LDL_FLAG_INIT = (1 << 0), LDL_FLAG_RUNNING = (1 << 1), LDL_FLAG_AUTHORIZED = (1 << 2), - LDL_FLAG_READY = (1 << 3) + LDL_FLAG_READY = (1 << 3), + LDL_FLAG_CONNECTED = (1 << 4) } ldl_flag_t; typedef enum { @@ -111,6 +112,7 @@ LDL_SIGNAL_ERROR, LDL_SIGNAL_LOGIN_SUCCESS, LDL_SIGNAL_LOGIN_FAILURE, + LDL_SIGNAL_CONNECTED } ldl_signal_t; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 22 17:57:40 2006 @@ -39,6 +39,7 @@ #define DL_EVENT_LOGIN_SUCCESS "dingaling::login_success" #define DL_EVENT_LOGIN_FAILURE "dingaling::login_failure" #define DL_EVENT_MESSAGE "dingaling::message" +#define DL_EVENT_CONNECTED "dingaling::connected" static const char modname[] = "mod_dingaling"; @@ -1099,6 +1100,11 @@ return SWITCH_STATUS_GENERR; } + if (switch_event_reserve_subclass(DL_EVENT_CONNECTED) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!", DL_EVENT_CONNECTED); + return SWITCH_STATUS_GENERR; + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = &channel_module_interface; @@ -1418,6 +1424,12 @@ break; case LDL_SIGNAL_LOGIN_FAILURE: if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_LOGIN_FAILURE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login); + switch_event_fire(&event); + } + break; + case LDL_SIGNAL_CONNECTED: + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, DL_EVENT_CONNECTED) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", profile->login); switch_event_fire(&event); }

1 0

[commit] r1659 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by anthm＠freeswitch.org 22 Jun '06

22 Jun '06

Author: anthm Date: Thu Jun 22 16:42:44 2006 New Revision: 1659 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: sync Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 22 16:42:44 2006 @@ -1399,11 +1399,6 @@ return LDL_STATUS_FALSE; } - - //#define DL_EVENT_LOGIN_SUCCESS "dingaling::login_success" - //#define DL_EVENT_LOGIN_FAILURE "dingaling::login_failure" - //#define DL_EVENT_MESSAGE "dingaling::message" - if (!dlsession) { switch(signal) { case LDL_SIGNAL_MSG:

1 0

[commit] r1658 - freeswitch/branches/apsaras
by sphere＠freeswitch.org 22 Jun '06

22 Jun '06

Author: sphere Date: Thu Jun 22 16:36:25 2006 New Revision: 1658 Added: freeswitch/branches/apsaras/ Log: Creating empty folder for apsaras

1 0

[commit] r1657 - freeswitch/trunk/src/mod/endpoints/mod_exosip
by anthm＠freeswitch.org 22 Jun '06

22 Jun '06

Author: anthm Date: Thu Jun 22 15:15:10 2006 New Revision: 1657 Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Log: clear up SDP fiasco Modified: freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Thu Jun 22 15:15:10 2006 @@ -351,10 +351,12 @@ if (tech_pvt->num_codecs > 0) { int i; + static const switch_codec_implementation_t *imp; + for (i = 0; i < tech_pvt->num_codecs; i++) { - int x = 0; + snprintf(tmp, sizeof(tmp), "%u", tech_pvt->codecs[i]->ianacode); sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp)); imp = tech_pvt->codecs[i]->implementations; @@ -362,7 +364,7 @@ while(NULL != imp) { uint32_t sps = imp->samples_per_second; /* Add to SDP config */ - sdp_add_codec(tech_pvt->sdp_config, tech_pvt->codecs[i]->codec_type, tech_pvt->codecs[i]->ianacode, tech_pvt->codecs[i]->iananame, sps, x++); + sdp_add_codec(tech_pvt->sdp_config, tech_pvt->codecs[i]->codec_type, tech_pvt->codecs[i]->ianacode, tech_pvt->codecs[i]->iananame, sps, 0); /* Add to SDP message */ snprintf(tmp, sizeof(tmp), "%u %s/%d", tech_pvt->codecs[i]->ianacode, tech_pvt->codecs[i]->iananame, sps); @@ -599,7 +601,8 @@ if (!switch_test_flag(tech_pvt, TFLAG_ANS) && !switch_channel_test_flag(channel, CF_OUTBOUND) ) { char *buf = NULL; osip_message_t *answer = NULL; - + char *sdp_str; + /* Transmit 200 OK with SDP */ eXosip_lock(); eXosip_call_build_answer(tech_pvt->tid, 200, &answer); @@ -610,6 +613,13 @@ eXosip_call_send_answer(tech_pvt->tid, 200, answer); eXosip_unlock(); switch_set_flag(tech_pvt, TFLAG_ANS); + + sdp_message_to_str(tech_pvt->local_sdp, &sdp_str); + if (sdp_str) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Answer SDP:\n%s", sdp_str); + free(sdp_str); + } + } @@ -887,13 +897,19 @@ eXosip_lock(); eXosip_call_build_answer(tech_pvt->tid, 183, &progress); if (progress) { - sdp_message_to_str(tech_pvt->local_sdp, &buf); - osip_message_set_body(progress, buf, strlen(buf)); - osip_message_set_content_type(progress, "application/sdp"); - free(buf); - eXosip_call_send_answer(tech_pvt->tid, 183, progress); - switch_set_flag(tech_pvt, TFLAG_EARLY_MEDIA); - switch_channel_set_flag(channel, CF_EARLY_MEDIA); + char *sdp_str; + sdp_message_to_str(tech_pvt->local_sdp, &buf); + osip_message_set_body(progress, buf, strlen(buf)); + osip_message_set_content_type(progress, "application/sdp"); + free(buf); + eXosip_call_send_answer(tech_pvt->tid, 183, progress); + switch_set_flag(tech_pvt, TFLAG_EARLY_MEDIA); + switch_channel_set_flag(channel, CF_EARLY_MEDIA); + sdp_message_to_str(tech_pvt->local_sdp, &sdp_str); + if (sdp_str) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Progress SDP:\n%s", sdp_str); + free(sdp_str); + } } eXosip_unlock(); } @@ -1140,7 +1156,7 @@ sdp_message_t *remote_sdp = NULL; sdp_connection_t *conn = NULL; sdp_media_t *remote_med = NULL, *audio_tab[10], *video_tab[10], *t38_tab[10], *app_tab[10]; - char local_sdp_str[8192] = "", port[8] = ""; + char local_sdp_str[1024] = "", port[8] = ""; int mline = 0, pos = 0; switch_channel_t *channel = NULL; char name[128]; @@ -1271,40 +1287,43 @@ } } osip_rfc3264_init(&tech_pvt->sdp_config); + /* Add in what codecs we support locally */ tech_set_codecs(tech_pvt); - + sdp_message_init(&tech_pvt->local_sdp); + + sprintf(dbuf, "%u", tech_pvt->te); sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(dbuf)); sdp_add_codec(tech_pvt->sdp_config, SWITCH_CODEC_TYPE_AUDIO, tech_pvt->te, "telephone-event", 8000, 0); sprintf(dbuf, "%u telephone-event/8000", tech_pvt->te); sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(dbuf)); - + + if (tech_pvt->num_codecs > 0) { int i; static const switch_codec_implementation_t *imp; - - for (i = 0; i < tech_pvt->num_codecs; i++) { - int x = 0; - for (imp = tech_pvt->codecs[i]->implementations; imp; imp = imp->next) { sdp_add_codec(tech_pvt->sdp_config, tech_pvt->codecs[i]->codec_type, tech_pvt->codecs[i]->ianacode, tech_pvt->codecs[i]->iananame, - imp->samples_per_second, x++); + imp->samples_per_second, 0); + } } } + + - osip_rfc3264_prepare_answer(tech_pvt->sdp_config, remote_sdp, local_sdp_str, 8192); + osip_rfc3264_prepare_answer(tech_pvt->sdp_config, remote_sdp, local_sdp_str, sizeof(local_sdp_str)); sdp_message_parse(tech_pvt->local_sdp, local_sdp_str); sdp_message_to_str(remote_sdp, &remote_sdp_str); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str, remote_sdp_str); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "REMOTE SDP:\n%s", remote_sdp_str); mline = 0; while (0 == osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {

1 0

[commit] r1656 - freeswitch/branches/gerald
by sphere＠freeswitch.org 22 Jun '06

22 Jun '06

Author: sphere Date: Thu Jun 22 10:10:23 2006 New Revision: 1656 Added: freeswitch/branches/gerald/ Log: Creating empty folder for gerald

1 0

[commit] r1655 - freeswitch/branches/ffx
by sphere＠freeswitch.org 22 Jun '06

22 Jun '06

Author: sphere Date: Thu Jun 22 01:21:22 2006 New Revision: 1655 Added: freeswitch/branches/ffx/ Log: Creating empty folder for ffx

1 0