- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12635 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: andrew Date: Mon Mar 16 18:31:55 2009 New Revision: 12635 Log: Send a "call_hangup" to outbound/handlecall sessions when the relevant channel is hungup Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 18:31:55 2009 @@ -516,7 +516,7 @@ to distinguish them from normal events (if they are sent to the same process) */ ei_x_buff ebuf; - ei_x_new_with_version(&ebuf); + ei_x_new_with_version(&ebuf); ei_x_encode_tuple_header(&ebuf, 2); ei_x_encode_atom(&ebuf, "call_event"); ei_encode_switch_event(&ebuf, pevent); @@ -524,6 +524,7 @@ switch_mutex_lock(listener->sock_mutex); ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf); switch_mutex_unlock(listener->sock_mutex); + ei_x_free(&ebuf); /* event is a hangup, so this session can be removed */ if (pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { @@ -534,7 +535,6 @@ last->next = sp->next; else listener->session_list = sp->next; - switch_channel_clear_flag(switch_core_session_get_channel(sp->session), CF_CONTROLLED); /* this allows the application threads to exit */ @@ -542,13 +542,18 @@ switch_core_session_rwunlock(sp->session); removed = 1; + ei_x_new_with_version(&ebuf); + ei_x_encode_atom(&ebuf, "call_hangup"); + switch_mutex_lock(listener->sock_mutex); + ei_sendto(listener->ec, listener->sockfd, &sp->process, &ebuf); + switch_mutex_unlock(listener->sock_mutex); + ei_x_free(&ebuf); + /* TODO if this listener was created outbound, and the last session has been detached should the listener also exit? Does it matter? */ } - - ei_x_free(&ebuf); switch_event_destroy(&pevent); } if (!removed)

1 0

