- Freeswitch-svn - FreeSWITCH Mailing Lists

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

20 Mar '09

Author: anthm Date: Fri Mar 20 12:03:46 2009 New Revision: 12686 Log: fix regression Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Mar 20 12:03:46 2009 @@ -344,19 +344,13 @@ tech_pvt = switch_core_session_get_private(session); channel = switch_core_session_get_channel(session); if (tech_pvt) { - - if (status >= 300) { - sofia_set_flag_locked(tech_pvt, TFLAG_BYE); - } - switch_mutex_lock(tech_pvt->sofia_mutex); locked = 1; } else { switch_core_session_rwunlock(session); return; } - - + if (status >= 180 && !*sofia_private->auth_gateway_name) { const char *gwname = switch_channel_get_variable(channel, "sip_use_gateway"); if (!switch_strlen_zero(gwname)) { @@ -3338,6 +3332,7 @@ tech_pvt->q850_cause = SWITCH_CAUSE_MANDATORY_IE_MISSING; } case nua_callstate_terminated: + sofia_set_flag_locked(tech_pvt, TFLAG_BYE); if (sofia_test_flag(tech_pvt, TFLAG_NOHUP)) { sofia_clear_flag_locked(tech_pvt, TFLAG_NOHUP); } else if (switch_channel_up(channel)) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Mar 20 12:03:46 2009 @@ -2375,6 +2375,7 @@ return SWITCH_STATUS_SUCCESS; } + return SWITCH_STATUS_FALSE; }

1 0

[commit] r12685 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_fifo
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 10:28:50 2009 New Revision: 12685 Log: MODAPP-237 Modified: freeswitch/trunk/conf/autoload_configs/fifo.conf.xml freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/conf/autoload_configs/fifo.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/fifo.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/fifo.conf.xml Fri Mar 20 10:28:50 2009 @@ -1,7 +1,7 @@ <configuration name="fifo.conf" description="FIFO Configuration"> <fifos> <fifo name="cool_fifo@$${domain}" importance="0"> -  +  </fifo> </fifos> </configuration> Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Fri Mar 20 10:28:50 2009 @@ -449,6 +449,7 @@ switch_caller_extension_t *extension = NULL; char *app_name, *arg = NULL; char sql[256] = ""; + const char *member_wait = NULL; switch_snprintf(sql, sizeof(sql), "update fifo_outbound set use_count=use_count+1 where uuid='%s'", h->uuid); fifo_execute_sql(sql, globals.sql_mutex); @@ -462,10 +463,17 @@ channel = switch_core_session_get_channel(session); + + if ((member_wait = switch_channel_get_variable(channel, "member_wait"))) { + if (strcasecmp(member_wait, "wait") && strcasecmp(member_wait, "nowait")) { + member_wait = NULL; + } + } + switch_channel_set_variable(channel, "fifo_outbound_uuid", h->uuid); switch_core_event_hook_add_state_change(session, hanguphook); app_name = "fifo"; - arg = switch_core_session_sprintf(session, "%s out wait", h->node_name); + arg = switch_core_session_sprintf(session, "%s out %s", h->node_name, member_wait ? member_wait : "wait"); extension = switch_caller_extension_new(session, app_name, arg); switch_caller_extension_add_application(session, extension, app_name, arg); switch_channel_set_caller_extension(channel, extension);

1 0

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

20 Mar '09

