- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3962 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '07

15 Jan '07

Author: mikej Date: Sun Jan 14 23:32:21 2007 New Revision: 3962 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: bind to the right address when using ext-sip-ip 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 Sun Jan 14 23:32:21 2007 @@ -227,6 +227,7 @@ char *extsipip; char *username; char *url; + char *bindurl; char *sipdomain; char *timer_name; int sip_port; @@ -4633,7 +4634,7 @@ profile->nua = nua_create(profile->s_root, /* Event loop */ event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ - NUTAG_URL(profile->url), + NUTAG_URL(profile->bindurl), NTATAG_UDP_MTU(65536), TAG_END()); /* Last tag should always finish the sequence */ @@ -4779,7 +4780,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; sofia_profile_t *profile = NULL; char url[512] = ""; - + char bindurl[512] =""; switch_mutex_lock(globals.mutex); globals.running = 1; switch_mutex_unlock(globals.mutex); @@ -4954,10 +4955,14 @@ } if (profile->extsipip) { snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->extsipip, profile->sip_port); + snprintf(bindurl, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); + profile->url = switch_core_strdup(profile->pool, url); + profile->bindurl = switch_core_strdup(profile->pool, bindurl); } else { snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); + profile->url = switch_core_strdup(profile->pool, url); + profile->bindurl = profile->url; } - profile->url = switch_core_strdup(profile->pool, url); } if (profile) { if ((registrations = switch_xml_child(xprofile, "registrations"))) {

1 0

[commit] r3961 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '07

15 Jan '07

Author: mikej Date: Sun Jan 14 22:52:39 2007 New Revision: 3961 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: if we define ext-sip-ip in the profile for config, use it for the profile url. This does not yet use stun, or have any method for determining on a call by call basis if a call needs to use the internal or external. 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 Sun Jan 14 22:52:39 2007 @@ -4952,8 +4952,11 @@ if (!profile->sipdomain) { profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); } - - snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); + if (profile->extsipip) { + snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->extsipip, profile->sip_port); + } else { + snprintf(url, sizeof(url), "sip:mod_sofia@%s:%d", profile->sipip, profile->sip_port); + } profile->url = switch_core_strdup(profile->pool, url); } if (profile) {

1 0

[commit] r3955 - in freeswitch/trunk/src/mod: . applications applications/mod_bridgecall applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_echo applications/mod_enum applications/mod_ivrtest applications/mod_park applications/mod_playback applications/mod_rss applications/mod_skel asr_tts asr_tts/mod_cepstral codecs codecs/mod_amr codecs/mod_g711 codecs/mod_g722 codecs/mod_g723_1 codecs/mod_g726 codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc c
by Freeswitch SVN 13 Jan '07

13 Jan '07

Author: mikej Date: Sat Jan 13 13:02:06 2007 New Revision: 3955 Modified: freeswitch/trunk/src/mod/ (props changed) freeswitch/trunk/src/mod/applications/ (props changed) freeswitch/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_conference/ (props changed) freeswitch/trunk/src/mod/applications/mod_dptools/ (props changed) freeswitch/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/trunk/src/mod/applications/mod_enum/ (props changed) freeswitch/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/trunk/src/mod/applications/mod_park/ (props changed) freeswitch/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/asr_tts/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ (props changed) freeswitch/trunk/src/mod/codecs/ (props changed) freeswitch/trunk/src/mod/codecs/mod_amr/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g722/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g726/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/trunk/src/mod/codecs/mod_lpc10/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/dialplans/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/dotnet/ (props changed) freeswitch/trunk/src/mod/endpoints/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_cdr/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_socket/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_test/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/ (props changed) freeswitch/trunk/src/mod/formats/mod_native_file/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/languages/ (props changed) freeswitch/trunk/src/mod/languages/mod_mono/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_php/ (props changed) freeswitch/trunk/src/mod/languages/mod_python/ (props changed) freeswitch/trunk/src/mod/languages/mod_ruby/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/ (props changed) freeswitch/trunk/src/mod/loggers/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_syslog/ (props changed) freeswitch/trunk/src/mod/say/ (props changed) freeswitch/trunk/src/mod/say/mod_say_en/ (props changed) freeswitch/trunk/src/mod/timers/ (props changed) freeswitch/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/trunk/src/mod/xml_int/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_curl/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) Log: add *.dylib to the svn:ignore for the mods.