[commit] r12634 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: andrew Date: Mon Mar 16 17:58:36 2009 New Revision: 12634 Log: Fix removing sessions from linked list; fix a deadlock added in previous commit Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 17:58:36 2009 @@ -487,6 +487,7 @@ session_elem_t *last,*sp; switch_status_t status = SWITCH_STATUS_SUCCESS; void *pop; + int removed = 0; /* check up on all the attached sessions - if they have not yet sent an initial call event to the associated erlang process then do so if they have pending events in their queues then send them @@ -496,6 +497,7 @@ sp = listener->session_list; last = NULL; while(sp) { + removed = 0; if (switch_test_flag(sp, LFLAG_WAITING_FOR_PID)) { break; } @@ -538,6 +540,7 @@ /* this allows the application threads to exit */ switch_clear_flag_locked(sp, LFLAG_SESSION_ALIVE); switch_core_session_rwunlock(sp->session); + removed = 1; /* TODO if this listener was created outbound, and the last session has been detached @@ -548,7 +551,8 @@ ei_x_free(&ebuf); switch_event_destroy(&pevent); } - last = sp; + if (!removed) + last = sp; sp = sp->next; } switch_mutex_unlock(listener->session_mutex); @@ -1321,10 +1325,10 @@ stream->write_function(stream, "Outbound session for %s\n", switch_core_session_get_uuid(sp->session)); sp = sp->next; } - switch_mutex_unlock(l->session_mutex); } else { stream->write_function(stream, "No active sessions for %s\n", argv[1]); } + switch_mutex_unlock(l->session_mutex); break; } }

1 0

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

16 Mar '09

Author: mrene Date: Mon Mar 16 17:44:27 2009 New Revision: 12633 Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mon Mar 16 17:44:27 2009 @@ -3332,14 +3332,13 @@ void sofia_glue_sql_close(sofia_profile_t *profile) { #ifdef SWITCH_HAVE_ODBC - if (profile->odbc_dsn) { + if (profile->master_odbc) { switch_odbc_handle_destroy(&profile->master_odbc); - return; } -#endif - +#else switch_core_db_close(profile->master_db); profile->master_db = NULL; +#endif }

1 0

[commit] r12632 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 17:44:14 2009 New Revision: 12632 Log: mod_limit: close odbc handle Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Mon Mar 16 17:44:14 2009 @@ -1106,6 +1106,13 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown) { + + #ifdef SWITCH_HAVE_ODBC + if (globals.master_odbc) { + switch_odbc_handle_destroy(&globals.master_odbc); + } + #endif + switch_event_free_subclass(LIMIT_EVENT_USAGE); switch_xml_config_cleanup(config_settings);

1 0

[commit] r12631 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 17:25:05 2009 New Revision: 12631 Log: Properly shutdown the JS runtime on unload Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Mar 16 17:25:05 2009 @@ -3746,6 +3746,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown) { + JS_DestroyRuntime(globals.rt); + curl_global_cleanup(); switch_event_unbind(&globals.node); switch_core_hash_destroy(&module_manager.mod_hash);

1 0

[commit] r12630 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: andrew Date: Mon Mar 16 17:14:31 2009 New Revision: 12630 Log: Improved the 'erlang' console application; added the UUID to some debug messages Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 16 17:14:31 2009 @@ -152,7 +152,7 @@ for (s = listener->session_list; s; s = s->next) { /* check the event uuid against the uuid of each session */ if (!strcmp(uuid, switch_core_session_get_uuid(s->session))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending event to attached session\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending event to attached session for %s\n", switch_core_session_get_uuid(s->session)); if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { /* add the event to the queue for this session */ if (switch_queue_trypush(s->event_queue, clone) != SWITCH_STATUS_SUCCESS) { @@ -525,7 +525,7 @@ /* event is a hangup, so this session can be removed */ if (pevent->event_id == SWITCH_EVENT_CHANNEL_HANGUP) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup event for attached session\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup event for attached session for %s\n", switch_core_session_get_uuid(sp->session)); /* remove session from list */ if (last) @@ -1269,7 +1269,11 @@ char *mycmd = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; - const char *usage_string = "Supply some arguments, maybe?"; + const char *usage_string = "USAGE:\n" + "--------------------------------------------------------------------------------\n" + "erlang listeners\n" + "erlang sessions <node_name>\n" + "--------------------------------------------------------------------------------\n"; if (switch_strlen_zero(cmd)) { stream->write_function(stream, "%s", usage_string); @@ -1292,11 +1296,43 @@ listener_t *l; switch_mutex_lock(globals.listener_mutex); - for (l = listen_list.listeners; l; l = l->next) { - stream->write_function(stream, "Listener to %s with %d outbound sessions\n", l->peer_nodename, count_listener_sessions(l)); + if (listen_list.listeners) { + for (l = listen_list.listeners; l; l = l->next) { + stream->write_function(stream, "Listener to %s with %d outbound sessions\n", l->peer_nodename, count_listener_sessions(l)); + } + } else { + stream->write_function(stream, "No active listeners\n"); } switch_mutex_unlock(globals.listener_mutex); + } else if (!strcasecmp(argv[0], "sessions") && argc == 2) { + listener_t *l; + int found = 0; + + switch_mutex_lock(globals.listener_mutex); + for (l = listen_list.listeners; l; l = l->next) { + if (!strcasecmp(l->peer_nodename, argv[1])) { + session_elem_t *sp; + + found = 1; + switch_mutex_lock(l->session_mutex); + if ((sp = l->session_list)) { + while(sp) { + stream->write_function(stream, "Outbound session for %s\n", switch_core_session_get_uuid(sp->session)); + sp = sp->next; + } + switch_mutex_unlock(l->session_mutex); + } else { + stream->write_function(stream, "No active sessions for %s\n", argv[1]); + } + break; + } + } + switch_mutex_unlock(globals.listener_mutex); + + if (!found) + stream->write_function(stream, "Could not find a listener for %s\n", argv[1]); + } else { stream->write_function(stream, "I don't care for those arguments at all, sorry"); goto done;

1 0

[commit] r12629 - in freeswitch/trunk/src/mod: applications/mod_conference codecs/mod_g729 endpoints/mod_reference endpoints/mod_sofia
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 15:30:53 2009 New Revision: 12629 Log: Revert unwanted changes Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Mon Mar 16 15:30:53 2009 @@ -2922,7 +2922,7 @@ { switch_event_t *event; - if (member == NULL || switch_test_flag(member, MFLAG_NOCHANNEL)) + if (member == NULL) return SWITCH_STATUS_GENERR; switch_mutex_lock(member->control_mutex); Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Mon Mar 16 15:30:53 2009 @@ -1,7 +1,7 @@ BASE=../../../.. -DIR=./g729abc -A=$(DIR)/libg729ab.a +DIR=$(BASE)/libs/libg729 +A=$(DIR)/.libs/libg729.a -LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ; LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Mon Mar 16 15:30:53 2009 @@ -38,7 +38,7 @@ SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL); #ifndef G729_PASSTHROUGH -#include "g729ab.h" +#include "g729.h" struct g729_context { struct dec_state decoder_object; @@ -112,7 +112,7 @@ if (decoded_data_len % 160 == 0) { uint32_t new_len = 0; INT16 *ddp = decoded_data; - unsigned char *edp = encoded_data; + char *edp = encoded_data; int x; int loops = (int) decoded_data_len / 160; @@ -170,7 +170,7 @@ if (encoded_data_len % divisor == 0) { uint8_t *test; int loops = (int) encoded_data_len / divisor; - unsigned char *edp = encoded_data; + char *edp = encoded_data; short *ddp = decoded_data; int x; uint32_t new_len = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Mar 16 15:30:53 2009 @@ -272,6 +272,8 @@ { switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; + switch_time_t started = switch_time_now(); + unsigned int elapsed; switch_byte_t *data; channel = switch_core_session_get_channel(session); 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 Mon Mar 16 15:30:53 2009 @@ -2691,7 +2691,7 @@ } } - if (channel && sip && (status >= 300 && status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (channel && sip && (status >= 300 || status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { sip_contact_t * p_contact = sip->sip_contact; int i = 0; char var_name[80];

1 0

[commit] r12628 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/codecs/mod_g729 mod/endpoints/mod_reference mod/endpoints/mod_sofia
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 15:28:22 2009 New Revision: 12628 Log: Fix off-by-1 read err in switch_xml Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_xml.c 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 Mon Mar 16 15:28:22 2009 @@ -2922,7 +2922,7 @@ { switch_event_t *event; - if (member == NULL) + if (member == NULL || switch_test_flag(member, MFLAG_NOCHANNEL)) return SWITCH_STATUS_GENERR; switch_mutex_lock(member->control_mutex); Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Mon Mar 16 15:28:22 2009 @@ -1,7 +1,7 @@ BASE=../../../.. -DIR=$(BASE)/libs/libg729 -A=$(DIR)/.libs/libg729.a +DIR=./g729abc +A=$(DIR)/libg729ab.a -LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)" ; else echo "-DG729_PASSTHROUGH" ; fi ; LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Mon Mar 16 15:28:22 2009 @@ -38,7 +38,7 @@ SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL); #ifndef G729_PASSTHROUGH -#include "g729.h" +#include "g729ab.h" struct g729_context { struct dec_state decoder_object; @@ -112,7 +112,7 @@ if (decoded_data_len % 160 == 0) { uint32_t new_len = 0; INT16 *ddp = decoded_data; - char *edp = encoded_data; + unsigned char *edp = encoded_data; int x; int loops = (int) decoded_data_len / 160; @@ -170,7 +170,7 @@ if (encoded_data_len % divisor == 0) { uint8_t *test; int loops = (int) encoded_data_len / divisor; - char *edp = encoded_data; + unsigned char *edp = encoded_data; short *ddp = decoded_data; int x; uint32_t new_len = 0; Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Mar 16 15:28:22 2009 @@ -272,8 +272,6 @@ { switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; - switch_time_t started = switch_time_now(); - unsigned int elapsed; switch_byte_t *data; channel = switch_core_session_get_channel(session); 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 Mon Mar 16 15:28:22 2009 @@ -2691,7 +2691,7 @@ } } - if (channel && sip && (status >= 300 || status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { + if (channel && sip && (status >= 300 && status < 399) && switch_channel_test_flag(channel, CF_OUTBOUND)) { sip_contact_t * p_contact = sip->sip_contact; int i = 0; char var_name[80]; Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Mar 16 15:28:22 2009 @@ -2035,7 +2035,7 @@ *s = tmp; } - if (*(*s + (*len) - 1) == '>') { + if (*len && *(*s + (*len) - 1) == '>') { *len += sprintf(*s + *len, "\n"); /* indent */ } for (lcount = 0; lcount < *count; lcount++) {

1 0

[commit] r12627 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mikej Date: Mon Mar 16 15:14:36 2009 New Revision: 12627 Log: these seem to be causing issues on solaris Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Mar 16 15:14:36 2009 @@ -610,7 +610,7 @@ #endif } -#ifdef HAVE_SETRLIMIT +#if defined(HAVE_SETRLIMIT) && !defined(__sun) if (!waste) { memset(&rlp, 0, sizeof(rlp)); getrlimit(RLIMIT_STACK, &rlp);

1 0

[commit] r12626 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mikej Date: Mon Mar 16 14:53:17 2009 New Revision: 12626 Log: fix windows build Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Mar 16 14:53:17 2009 @@ -1303,10 +1303,10 @@ for (i = 0; i < and_argc; i++) { char *vdata; - end = NULL; - chan_type = peer_names[i]; const char *current_variable; char variable_buffer[512] = ""; + end = NULL; + chan_type = peer_names[i]; while (chan_type && *chan_type && *chan_type == ' ') { chan_type++;

1 0