Author: brian Date: Fri Mar 20 09:31:15 2009 New Revision: 12684 Log: FSCORE-333 Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Fri Mar 20 09:31:15 2009 @@ -2022,9 +2022,14 @@ static char *switch_xml_toxml_r(switch_xml_t xml, char **s, switch_size_t *len, switch_size_t *max, switch_size_t start, char ***attr, uint32_t * count) { int i, j; - char *txt = (char *)(xml->parent) ? xml->parent->txt : (char *)""; - switch_size_t off = 0; - uint32_t lcount = 0; + char *txt; + switch_size_t off; + uint32_t lcount; + +tailrecurse: + off = 0; + lcount = 0; + txt = (char *)(xml->parent) ? xml->parent->txt : (char *)""; /* parent character content up to this tag */ *s = switch_xml_ampencode(txt + start, xml->off - start, s, len, max, 0); @@ -2101,8 +2106,12 @@ off++; /* make sure off is within bounds */ if (xml->ordered) { + xml = xml->ordered; + start = off; + goto tailrecurse; +/* return switch_xml_toxml_r(xml->ordered, s, len, max, off, attr, count); - +*/ } else { if (*count > 0) (*count)--; @@ -2197,11 +2206,13 @@ /* free the memory allocated for the switch_xml structure */ SWITCH_DECLARE(void) switch_xml_free(switch_xml_t xml) { - switch_xml_root_t root = (switch_xml_root_t) xml; + switch_xml_root_t root; int i, j; char **a, *s; + switch_xml_t orig_xml; - +tailrecurse: + root = (switch_xml_root_t) xml; if (!xml) { return; } @@ -2221,7 +2232,7 @@ } switch_xml_free(xml->child); - switch_xml_free(xml->ordered); + /*switch_xml_free(xml->ordered);*/ if (!xml->parent) { /* free root tag allocations */ for (i = 10; root->ent[i]; i += 2) /* 0 - 9 are default entities (<>&"') */ @@ -2261,6 +2272,12 @@ free(xml->txt); /* character content */ if ((xml->flags & SWITCH_XML_NAMEM)) free(xml->name); /* tag name */ + if (xml->ordered) { + orig_xml = xml; + xml = xml->ordered; + free(orig_xml); + goto tailrecurse; + } free(xml); }

1 0

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

20 Mar '09

Author: anthm Date: Fri Mar 20 09:28:36 2009 New Revision: 12683 Log: doh Modified: freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Fri Mar 20 09:28:36 2009 @@ -243,7 +243,7 @@ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Sess Strdup Allocate %d\n", (int) len); #endif - duped = strdup(todup); + duped = apr_pstrdup(session->pool, todup); switch_assert(duped != NULL); #ifdef LOCK_MORE

1 0

[commit] r12682 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 08:58:45 2009 New Revision: 12682 Log: FSCORE-339 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Fri Mar 20 08:58:45 2009 @@ -317,7 +317,8 @@ uint32_t thresh; uint32_t silence_hits; uint32_t offset_pos; - //uint32_t last_pos; + switch_size_t samples_in; + switch_size_t samples_out; int32_t vol; switch_audio_resampler_t *resampler; switch_buffer_t *buffer; Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Fri Mar 20 08:58:45 2009 @@ -177,6 +177,7 @@ if ((status = fh->file_interface->file_read(fh, fh->pre_buffer_data, &rlen)) != SWITCH_STATUS_SUCCESS || !rlen) { switch_set_flag(fh, SWITCH_FILE_BUFFER_DONE); } else { + fh->samples_in += rlen; if (fh->channels > 1) { switch_mux_channels((int16_t *)fh->pre_buffer_data, rlen, fh->channels); } @@ -202,6 +203,8 @@ goto top; } + fh->samples_in += *len; + if (fh->channels > 1) { switch_mux_channels((int16_t *)data, *len, fh->channels); } @@ -317,11 +320,16 @@ if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { *len = 0; } + fh->samples_out += blen; } return status; } else { - return fh->file_interface->file_write(fh, data, len); + switch_status_t status; + if ((status = fh->file_interface->file_write(fh, data, len)) == SWITCH_STATUS_SUCCESS) { + fh->samples_out += *len; + } + return status; } } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Mar 20 08:58:45 2009 @@ -439,12 +439,23 @@ case SWITCH_ABC_TYPE_INIT: break; case SWITCH_ABC_TYPE_CLOSE: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file); - switch_channel_set_private(channel, rh->file, NULL); + { + switch_codec_implementation_t read_impl = {0}; + switch_core_session_get_read_impl(session, &read_impl); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file); + switch_channel_set_private(channel, rh->file, NULL); + + if (rh->fh) { + switch_core_file_close(rh->fh); + } - if (rh->fh) { - switch_core_file_close(rh->fh); + if (rh->fh->samples_out < read_impl.samples_per_second * 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); + switch_file_remove(rh->file, switch_core_session_get_pool(session)); + } } + break; case SWITCH_ABC_TYPE_READ_PING: if (rh->fh) {

1 0

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

20 Mar '09

Author: anthm Date: Fri Mar 20 08:51:46 2009 New Revision: 12681 Log: add switch_str_nil to avoid printing (null) Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 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 Mar 20 08:51:46 2009 @@ -1839,7 +1839,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid Profile\n" "login[%s]\n" "pass[%s]\n" "dialplan[%s]\n" "message[%s]\n" "rtp-ip[%s]\n" "name[%s]\n" "exten[%s]\n", - profile->login, profile->password, profile->dialplan, profile->message, profile->ip, profile->name, profile->exten); + switch_str_nil(profile->login), + switch_str_nil(profile->password), + switch_str_nil(profile->dialplan), + switch_str_nil(profile->message), + switch_str_nil(profile->ip), + switch_str_nil(profile->name), + switch_str_nil(profile->exten)); return SWITCH_STATUS_FALSE; }

1 0

[commit] r12680 - in freeswitch/trunk: . libs/libdingaling/src src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Fri Mar 20 07:58:04 2009 New Revision: 12680 Log: MODENDP-202 and MODENDP-204 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Fri Mar 20 07:58:04 2009 @@ -321,7 +321,7 @@ core-install: core_install clean_core: clean-libLTLIBRARIES - + rm -f $(libfreeswitch_la_OBJECTS) install_core: install-libLTLIBRARIES core_install: install_core Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Mar 20 07:58:04 2009 @@ -1593,6 +1593,7 @@ microsleep(100); } + ldl_set_flag_locked(handle, LDL_FLAG_STOPPED); } @@ -2324,6 +2325,7 @@ void ldl_handle_run(ldl_handle_t *handle) { + ldl_clear_flag_locked(handle, LDL_FLAG_STOPPED); ldl_set_flag_locked(handle, LDL_FLAG_RUNNING); xmpp_connect(handle, handle->login, handle->password); ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING); @@ -2332,12 +2334,24 @@ void ldl_handle_stop(ldl_handle_t *handle) { ldl_clear_flag_locked(handle, LDL_FLAG_RUNNING); + if (ldl_test_flag(handle, LDL_FLAG_TLS)) { + int fd; + if ((fd = iks_fd(handle->parser)) > -1) { + shutdown(fd, 0x02); + } + } + + while(!ldl_test_flag(handle, LDL_FLAG_STOPPED)) { + microsleep(100); + } + } ldl_status ldl_handle_destroy(ldl_handle_t **handle) { apr_pool_t *pool = (*handle)->pool; + ldl_handle_stop(*handle); ldl_flush_queue(*handle, 1); Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Fri Mar 20 07:58:04 2009 @@ -119,7 +119,8 @@ LDL_FLAG_AUTHORIZED = (1 << 2), LDL_FLAG_READY = (1 << 3), LDL_FLAG_CONNECTED = (1 << 4), - LDL_FLAG_QUEUE_RUNNING = (1 << 5) + LDL_FLAG_QUEUE_RUNNING = (1 << 5), + LDL_FLAG_STOPPED = (1 << 6) } ldl_flag_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 Fri Mar 20 07:58:04 2009 @@ -1805,7 +1805,7 @@ #define PRES_SYNTAX "dl_pres <profile_name>" #define LOGOUT_SYNTAX "dl_logout <profile_name>" -#define LOGIN_SYNTAX "dl_login <profile_name>" +#define LOGIN_SYNTAX "Existing Profile:\ndl_login profile=<profile_name>\nDynamic Profile:\ndl_login var1=val1;var2=val2;varN=valN\n" #define DEBUG_SYNTAX "dl_debug [true|false]" SWITCH_ADD_API(api_interface, "dl_debug", "DingaLing Debug", dl_debug, DEBUG_SYNTAX);

