- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9417 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 03 Sep '08

03 Sep '08

Author: mikej Date: Wed Sep 3 14:27:14 2008 New Revision: 9417 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/configure.ac Log: Wed Sep 3 13:11:43 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * configure.ac: added --enable-memleag-log and HAVE_MEMLEAK_LOG Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Sep 3 14:27:14 2008 @@ -1 +1 @@ -Thu Aug 14 12:02:14 EDT 2008 +Wed Sep 3 14:27:05 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Wed Sep 3 14:27:14 2008 @@ -151,6 +151,15 @@ AC_DEFINE([HAVE_SRTP], 0, [Define to 1 if we use SRTP]) AC_DEFINE([HAVE_UPNP], 0, [Define to 1 if we use UPnP]) + +AC_ARG_ENABLE(memleak_log, +[ --enable-memleak-log enable logging of possible memory leaks [[disabled]]], + , enable_memleak_log=no) + +if test x$enable_memleak_log = xyes ; then + AC_DEFINE([HAVE_MEMLEAK_LOG], 1, [Define to 1 for memory-leak-related logging]) +fi + ### checks for header files ### ----------------------- AC_HEADER_STDC

1 0

[commit] r9416 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 03 Sep '08

03 Sep '08

Author: brian Date: Wed Sep 3 13:35:09 2008 New Revision: 9416 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: update header Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Wed Sep 3 13:35:09 2008 @@ -1,8 +1,29 @@ /* - * mod_fax.c (unholy forbidden interface to spandsp) + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> * - * Brian West <brian.west(a)mac.com> + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Brian West <brian.west(a)mac.com> * * mod_fax.c -- Fax Module *

1 0

[commit] r9415 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 03 Sep '08

03 Sep '08

Author: anthm Date: Wed Sep 3 13:08:30 2008 New Revision: 9415 Added: freeswitch/trunk/src/mod/applications/mod_fax/ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: add mod_fax rxfax Added: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Wed Sep 3 13:08:30 2008 @@ -0,0 +1,206 @@ +/* + * mod_fax.c (unholy forbidden interface to spandsp) + * + * Brian West <brian.west(a)mac.com> + * + * + * mod_fax.c -- Fax Module + * + */ + +#include <switch.h> +#include <spandsp.h> + +#define MAX_BLOCK_SIZE 240 + +SWITCH_MODULE_LOAD_FUNCTION(mod_fax_load); +SWITCH_MODULE_DEFINITION(mod_fax, mod_fax_load, NULL, NULL); + +static void phase_e_handler(t30_state_t *s, void *user_data, int result) +{ + t30_stats_t t; + char local_ident[21]; + char far_ident[21]; + + if (result == T30_ERR_OK) + { + t30_get_transfer_statistics(s, &t); + t30_get_far_ident(s, far_ident); + t30_get_local_ident(s, local_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } + else + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } +} + +static void phase_d_handler(t30_state_t *s, void *user_data, int result) +{ + t30_stats_t t; + + if (result) + { + t30_get_transfer_statistics(s, &t); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i\n", t.encoding); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } +} + +SWITCH_STANDARD_APP(rxfax_function) +{ + switch_channel_t *channel; + switch_codec_t *orig_read_codec = NULL; + switch_codec_t read_codec = {0}; + switch_codec_t write_codec = {0}; + switch_frame_t *read_frame = {0}; + switch_frame_t write_frame = {0}; + switch_status_t status; + fax_state_t fax; + int16_t buf[512]; + int tx = 0; + int calling_party = FALSE; + char *file_name = NULL; + + file_name = switch_core_session_strdup(session, data); + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_channel_answer(channel); + + orig_read_codec = switch_core_session_get_read_codec(session); + + if (switch_core_codec_init(&read_codec, + "L16", + NULL, + orig_read_codec->implementation->samples_per_second, + orig_read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + goto done; + } + + if (switch_core_codec_init(&write_codec, + "L16", + NULL, + orig_read_codec->implementation->samples_per_second, + orig_read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + goto done; + } + + fax_init(&fax, calling_party); + t30_set_local_ident(&fax.t30_state, "test"); + t30_set_header_info(&fax.t30_state, "test"); + t30_set_rx_file(&fax.t30_state, file_name, -1); + + t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, NULL); + t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, NULL); + + t30_set_ecm_capability(&fax.t30_state, TRUE); + t30_set_supported_compressions(&fax.t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); + + t30_set_supported_image_sizes(&fax.t30_state, T30_SUPPORT_US_LETTER_LENGTH | T30_SUPPORT_US_LEGAL_LENGTH | T30_SUPPORT_UNLIMITED_LENGTH + | T30_SUPPORT_215MM_WIDTH | T30_SUPPORT_255MM_WIDTH | T30_SUPPORT_303MM_WIDTH); + t30_set_supported_resolutions(&fax.t30_state, T30_SUPPORT_STANDARD_RESOLUTION | T30_SUPPORT_FINE_RESOLUTION | T30_SUPPORT_SUPERFINE_RESOLUTION + | T30_SUPPORT_R8_RESOLUTION | T30_SUPPORT_R16_RESOLUTION); + + write_frame.codec = &write_codec; + write_frame.data = buf; + + while(switch_channel_ready(channel)) { + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { + goto done; + } + + fax_rx(&fax, (int16_t *)read_frame->data, read_frame->samples); + if ((tx = fax_tx(&fax, (int16_t *) &buf, write_codec.implementation->samples_per_frame)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fax Error\n"); + goto done; + } + + if (tx) { + write_frame.datalen = tx * sizeof(int16_t); + write_frame.samples = tx; + + if (switch_core_session_write_frame(session, &write_frame, -1, 0) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad Write\n"); + goto done; + } + } + + } + + done: + + t30_terminate(&fax.t30_state); + fax_release(&fax); + + if (read_codec.implementation) { + switch_core_codec_destroy(&read_codec); + } + + if (write_codec.implementation) { + switch_core_codec_destroy(&write_codec); + } + + if (orig_read_codec) { + switch_core_session_set_read_codec(session, orig_read_codec); + } + +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_fax_load) + +{ + switch_application_interface_t *app_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "rxfax", "Trivial FAX Receive Application", "Trivial FAX Receive Application", rxfax_function, "", SAF_NONE); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r9414 - freeswitch/trunk/src
by Freeswitch SVN 03 Sep '08