1 0

[commit] r3954 - freeswitch/trunk
by Freeswitch SVN 13 Jan '07

13 Jan '07

Author: anthm Date: Sat Jan 13 11:52:11 2007 New Revision: 3954 Modified: freeswitch/trunk/modules.conf.in Log: add enum to default build Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Sat Jan 13 11:52:11 2007 @@ -5,6 +5,7 @@ applications/mod_conference applications/mod_dptools applications/mod_echo +applications/mod_enum #applications/mod_ivrtest #applications/mod_park applications/mod_playback

1 0

[commit] r3953 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Jan '07

13 Jan '07

Author: anthm Date: Fri Jan 12 22:28:08 2007 New Revision: 3953 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Avoiding Segfaults from buggy depend libs Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Jan 12 22:28:08 2007 @@ -2152,6 +2152,11 @@ channel = switch_core_session_get_channel(session); + if (!sdp->sdp_connection) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp!\n"); + return 0; + } + if ((tech_pvt->origin = switch_core_session_strdup(session, (char *) sdp->sdp_origin->o_username))) { if (strstr(tech_pvt->origin, "CiscoSystemsSIP-GW-UserAgent")) { switch_set_flag_locked(tech_pvt, TFLAG_BUGGY_2833);

1 0

[commit] r3951 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 12 Jan '07

12 Jan '07