1 0

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

20 Mar '09

Author: mrene Date: Thu Mar 19 22:41:49 2009 New Revision: 12679 Log: tweak Modified: freeswitch/trunk/src/switch_core_port_allocator.c Modified: freeswitch/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/trunk/src/switch_core_port_allocator.c Thu Mar 19 22:41:49 2009 @@ -118,7 +118,7 @@ int odd = switch_test_flag(alloc, SPF_ODD); switch_mutex_lock(alloc->mutex); - srand((unsigned)(intptr_t)port_ptr + (uint32_t)switch_thread_self() + switch_micro_time_now()); + srand((unsigned)(intptr_t)port_ptr + (unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now()); while (alloc->track_used < alloc->track_len) { uint32_t index;

1 0

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

20 Mar '09

Author: mrene Date: Thu Mar 19 22:28:11 2009 New Revision: 12678 Log: Fix FreeBSD build Modified: freeswitch/trunk/src/switch_core_port_allocator.c Modified: freeswitch/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/trunk/src/switch_core_port_allocator.c Thu Mar 19 22:28:11 2009 @@ -118,7 +118,7 @@ int odd = switch_test_flag(alloc, SPF_ODD); switch_mutex_lock(alloc->mutex); - srand((unsigned)(intptr_t)port_ptr + switch_thread_self() + switch_micro_time_now()); + srand((unsigned)(intptr_t)port_ptr + (uint32_t)switch_thread_self() + switch_micro_time_now()); while (alloc->track_used < alloc->track_len) { uint32_t index;

1 0

[commit] r12677 - freeswitch/trunk/libs/apr
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: anthm Date: Thu Mar 19 21:08:18 2009 New Revision: 12677 Log: update Modified: freeswitch/trunk/libs/apr/.update Modified: freeswitch/trunk/libs/apr/.update ============================================================================== --- freeswitch/trunk/libs/apr/.update (original) +++ freeswitch/trunk/libs/apr/.update Thu Mar 19 21:08:18 2009 @@ -1 +1 @@ -Fri Mar 16 17:12:07 EDT 2007 +Thu Mar 19 21:08:11 CDT 2009

1 0