March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

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

16 Mar '09

Author: mrene Date: Mon Mar 16 14:24:12 2009 New Revision: 12625 Log: FIx nasty leak 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 Mon Mar 16 14:24:12 2009 @@ -115,7 +115,7 @@ switch_xml_t cur; /* current xml tree insertion point */ char *m; /* original xml string */ switch_size_t len; /* length of allocated memory for mmap */ - uint8_t dynamic; + uint8_t dynamic; /* Free the original string when calling switch_xml_free */ char *u; /* UTF-8 conversion of string if original was UTF-16 */ char *s; /* start of work area */ char *e; /* end of work area */ @@ -1551,9 +1551,12 @@ if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { if (clone) { char *x; + switch_xml_root_t xmlroot = NULL; x = switch_xml_toxml(tag, SWITCH_FALSE); switch_assert(x); - *root = switch_xml_parse_str(x, strlen(x)); + xmlroot = (switch_xml_root_t)switch_xml_parse_str(x, strlen(x)); + xmlroot->dynamic = 1; /* free the memory in switch_xml_free */ + *root = (switch_xml_t)xmlroot; *node = *root; switch_xml_free(xml); } else {

1 0

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

16 Mar '09

Author: mrene Date: Mon Mar 16 13:49:58 2009 New Revision: 12624 Log: dont leak the xml structure if answer fails Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Mar 16 13:49:58 2009 @@ -216,7 +216,8 @@ } if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) { - return SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_FALSE; + goto done; } while (input && !done) {

1 0

[commit] r12623 - freeswitch/trunk/libs/esl/src
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: mrene Date: Mon Mar 16 13:35:31 2009 New Revision: 12623 Log: ESL-8 Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp ============================================================================== --- freeswitch/trunk/libs/esl/src/esl_oop.cpp (original) +++ freeswitch/trunk/libs/esl/src/esl_oop.cpp Mon Mar 16 13:35:31 2009 @@ -65,11 +65,11 @@ len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; - cmd_buf = (char *) malloc(len); + cmd_buf = (char *) malloc(len + 1); assert(cmd_buf); snprintf(cmd_buf, len, "api %s %s", cmd, arg ? arg : ""); - *(cmd_buf + (len + 1)) = '\0'; + *(cmd_buf + (len)) = '\0'; if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) { @@ -94,11 +94,11 @@ len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10; - cmd_buf = (char *) malloc(len); + cmd_buf = (char *) malloc(len + 1); assert(cmd_buf); snprintf(cmd_buf, len, "bgapi %s %s", cmd, arg ? arg : ""); - *(cmd_buf + (len + 1)) = '\0'; + *(cmd_buf + (len)) = '\0'; if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) { esl_event_t *event;

1 0

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

16 Mar '09

Author: rupa Date: Mon Mar 16 11:31:23 2009 New Revision: 12622 Log: allow profile named "default" to be the default Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Mon Mar 16 11:31:23 2009 @@ -631,14 +631,6 @@ } } - /* define default profile */ - profile = switch_core_alloc(globals.pool, sizeof(*profile)); - memset(profile, 0, sizeof(profile_t)); - profile->name = "global_default"; - profile->order_by = ", rate"; - profile->pre_order = ""; - globals.default_profile = profile; - switch_core_hash_init(&globals.profile_hash, globals.pool); if ((x_profiles = switch_xml_child(cfg, "profiles"))) { for (x_profile = switch_xml_child(x_profiles, "profile"); x_profile; x_profile = x_profile->next) { @@ -750,6 +742,11 @@ switch_core_hash_insert(globals.profile_hash, profile->name, profile); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Loaded lcr profile %s.\n", profile->name); + + if (!strcasecmp(profile->name, "default")) { + globals.default_profile = profile; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting user defined default profile: %s.\n", profile->name); + } } switch_safe_free(order_by.data); switch_safe_free(pre_order.data); @@ -758,7 +755,18 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No lcr profiles defined.\n"); } - done: + /* define default profile */ + if (!globals.default_profile) { + profile = switch_core_alloc(globals.pool, sizeof(*profile)); + memset(profile, 0, sizeof(profile_t)); + profile->name = "global_default"; + profile->order_by = ", rate"; + profile->pre_order = ""; + globals.default_profile = profile; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting system defined default profile."); + } + + done: switch_xml_free(xml); return status; }

1 0

[commit] r12621 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 16 Mar '09

16 Mar '09

Author: rupa Date: Mon Mar 16 11:07:11 2009 New Revision: 12621 Log: update sample config with custom_sql example Modified: freeswitch/trunk/conf/autoload_configs/lcr.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/lcr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/lcr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/lcr.conf.xml Mon Mar 16 11:07:11 2009 @@ -16,5 +16,45 @@ <param name="id" value="2"/> <param name="order_by" value="reliability,quality"/> </profile> + </profiles> </configuration>

1 0