Author: anthm Date: Fri Jan 12 11:05:49 2007 New Revision: 3951 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add session_record api command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Jan 12 11:05:49 2007 @@ -39,6 +39,7 @@ static const char modname[] = "mod_commands"; static switch_api_interface_t ctl_api_interface; static switch_api_interface_t uuid_bridge_api_interface; +static switch_api_interface_t session_record_api_interface; static switch_api_interface_t status_api_interface; static switch_api_interface_t show_api_interface; static switch_api_interface_t pause_api_interface; @@ -362,6 +363,62 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t session_record_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) +{ + switch_core_session_t *session = NULL; + char *argv[4] = {0}; + char *uuid = NULL, *action = NULL, *path = NULL; + int argc = 0; + + if (isession) { + return SWITCH_STATUS_FALSE; + } + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + if ((argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) != 3) { + goto usage; + } + + uuid = argv[0]; + action = argv[1]; + action = argv[2]; + + if (!(session = switch_core_session_locate(uuid))) { + stream->write_function(stream, "-Error Cannot locate session!\n"); + return SWITCH_STATUS_SUCCESS; + } + + if (switch_strlen_zero(action) || switch_strlen_zero(path)) { + goto usage; + } + + if (!strcasecmp(action, "start")) { + switch_ivr_record_session(session, path, NULL); + } else if (!strcasecmp(action, "stop")) { + switch_ivr_stop_record_session(session, path); + } else { + goto usage; + } + + goto done; + + usage: + + stream->write_function(stream, "USAGE: %s\n", session_record_api_interface.syntax); + return SWITCH_STATUS_SUCCESS; + + done: + + if (session) { + switch_core_session_rwunlock(session); + } + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; @@ -694,12 +751,20 @@ /*.next */ &hold_api_interface }; +static switch_api_interface_t session_record_api_interface = { + /*.interface_name */ "session_record", + /*.desc */ "session record", + /*.function */ session_record_function, + /*.syntax */ "<uuid> [start|stop] <path>", + /*.next */ &broadcast_api_interface +}; + static switch_api_interface_t uuid_bridge_api_interface = { /*.interface_name */ "uuid_bridge", /*.desc */ "uuid_bridge", /*.function */ uuid_bridge_function, /*.syntax */ "<uuid> <other_uuid>", - /*.next */ &broadcast_api_interface + /*.next */ &session_record_api_interface }; static switch_api_interface_t status_api_interface = {

1 0

[commit] r3950 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 12 Jan '07

12 Jan '07

Author: anthm Date: Thu Jan 11 19:26:36 2007 New Revision: 3950 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: Avoiding Deadlock Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 11 19:26:36 2007 @@ -190,7 +190,7 @@ uint32_t interval; switch_mutex_t *mutex; conference_member_t *members; - switch_thread_rwlock_t *member_rwlock; + switch_mutex_t *member_mutex; conference_file_node_t *fnode; switch_memory_pool_t *pool; switch_thread_rwlock_t *rwlock; @@ -373,7 +373,7 @@ assert(conference != NULL); assert(id != 0); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); for(member = conference->members; member; member = member->next) { if (switch_test_flag(member, MFLAG_NOCHANNEL)) { @@ -389,7 +389,7 @@ member = NULL; } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); return member; } @@ -401,14 +401,14 @@ int count = 0; assert (conference != NULL); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); for(member = conference->members; member; member = member->next) { if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { switch_clear_flag_locked(member, MFLAG_RUNNING); count++; } } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); return count; } @@ -470,13 +470,13 @@ switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); - switch_thread_rwlock_wrlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); member->conference = conference; member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; switch_set_flag(member, MFLAG_INTREE); - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { conference->count++; @@ -534,7 +534,7 @@ assert(member != NULL); switch_mutex_lock(conference->mutex); - switch_thread_rwlock_wrlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); @@ -609,7 +609,7 @@ switch_event_fire(&event); } } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); @@ -854,7 +854,7 @@ conference->fnode = NULL; } - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); for(imember = conference->members; imember; imember = imember->next) { switch_channel_t *channel; @@ -873,7 +873,7 @@ switch_clear_flag_locked(imember, MFLAG_RUNNING); } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->mutex); @@ -1821,9 +1821,9 @@ assert(conference != NULL); switch_mutex_lock(conference->mutex); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); count = conference->count; - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->mutex); if (!count) { @@ -2049,12 +2049,12 @@ } switch_mutex_lock(conference->mutex); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); count = conference->count; if (!(conference->tts_engine && conference->tts_voice)) { count = 0; } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); switch_mutex_unlock(conference->mutex); if (!count) { @@ -2119,11 +2119,11 @@ assert(stream != NULL); assert(pfncallback != NULL); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { pfncallback(member, stream, data); } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); } @@ -2134,7 +2134,7 @@ assert(conference != NULL); assert(stream != NULL); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); // stream->write_function(stream, "<pre>Current Callers:\n"); for (member = conference->members; member; member = member->next) { @@ -2156,7 +2156,7 @@ } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); } @@ -2169,7 +2169,7 @@ assert(delim != NULL); - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { switch_channel_t *channel; @@ -2213,7 +2213,7 @@ member->energy_level); } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); } @@ -3115,7 +3115,7 @@ conference_member_t *member = NULL; conference_member_t *last_member = NULL; - switch_thread_rwlock_rdlock(conference->member_rwlock); + switch_mutex_lock(conference->member_mutex); /* find last (oldest) member */ member = conference->members; @@ -3132,7 +3132,7 @@ pfn(last_member, stream, argv[argn+2]); } - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->member_mutex); } else { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; conference_member_t *member = conference_member_get(conference, id); @@ -4459,7 +4459,7 @@ switch_mutex_init(&conference->mutex, SWITCH_MUTEX_NESTED, conference->pool); switch_mutex_init(&conference->flag_mutex, SWITCH_MUTEX_NESTED, conference->pool); switch_thread_rwlock_create(&conference->rwlock, conference->pool); - switch_thread_rwlock_create(&conference->member_rwlock, conference->pool); + switch_mutex_init(&conference->member_mutex, SWITCH_MUTEX_NESTED, conference->pool); return conference; }