03 Sep '08

Author: brian Date: Wed Sep 3 11:20:21 2008 New Revision: 9414 Modified: freeswitch/trunk/src/switch_caller.c Log: allow you to get the privacy bits in the caller_profile Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Wed Sep 3 11:20:21 2008 @@ -198,6 +198,15 @@ if (!strcasecmp(name, "rdnis_numplan")) { return switch_core_sprintf(caller_profile->pool, "%u", caller_profile->rdnis_numplan); } + if (!strcasecmp(name, "screen_bit")) { + return switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "true" : "false"; + } + if (!strcasecmp(name, "privacy_hide_name")) { + return switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "true" : "false"; + } + if (!strcasecmp(name, "privacy_hide_number")) { + return switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "true" : "false"; + } return NULL; } @@ -273,13 +282,13 @@ } switch_snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "yes" : "no"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "true" : "false"); switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Name", prefix); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "yes" : "no"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "true" : "false"); switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "true" : "false"); } SWITCH_DECLARE(switch_status_t) switch_caller_extension_clone(switch_caller_extension_t **new_ext, switch_caller_extension_t *orig,

1 0

[commit] r9409 - freeswitch/trunk/conf/sip_profiles/external
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 16:09:04 2008 New Revision: 9409 Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml Log: remove double tag Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external/example.xml Tue Sep 2 16:09:04 2008 @@ -28,8 +28,6 @@    -  -

1 0

[commit] r9408 - in freeswitch/trunk/conf/sip_profiles: external internal
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 16:08:15 2008 New Revision: 9408 Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml freeswitch/trunk/conf/sip_profiles/internal/example.xml Log: document the ping option in the gateway examples on profiles also Modified: freeswitch/trunk/conf/sip_profiles/external/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external/example.xml Tue Sep 2 16:08:15 2008 @@ -30,5 +30,7 @@    +  +   </include> Modified: freeswitch/trunk/conf/sip_profiles/internal/example.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal/example.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal/example.xml Tue Sep 2 16:08:15 2008 @@ -28,5 +28,7 @@    +  +   </include>

1 0

[commit] r9407 - freeswitch/trunk/src
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: anthm Date: Tue Sep 2 12:38:45 2008 New Revision: 9407 Modified: freeswitch/trunk/src/switch_ivr.c Log: insert variables from the domain tag in the set_user app Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Sep 2 12:38:45 2008 @@ -1794,6 +1794,17 @@ switch_channel_set_variable(channel, "mailbox", mailbox); } + if ((x_params = switch_xml_child(x_domain, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (var && val) { + switch_channel_set_variable(channel, var, val); + } + } + } + if ((x_params = switch_xml_child(x_user, "variables"))) { for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr(x_param, "name");

1 0

[commit] r9406 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: anthm Date: Tue Sep 2 12:38:16 2008 New Revision: 9406 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: make dingaling end call on ice timeout 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 Tue Sep 2 12:38:16 2008 @@ -1456,7 +1456,9 @@ tech_pvt->timestamp_send += samples; //switch_rtp_write_frame(tech_pvt->rtp_session, frame, tech_pvt->timestamp_send); - switch_rtp_write_frame(tech_pvt->rtp_session, frame); + if (switch_rtp_write_frame(tech_pvt->rtp_session, frame) < 0) { + status = SWITCH_STATUS_GENERR; + } switch_clear_flag_locked(tech_pvt, TFLAG_WRITING); return status;

1 0

[commit] r9405 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 10:56:55 2008 New Revision: 9405 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: fix the fix 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 Tue Sep 2 10:56:55 2008 @@ -80,7 +80,7 @@ if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { char *err_str; err_str = switch_odbc_handle_get_error(globals.master_odbc, stmt); - if ( err_str && strlen(err_str) ) { + if (!switch_strlen_zero(err_str)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); } switch_safe_free(err_str);

1 0

[commit] r9404 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 10:50:03 2008 New Revision: 9404 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: fix MODAPP-134 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 Tue Sep 2 10:50:03 2008 @@ -80,7 +80,9 @@ if (switch_odbc_handle_exec(globals.master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { char *err_str; err_str = switch_odbc_handle_get_error(globals.master_odbc, stmt); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); + if ( err_str && strlen(err_str) ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERR: [%s]\n[%s]\n", sql, switch_str_nil(err_str)); + } switch_safe_free(err_str); status = SWITCH_STATUS_FALSE; }

1 0