1 0

[commit] r3949 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 12 Jan '07

12 Jan '07

Author: anthm Date: Thu Jan 11 19:15:21 2007 New Revision: 3949 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: Avoiding Deadlock Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 11 19:15:21 2007 @@ -654,7 +654,6 @@ ready = 0; /* Read one frame of audio from each member channel and save it for redistribution */ - switch_thread_rwlock_rdlock(conference->member_rwlock); for (imember = conference->members; imember; imember = imember->next) { if (imember->buflen) { memset(imember->frame, 255, imember->buflen); @@ -693,7 +692,6 @@ } switch_mutex_unlock(imember->audio_in_mutex); } - switch_thread_rwlock_unlock(conference->member_rwlock); /* If a file or speech event is being played */ if (conference->fnode) { /* Lead in time */ @@ -726,7 +724,6 @@ if (ready) { /* Build a muxed frame for every member that contains the mixed audio of everyone else */ - switch_thread_rwlock_rdlock(conference->member_rwlock); for (omember = conference->members; omember; omember = omember->next) { omember->len = bytes; if (conference->fnode) { @@ -785,7 +782,6 @@ } } } - switch_thread_rwlock_unlock(conference->member_rwlock); /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ for (imember = conference->members; imember; imember = imember->next) {

1 0

[commit] r3948 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 12 Jan '07

12 Jan '07

Author: anthm Date: Thu Jan 11 19:09:43 2007 New Revision: 3948 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: Avoiding Deadlock (by puting the mutex in the right place) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Jan 11 19:09:43 2007 @@ -466,15 +466,17 @@ assert(member != NULL); switch_mutex_lock(conference->mutex); - switch_thread_rwlock_wrlock(conference->member_rwlock); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); + + switch_thread_rwlock_wrlock(conference->member_rwlock); member->conference = conference; member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; switch_set_flag(member, MFLAG_INTREE); + switch_thread_rwlock_unlock(conference->member_rwlock); if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { conference->count++; @@ -513,7 +515,7 @@ switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); - switch_thread_rwlock_unlock(conference->member_rwlock); + switch_mutex_unlock(conference->mutex); status = SWITCH_STATUS_SUCCESS; @@ -607,11 +609,10 @@ switch_event_fire(&event); } } - + switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); - switch_thread_rwlock_unlock(conference->member_rwlock); switch_mutex_unlock(conference->mutex); status = SWITCH_STATUS_SUCCESS; @@ -784,6 +785,7 @@ } } } + switch_thread_rwlock_unlock(conference->member_rwlock); /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ for (imember = conference->members; imember; imember = imember->next) { @@ -792,7 +794,6 @@ switch_mutex_unlock(imember->audio_out_mutex); } } - switch_thread_rwlock_unlock(conference->member_rwlock); if (conference->fnode && conference->fnode->done) { conference_file_node_t *fnode;

1 0

[commit] r3947 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Jan '07

11 Jan '07

Author: mikej Date: Thu Jan 11 18:44:18 2007 New Revision: 3947 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: add max_forwards chanvar, maybe we should put this in caller profile and allways pass it across and decrement it to avoid loops across the switch, at least for protocols that support loop detection. 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 Jan 11 18:44:18 2007 @@ -4149,8 +4149,10 @@ snprintf(uri, sizeof(uri), "%s@%s:%s", req_user, req_host, req_port); switch_channel_set_variable(channel, "sip_req_uri", uri); + snprintf(uri, sizeof(uri), "%u", sip->sip_max_forwards->mf_count); + switch_channel_set_variable(channel, "max_forwards", uri); - if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), (char *) from->a_url->url_user, profile->dialplan, displayname,

1 0