February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11666 - in freeswitch/trunk: . build/config
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mikej Date: Fri Feb 6 12:23:14 2009 New Revision: 11666 Log: tweak odbc detection Modified: freeswitch/trunk/build/config/odbc.m4 freeswitch/trunk/configure.in Modified: freeswitch/trunk/build/config/odbc.m4 ============================================================================== --- freeswitch/trunk/build/config/odbc.m4 (original) +++ freeswitch/trunk/build/config/odbc.m4 Fri Feb 6 12:23:14 2009 @@ -119,7 +119,9 @@ ac_cv_odbc_where_lib=$with_odbc_lib fi if test "X$ac_cv_odbc_where_lib" = "X"; then + AC_CHECK_LIB([odbc],[SQLDisconnect],[ac_cv_odbc_where_lib="yes"],[ ODBC_LIB_WHERE(/usr/$LIB_SUBDIR /usr/local/$LIB_SUBDIR) + ]) fi if test "X$with_odbc_include" != "X"; then @@ -138,15 +140,16 @@ AC_MSG_RESULT(yes) ODBC_INC_DIR=$ac_cv_pcap_where_inc ODBC_LIB_DIR=$ac_cv_pcap_where_lib - ODBC_INC_FLAGS="-I${ODBC_INC_DIR}" + ODBC_INC_FLAGS="-I$ac_cv_pcap_where_inc" + ODBC_LIB_FLAGS="-Wl,-lodbc" case "$host" in *darwin*) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc -framework CoreFoundation" - ;; - *) - ODBC_LIB_FLAGS="-L${ODBC_LIB_DIR} -lodbc" + ODBC_LIB_FLAGS="$ODBC_LIB_FLAGS -framework CoreFoundation" ;; esac + if test "$ac_cv_odbc_where_lib" != "yes"; then + ODBC_LIB_FLAGS="-L$ac_cv_odbc_where_lib $ODBC_LIB_FLAGS" + fi AC_SUBST(ODBC_INC_DIR) AC_SUBST(ODBC_LIB_DIR) AC_SUBST(ODBC_INC_FLAGS) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Feb 6 12:23:14 2009 @@ -112,7 +112,7 @@ # set defaults for use on all platforms SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir}/libs/libteletone/src" -SWITCH_AM_LDFLAGS="-lm -L/usr/local/lib" +SWITCH_AM_LDFLAGS="-lm" #set SOLINK variable based on compiler and host if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then @@ -161,11 +161,15 @@ APR_ADDTO(SWITCH_AM_CFLAGS, -m64) APR_ADDTO(SWITCH_AM_CXXFLAGS, -m64) APR_ADDTO(SWITCH_AM_LDFLAGS, -m64) + LIBS="$LIBS -m64" fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) + if test "${enable_64}" = "yes"; then + LIBS="$LIBS -m64" + fi fi # Enable debugging (default: on)

1 0

[commit] r11665 - freeswitch/trunk/src/mod/codecs/mod_dahdi
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 12:21:08 2009 New Revision: 11665 Log: add MODCODEC-7, thanks moy Added: freeswitch/trunk/src/mod/codecs/mod_dahdi/ freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Added: freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi/mod_dahdi.c Fri Feb 6 12:21:08 2009 @@ -0,0 +1,416 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.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 / DAHDI codec module + * + * The Initial Developer of the Original Code is + * Moises Silva <moy(a)sangoma.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Moises Silva <moy(a)sangoma.com> + * + * mod_dahdi -- DAHDI Codecs (G729A 8.0kbit, G723.1 5.3kbit) + * + * Thanks to Voiceway for sponsoring this module and Neocenter for providing the DAHDI hardware to test + * + */ + +#include <switch.h> +#include <g711.h> +#include <dahdi/user.h> +#include <sys/ioctl.h> + +/*#define DEBUG_DAHDI_CODEC 1*/ + +#define DAHDI_FORMAT_G723_1 (1 << 0) +#define DAHDI_FORMAT_ULAW (1 << 2) +#define DAHDI_FORMAT_SLINEAR (1 << 6) +#define DAHDI_FORMAT_G729A (1 << 8) + +#define CODEC_G729_IANA_CODE 18 +#define CODEC_G723_IANA_CODE 4 + +switch_mutex_t *transcoder_counter_mutex; +static uint32_t total_encoders = 0; +static uint32_t total_encoders_usage = 0; +static uint32_t total_decoders = 0; +static uint32_t total_decoders_usage = 0; +static const char transcoding_device[] = "/dev/dahdi/transcode"; +static const char transcoder_name[] = "DAHDI"; + +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load); +SWITCH_MODULE_DEFINITION(mod_dahdi, mod_dahdi_load, NULL, NULL); + +struct dahdi_context { + int32_t encoding_fd; + int32_t decoding_fd; + uint8_t codec_r; +}; + +static int32_t switch_dahdi_get_transcoder(struct dahdi_transcoder_formats *fmts) +{ + int32_t fd = open(transcoding_device, O_RDWR); + if (fd < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Failed to open %s transcoder device: %s.\n", + transcoder_name, strerror(errno)); + return -1; + } + if (ioctl(fd, DAHDI_TC_ALLOCATE, fmts)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Failed to attach to transcoder: %s.\n", + strerror(errno)); + close(fd); + return -1; + } + if (fmts->srcfmt & DAHDI_FORMAT_ULAW) { + switch_mutex_lock(transcoder_counter_mutex); + total_encoders_usage++; + switch_mutex_unlock(transcoder_counter_mutex); + } else { + switch_mutex_lock(transcoder_counter_mutex); + total_decoders_usage++; + switch_mutex_unlock(transcoder_counter_mutex); + } + return fd; +} + +static switch_status_t switch_dahdi_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct dahdi_context *context = NULL; + struct dahdi_transcoder_formats fmts; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI init called.\n"); + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding)) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No encoding or decoding requested for DAHDI transcoder?.\n"); +#endif + return SWITCH_STATUS_FALSE; + } + + if (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context)))) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate memory for dahdi codec context.\n"); +#endif + return SWITCH_STATUS_FALSE; + } + + if (encoding) { + fmts.srcfmt = DAHDI_FORMAT_ULAW; + fmts.dstfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->encoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "encoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } + /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ + context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? 8 : 12; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + } + if (decoding) { + fmts.dstfmt = DAHDI_FORMAT_ULAW; + fmts.srcfmt = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? DAHDI_FORMAT_G729A : DAHDI_FORMAT_G723_1; + context->decoding_fd = switch_dahdi_get_transcoder(&fmts); + if (context->decoding_fd < 0) { +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and denied with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Decoding requested and granted with %d/%d.\n", + fmts.srcfmt, fmts.dstfmt); +#endif + } + codec->private_info = context; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + uint32_t decoded_data_len, + uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, + unsigned int *flag) +{ + int32_t res; + short *dbuf_linear; + unsigned char *ebuf_g729; + unsigned char ebuf_ulaw[decoded_data_len/2]; + uint32_t i; + struct dahdi_context *context = NULL; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI encode called to encode %d bytes.\n", decoded_data_len); +#endif + context = codec->private_info; + dbuf_linear = decoded_data; + ebuf_g729 = encoded_data; + for (i = 0; i < decoded_data_len / sizeof(short); i++) { + ebuf_ulaw[i] = linear_to_ulaw(dbuf_linear[i]); + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes of decoded ulaw data.\n", i); +#endif + res = write(context->encoding_fd, ebuf_ulaw, i); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s encoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + if (i != res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s encoder device, but only wrote %d bytes.\n", i, transcoder_name, res); + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes of decoded ulaw data.\n", res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read %d bytes of encoded data.\n", i/context->codec_r); +#endif + res = read(context->encoding_fd, encoded_data, i/context->codec_r); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + *encoded_data_len = res; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Read %d bytes of encoded data.\n", res); +#endif + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + uint32_t encoded_data_len, + uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, + unsigned int *flag) +{ + int32_t res; + short *dbuf_linear; + unsigned char dbuf_ulaw[encoded_data_len * ((struct dahdi_context*)codec->private_info)->codec_r]; + unsigned char *ebuf_g729; + uint32_t i; + struct dahdi_context *context; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode called to decode %d bytes.\n", encoded_data_len); +#endif + + context = codec->private_info; + dbuf_linear = decoded_data; + ebuf_g729 = encoded_data; + + if (*flag & SWITCH_CODEC_FLAG_SILENCE) { + memset(dbuf_linear, 0, codec->implementation->decoded_bytes_per_packet); + *decoded_data_len = codec->implementation->decoded_bytes_per_packet; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode in silence returned %d bytes.\n", *decoded_data_len); +#endif + return SWITCH_STATUS_SUCCESS; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Writing %d bytes to decode.\n", encoded_data_len); +#endif + res = write(context->decoding_fd, ebuf_g729, encoded_data_len); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to write to %s decoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + if (encoded_data_len != res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested to write %d bytes to %s decoder device, but only wrote %d bytes.\n", encoded_data_len, transcoder_name, res); + return SWITCH_STATUS_FALSE; + } +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Wrote %d bytes to decode.\n", res); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attempting to read from device %d bytes of decoded ulaw data.\n", + encoded_data_len*context->codec_r); +#endif + res = read(context->decoding_fd, dbuf_ulaw, encoded_data_len*context->codec_r); + if (-1 == res) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to read from %s encoder device: %s.\n", transcoder_name, strerror(errno)); + return SWITCH_STATUS_FALSE; + } + for (i = 0; i < res; i++) { + dbuf_linear[i] = ulaw_to_linear(dbuf_ulaw[i]); + } + *decoded_data_len = i * 2; +#ifdef DEBUG_DAHDI_CODEC + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Switch DAHDI decode returned %d bytes.\n", *decoded_data_len); +#endif + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_dahdi_destroy(switch_codec_t *codec) +{ + /* memory pool takes care of the private_info memory */ + struct dahdi_context *context = codec->private_info; + if (context->encoding_fd >= 0) { + switch_mutex_lock(transcoder_counter_mutex); + total_encoders_usage--; + switch_mutex_unlock(transcoder_counter_mutex); + close(context->encoding_fd); + } + if (context->decoding_fd >= 0) { + switch_mutex_lock(transcoder_counter_mutex); + total_decoders_usage--; + switch_mutex_unlock(transcoder_counter_mutex); + close(context->decoding_fd); + } + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_STANDARD_API(dahdi_transcode_usage) +{ + if (!total_encoders && !total_decoders) { + stream->write_function(stream, "No DAHDI transcoding hardware found.\n"); + return SWITCH_STATUS_SUCCESS; + } + switch_mutex_lock(transcoder_counter_mutex); + stream->write_function(stream, "Using %d encoders of a total of %d available.\n", + total_encoders_usage, total_encoders); + stream->write_function(stream, "Using %d decoders of a total of %d available.\n", + total_decoders_usage, total_decoders); + switch_mutex_unlock(transcoder_counter_mutex); + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_dahdi_load) +{ + switch_api_interface_t *api_interface; + switch_codec_interface_t *codec_interface; + struct dahdi_transcoder_info info = { 0 }; + int32_t fd, res; + + total_encoders = 0; + total_encoders_usage = 0; + total_decoders = 0; + total_decoders_usage = 0; + + fd = open(transcoding_device, O_RDWR); + if (fd < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to open %s transcoder device.\n", transcoder_name); + return SWITCH_STATUS_FALSE; + } + + for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Found dahdi transcoder name: %s\n", info.name); + if ((info.srcfmts & DAHDI_FORMAT_ULAW) && (info.dstfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { + total_encoders += info.numchannels/2; + continue; + } + if ((info.dstfmts & DAHDI_FORMAT_ULAW) && (info.srcfmts & (DAHDI_FORMAT_G729A | DAHDI_FORMAT_G723_1))) { + total_decoders += info.numchannels/2; + continue; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, + "Not using transcoder %s, we just support ULAW and G723.1/G729A", info.name); + } + close(fd); + + if (!total_encoders && !total_decoders) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No DAHDI transcoders found.\n"); + return SWITCH_STATUS_FALSE; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d ULAW to G729A/G723.1 encoders.\n", total_encoders); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Found %d G729A/G723.1 to ULAW decoders.\n", total_decoders); + + switch_mutex_init(&transcoder_counter_mutex, SWITCH_MUTEX_UNNESTED, pool); + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_CODEC(codec_interface, "DAHDI G.729A 8.0k"); /* 8.0kbit */ + int mpf = 20000; /* Algorithmic delay of 15ms with 5ms of look-ahead delay */ + int spf = 160; + int bpfd = 320; + int bpfc = 20; + int fpnp = 10; + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 18, /* the IANA code number */ + "G729", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 8000, /* bits transferred per second */ + mpf, /* number of microseconds per frame (10ms frames) */ + spf, /* number of samples per frame */ + bpfd, /* number of bytes per frame decompressed */ + bpfc, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + fpnp, /* number of frames per network packet */ + switch_dahdi_init, /* function to initialize a codec handle using this implementation */ + switch_dahdi_encode, /* function to encode raw data into encoded data */ + switch_dahdi_decode, /* function to decode encoded data into raw data */ + switch_dahdi_destroy); /* deinitalize a codec handle using this implementation */ + + SWITCH_ADD_CODEC(codec_interface, "DAHDI G.723.1 5.3k"); /* 5.3kbit */ + mpf = 30000; /* Algorithmic delay of 37.5ms with 7.5ms of look-ahead delay */ + spf = 240; + bpfd = 480; + bpfc = 20; + fpnp = 10; + switch_core_codec_add_implementation(pool, + codec_interface, + SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ + 4, /* the IANA code number */ + "G723", /* the IANA code name */ + NULL, /* default fmtp to send (can be overridden by the init function) */ + 8000, /* samples transferred per second */ + 8000, /* actual samples transferred per second */ + 8000, /* bits transferred per second */ + mpf, /* number of microseconds per frame (10ms frames) */ + spf, /* number of samples per frame */ + bpfd, /* number of bytes per frame decompressed */ + bpfc, /* number of bytes per frame compressed */ + 1, /* number of channels represented */ + fpnp, /* number of frames per network packet */ + switch_dahdi_init, /* function to initialize a codec handle using this implementation */ + switch_dahdi_encode, /* function to encode raw data into encoded data */ + switch_dahdi_decode, /* function to decode encoded data into raw data */ + switch_dahdi_destroy); /* deinitalize a codec handle using this implementation */ + + SWITCH_ADD_API(api_interface, "dahdi_transcode", "DAHDI Transcode", dahdi_transcode_usage, NULL); + switch_console_set_complete("add dahdi_transcode"); + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: + */

1 0

[commit] r11664 - in freeswitch/trunk: libs/esl scripts
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: brian Date: Fri Feb 6 10:05:46 2009 New Revision: 11664 Log: doh Modified: freeswitch/trunk/libs/esl/testclient.c freeswitch/trunk/scripts/freeswitch-gcore Modified: freeswitch/trunk/libs/esl/testclient.c ============================================================================== --- freeswitch/trunk/libs/esl/testclient.c (original) +++ freeswitch/trunk/libs/esl/testclient.c Fri Feb 6 10:05:46 2009 @@ -9,21 +9,7 @@ esl_connect(&handle, "localhost", 8021, "ClueCon"); - esl_send_recv(&handle, "api conference 3100 play /root/sr8k.raw 1\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3101\n\n"); - - esl_send_recv(&handle, "api conference 3101 play /root/sr8k.raw 2\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3102\n\n"); - - esl_send_recv(&handle, "api conference 3102 play /root/sr8k.raw 3\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3103\n\n"); - - esl_send_recv(&handle, "api conference 3103 play /root/sr8k.raw 4\n\n"); - - esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3104\n\n"); + esl_send_recv(&handle, "api status\n\n"); esl_disconnect(&handle); Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Fri Feb 6 10:05:46 2009 @@ -9,4 +9,4 @@ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid +rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid

1 0

[commit] r11663 - in freeswitch/trunk: libs/esl scripts src/mod/applications/mod_conference
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: anthm Date: Fri Feb 6 10:03:56 2009 New Revision: 11663 Log: fix regression in previous fix for MODAPP-209 Modified: freeswitch/trunk/libs/esl/testclient.c freeswitch/trunk/scripts/freeswitch-gcore freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/libs/esl/testclient.c ============================================================================== --- freeswitch/trunk/libs/esl/testclient.c (original) +++ freeswitch/trunk/libs/esl/testclient.c Fri Feb 6 10:03:56 2009 @@ -9,7 +9,21 @@ esl_connect(&handle, "localhost", 8021, "ClueCon"); - esl_send_recv(&handle, "api status\n\n"); + esl_send_recv(&handle, "api conference 3100 play /root/sr8k.raw 1\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3101\n\n"); + + esl_send_recv(&handle, "api conference 3101 play /root/sr8k.raw 2\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3102\n\n"); + + esl_send_recv(&handle, "api conference 3102 play /root/sr8k.raw 3\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3103\n\n"); + + esl_send_recv(&handle, "api conference 3103 play /root/sr8k.raw 4\n\n"); + + esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3104\n\n"); esl_disconnect(&handle); Modified: freeswitch/trunk/scripts/freeswitch-gcore ============================================================================== --- freeswitch/trunk/scripts/freeswitch-gcore (original) +++ freeswitch/trunk/scripts/freeswitch-gcore Fri Feb 6 10:03:56 2009 @@ -9,4 +9,4 @@ --eval-command='thread apply all bt' \ --eval-command='thread apply all bt full' \ --eval-command='quit' -rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid +#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid 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 Fri Feb 6 10:03:56 2009 @@ -2181,6 +2181,7 @@ switch_mutex_init(&member->control_mutex, SWITCH_MUTEX_NESTED, rec->pool); + switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);

1 0

[commit] r11662 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 06 Feb '09

06 Feb '09

Author: mrene Date: Thu Feb 5 21:03:50 2009 New Revision: 11662 Log: MDXMLINT-46 Add purpose=gateways and profile=[name] so xml_curl requests make sense Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 Thu Feb 5 21:03:50 2009 @@ -1629,6 +1629,12 @@ status = SWITCH_STATUS_SUCCESS; if ((domains_tag = switch_xml_child(xprofile, "domains"))) { + switch_event_t *xml_params; + switch_event_create(&xml_params, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(xml_params); + switch_event_add_header_string(xml_params, SWITCH_STACK_BOTTOM, "purpose", "gateways"); + switch_event_add_header_string(xml_params, SWITCH_STACK_BOTTOM, "profile", profile->name); + for (domain_tag = switch_xml_child(domains_tag, "domain"); domain_tag; domain_tag = domain_tag->next) { switch_xml_t droot, x_domain_tag; const char *dname = switch_xml_attr_soft(domain_tag, "name"); @@ -1638,19 +1644,21 @@ if (!switch_strlen_zero(dname)) { if (!strcasecmp(dname, "all")) { switch_xml_t xml_root, x_domains; - if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, NULL) == SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) { for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) { dname = switch_xml_attr_soft(x_domain_tag, "name"); parse_domain_tag(profile, x_domain_tag, dname, parse, alias); } switch_xml_free(xml_root); } - } else if (switch_xml_locate_domain(dname, NULL, &droot, &x_domain_tag) == SWITCH_STATUS_SUCCESS) { + } else if (switch_xml_locate_domain(dname, xml_params, &droot, &x_domain_tag) == SWITCH_STATUS_SUCCESS) { parse_domain_tag(profile, x_domain_tag, dname, parse, alias); switch_xml_free(droot); } } } + + switch_event_destroy(&xml_params); } if ((aliases_tag = switch_xml_child(xprofile, "aliases"))) { @@ -2310,6 +2318,12 @@ } if ((domains_tag = switch_xml_child(xprofile, "domains"))) { + switch_event_t *xml_params; + switch_event_create(&xml_params, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(xml_params); + switch_event_add_header_string(xml_params, SWITCH_STACK_BOTTOM, "purpose", "gateways"); + switch_event_add_header_string(xml_params, SWITCH_STACK_BOTTOM, "profile", profile->name); + for (domain_tag = switch_xml_child(domains_tag, "domain"); domain_tag; domain_tag = domain_tag->next) { switch_xml_t droot, x_domain_tag; const char *dname = switch_xml_attr_soft(domain_tag, "name"); @@ -2319,19 +2333,21 @@ if (!switch_strlen_zero(dname)) { if (!strcasecmp(dname, "all")) { switch_xml_t xml_root, x_domains; - if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, NULL) == SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) { for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) { dname = switch_xml_attr_soft(x_domain_tag, "name"); parse_domain_tag(profile, x_domain_tag, dname, parse, alias); } switch_xml_free(xml_root); } - } else if (switch_xml_locate_domain(dname, NULL, &droot, &x_domain_tag) == SWITCH_STATUS_SUCCESS) { + } else if (switch_xml_locate_domain(dname, xml_params, &droot, &x_domain_tag) == SWITCH_STATUS_SUCCESS) { parse_domain_tag(profile, x_domain_tag, dname, parse, alias); switch_xml_free(droot); } } } + + switch_event_destroy(&xml_params); } if ((aliases_tag = switch_xml_child(xprofile, "aliases"))) {

1 0

[commit] r11661 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 05 Feb '09

05 Feb '09

Author: anthm Date: Thu Feb 5 16:43:46 2009 New Revision: 11661 Log: MODAPP-209 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.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 Thu Feb 5 16:43:46 2009 @@ -288,6 +288,7 @@ uint32_t flags; uint32_t score; switch_mutex_t *flag_mutex; + switch_mutex_t *control_mutex; switch_mutex_t *audio_in_mutex; switch_mutex_t *audio_out_mutex; switch_codec_t *orig_read_codec; @@ -448,8 +449,8 @@ if (member == NULL || other_member == NULL || member->relationships == NULL) return NULL; - switch_mutex_lock(member->flag_mutex); - switch_mutex_lock(other_member->flag_mutex); + switch_mutex_lock(member->control_mutex); + switch_mutex_lock(other_member->control_mutex); for (rel = member->relationships; rel; rel = rel->next) { if (rel->id == other_member->id) { @@ -462,8 +463,8 @@ } } - switch_mutex_unlock(other_member->flag_mutex); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(other_member->control_mutex); + switch_mutex_unlock(member->control_mutex); return rel ? rel : global; } @@ -527,10 +528,10 @@ rel->id = id; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); rel->next = member->relationships; member->relationships = rel; - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); return rel; } @@ -544,7 +545,7 @@ if (member == NULL || id == 0) return status; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); for (rel = member->relationships; rel; rel = rel->next) { if (rel->id == id) { /* we just forget about rel here cos it was allocated by the member's pool @@ -558,7 +559,7 @@ } last = rel; } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); return status; } @@ -578,7 +579,7 @@ switch_mutex_lock(conference->mutex); switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); switch_mutex_lock(conference->member_mutex); switch_clear_flag(conference, CFLAG_DESTRUCT); @@ -587,7 +588,7 @@ member->energy_level = conference->energy_level; member->verbose_events = conference->verbose_events; conference->members = member; - switch_set_flag(member, MFLAG_INTREE); + switch_set_flag_locked(member, MFLAG_INTREE); switch_mutex_unlock(conference->member_mutex); if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { @@ -658,7 +659,7 @@ } } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); @@ -674,15 +675,24 @@ switch_status_t status = SWITCH_STATUS_FALSE; conference_member_t *imember, *last = NULL; switch_event_t *event; + conference_file_node_t *member_fnode; + switch_speech_handle_t *member_sh; switch_assert(conference != NULL); switch_assert(member != NULL); + switch_mutex_lock(member->control_mutex); + member_fnode = member->fnode; + member_sh = member->sh; + member->fnode = NULL; + member->sh = NULL; + switch_mutex_unlock(member->control_mutex); + switch_mutex_lock(conference->mutex); 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); + switch_mutex_lock(member->control_mutex); switch_clear_flag(member, MFLAG_INTREE); for (imember = conference->members; imember; imember = imember->next) { @@ -698,11 +708,11 @@ } /* Close Unused Handles */ - if (member->fnode) { + if (member_fnode) { conference_file_node_t *fnode, *cur; switch_memory_pool_t *pool; - fnode = member->fnode; + fnode = member_fnode; while (fnode) { cur = fnode; fnode = fnode->next; @@ -716,10 +726,9 @@ } } - if (member->sh) { + if (member_sh) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; switch_core_speech_close(&member->lsh, &flags); - member->sh = NULL; } if (switch_test_flag(member, MFLAG_ENDCONF)) { @@ -775,7 +784,7 @@ } } switch_mutex_unlock(conference->member_mutex); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); switch_mutex_unlock(conference->mutex); @@ -1298,7 +1307,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->energy_level += 200; if (member->energy_level > 3000) { member->energy_level = 3000; @@ -1311,7 +1320,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); @@ -1325,7 +1334,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->energy_level = member->conference->energy_level; if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && @@ -1335,7 +1344,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); @@ -1349,7 +1358,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->energy_level -= 100; if (member->energy_level < 0) { member->energy_level = 0; @@ -1362,7 +1371,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Energy level %d", member->energy_level); conference_member_say(member, msg, 0); @@ -1376,7 +1385,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_out_level++; switch_normalize_volume(member->volume_out_level); @@ -1387,7 +1396,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); @@ -1401,7 +1410,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_out_level = 0; if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && @@ -1411,7 +1420,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); @@ -1425,7 +1434,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_out_level--; switch_normalize_volume(member->volume_out_level); @@ -1436,7 +1445,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Volume level %d", member->volume_out_level); conference_member_say(member, msg, 0); @@ -1450,7 +1459,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_in_level++; switch_normalize_volume(member->volume_in_level); @@ -1461,7 +1470,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1475,7 +1484,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_in_level = 0; if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && @@ -1485,7 +1494,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1499,7 +1508,7 @@ if (member == NULL) return; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_in_level--; switch_normalize_volume(member->volume_in_level); @@ -1510,7 +1519,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); switch_event_fire(&event); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); switch_snprintf(msg, sizeof(msg), "Gain level %d", member->volume_in_level); conference_member_say(member, msg, 0); @@ -1893,7 +1902,7 @@ goto top; } - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); if (switch_core_session_dequeue_event(member->session, &event) == SWITCH_STATUS_SUCCESS) { if (event->event_id == SWITCH_EVENT_MESSAGE) { @@ -2086,7 +2095,7 @@ switch_clear_flag_locked(member, MFLAG_FLUSH_BUFFER); } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); if (switch_core_session_private_event_count(member->session)) { @@ -2171,7 +2180,7 @@ member->mux_frame = switch_core_alloc(member->pool, member->frame_size); - switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool); + switch_mutex_init(&member->control_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool); switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool); @@ -2330,7 +2339,7 @@ if (member == NULL) return count; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); if (stop == FILE_STOP_ALL) { for (nptr = member->fnode; nptr; nptr = nptr->next) { @@ -2344,7 +2353,7 @@ } } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); return count; } @@ -2526,14 +2535,14 @@ fnode->pool = pool; /* Queue the node */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queueing file '%s' for play\n", file); - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); if (nptr) { nptr->next = fnode; } else { member->fnode = fnode; } - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); status = SWITCH_STATUS_SUCCESS; done: @@ -2591,7 +2600,7 @@ } /* Queue the node */ - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); if (nptr) { @@ -2617,7 +2626,7 @@ } switch_core_speech_feed_tts(fnode->sh, text, &flags); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); status = SWITCH_STATUS_SUCCESS; @@ -2918,11 +2927,11 @@ if (member == NULL) return SWITCH_STATUS_GENERR; - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); switch_clear_flag(member, MFLAG_RUNNING); - switch_set_flag(member, MFLAG_KICKED); + switch_set_flag_locked(member, MFLAG_KICKED); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); if (stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); } @@ -2952,10 +2961,10 @@ return SWITCH_STATUS_GENERR; } - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); switch_core_session_send_dtmf_string(member->session, (char *) data); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); if (stream != NULL) { stream->write_function(stream, "OK sent %s to %u\n", (char *) data, member->id); @@ -2980,9 +2989,9 @@ return SWITCH_STATUS_GENERR; if (data) { - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->energy_level = atoi((char *) data); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); } if (stream != NULL) { stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level); @@ -3006,10 +3015,10 @@ return SWITCH_STATUS_GENERR; if (data) { - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_in_level = atoi((char *) data); switch_normalize_volume(member->volume_in_level); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); } if (stream != NULL) { stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level); @@ -3033,10 +3042,10 @@ return SWITCH_STATUS_GENERR; if (data) { - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); member->volume_out_level = atoi((char *) data); switch_normalize_volume(member->volume_out_level); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); } if (stream != NULL) { stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level); @@ -3684,7 +3693,7 @@ } /* move the member from the old conference to the new one */ - switch_mutex_lock(member->flag_mutex); + switch_mutex_lock(member->control_mutex); conference_del_member(conference, member); conference_add_member(new_conference, member); @@ -3693,12 +3702,12 @@ switch_clear_flag_locked(member, MFLAG_RUNNING); } else { switch_channel_set_flag(channel, CF_SERVICE); - switch_set_flag(member, MFLAG_RESTART); + switch_set_flag_locked(member, MFLAG_RESTART); } } switch_mutex_unlock(new_conference->mutex); - switch_mutex_unlock(member->flag_mutex); + switch_mutex_unlock(member->control_mutex); stream->write_function(stream, "OK Member '%d' sent to conference %s.\n", member->id, argv[2]); @@ -4820,6 +4829,7 @@ /* Prepare MUTEXS */ member.id = next_member_id(); switch_mutex_init(&member.flag_mutex, SWITCH_MUTEX_NESTED, member.pool); + switch_mutex_init(&member.control_mutex, SWITCH_MUTEX_NESTED, member.pool); switch_mutex_init(&member.audio_in_mutex, SWITCH_MUTEX_NESTED, member.pool); switch_mutex_init(&member.audio_out_mutex, SWITCH_MUTEX_NESTED, member.pool);

1 0

[commit] r11660 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket
by FreeSWITCH SVN 05 Feb '09

05 Feb '09

Author: mikej Date: Thu Feb 5 14:13:35 2009 New Revision: 11660 Log: mod_spidermonkey_socket: fix gc blocking (MODLANG-97) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/mod_spidermonkey_socket.c Thu Feb 5 14:13:35 2009 @@ -37,6 +37,7 @@ char *read_buffer; switch_size_t buffer_size; int state; + jsrefcount saveDepth; }; typedef struct js_socket_obj js_socket_obj_t; @@ -72,10 +73,13 @@ return; if (socket->socket != 0) { + socket->saveDepth = JS_SuspendRequest(cx); switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE); switch_socket_close(socket->socket); switch_core_destroy_memory_pool(&socket->pool); + JS_ResumeRequest(cx, socket->saveDepth); } + } static JSBool socket_connect(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) @@ -101,7 +105,9 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Connecting to: %s:%d.\n", host, port); + socket->saveDepth = JS_SuspendRequest(cx); ret = switch_socket_connect(socket->socket, addr); + JS_ResumeRequest(cx, socket->saveDepth); if (ret != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_connect failed: %d.\n", ret); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -122,9 +128,12 @@ } if (argc == 1) { + switch_status_t ret; char *buffer = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); switch_size_t len = strlen(buffer); - switch_status_t ret = switch_socket_send(socket->socket, buffer, &len); + socket->saveDepth = JS_SuspendRequest(cx); + ret = switch_socket_send(socket->socket, buffer, &len); + JS_ResumeRequest(cx, socket->saveDepth); if (ret != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -156,7 +165,9 @@ socket->buffer_size = bytes_to_read + 1; } + socket->saveDepth = JS_SuspendRequest(cx); ret = switch_socket_recv(socket->socket, socket->read_buffer, &len); + JS_ResumeRequest(cx, socket->saveDepth); if (ret != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "switch_socket_send failed: %d.\n", ret); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -192,6 +203,7 @@ if (socket->read_buffer == 0) socket->read_buffer = switch_core_alloc(socket->pool, socket->buffer_size); + socket->saveDepth = JS_SuspendRequest(cx); while (can_run == TRUE) { ret = switch_socket_recv(socket->socket, tempbuf, &len); if (ret != SWITCH_STATUS_SUCCESS) @@ -215,6 +227,8 @@ ++total_length; } } + JS_ResumeRequest(cx, socket->saveDepth); + if (ret != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "socket receive failed: %d.\n", ret); *rval = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -235,9 +249,11 @@ return JS_FALSE; } + socket->saveDepth = JS_SuspendRequest(cx); switch_socket_shutdown(socket->socket, SWITCH_SHUTDOWN_READWRITE); switch_socket_close(socket->socket); socket->socket = NULL; + JS_ResumeRequest(cx, socket->saveDepth); return JS_TRUE; }

1 0

[commit] r11659 - freeswitch/trunk/src/mod/formats/mod_sndfile
by FreeSWITCH SVN 05 Feb '09

05 Feb '09

Author: brian Date: Thu Feb 5 14:10:08 2009 New Revision: 11659 Log: MODFORM-22 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Thu Feb 5 14:10:08 2009 @@ -139,6 +139,9 @@ context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_ALAW; context->sfinfo.channels = 1; context->sfinfo.samplerate = 8000; + } else if (!strcmp(ext, "adpcm")) { + context->sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_IMA_ADPCM; + context->sfinfo.samplerate = 8000; } if ((mode & SFM_WRITE) && sf_format_check(&context->sfinfo) == 0) { @@ -305,7 +308,7 @@ char buffer[128]; int format, major_count, subtype_count, m, s; int len, x, skip; - char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", NULL }; + char *extras[] = { "r8", "r16", "r24", "r32", "gsm", "ul", "al", "adpcm", NULL }; int exlen = (sizeof(extras) / sizeof(extras[0])); buffer[0] = 0;

1 0

[commit] r11658 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by FreeSWITCH SVN 05 Feb '09

05 Feb '09

Author: anthm Date: Thu Feb 5 13:53:13 2009 New Revision: 11658 Log: sound_test app Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Feb 5 13:53:13 2009 @@ -794,6 +794,7 @@ SWITCH_DECLARE(switch_say_method_t) switch_ivr_get_say_method_by_name(const char *name); SWITCH_DECLARE(switch_say_type_t) switch_ivr_get_say_type_by_name(const char *name); SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data); + SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session); /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Feb 5 13:53:13 2009 @@ -912,6 +912,11 @@ } } +SWITCH_STANDARD_APP(sound_test_function) +{ + switch_ivr_sound_test(session); +} + SWITCH_STANDARD_APP(event_function) { switch_event_t *event; @@ -2581,6 +2586,7 @@ SWITCH_ADD_APP(app_interface, "log", "Logs to the logger", LOG_LONG_DESC, log_function, "<log_level> <log_string>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "sound_test", "Analyze Audio", "Analyze Audio", sound_test_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "export", "Export a channel variable across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set", "Set a channel variable", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Feb 5 13:53:13 2009 @@ -38,6 +38,91 @@ #include <switch_ivr.h> #include "stfu.h" +SWITCH_DECLARE(switch_status_t) switch_ivr_sound_test(switch_core_session_t *session) +{ + + switch_codec_implementation_t imp = {0}; + switch_codec_t codec = { 0 }; + int16_t peak = 0; + int16_t *data; + switch_frame_t *read_frame = NULL; + int i; + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status = SWITCH_STATUS_SUCCESS; + int64_t global_total = 0, global_sum = 0, period_sum = 0; + int period_total = 0; + int period_avg = 0, global_avg = 0; + int avg = 0; + int period_len; + + switch_core_session_get_read_impl(session, &imp); + + period_len = imp.actual_samples_per_second / imp.samples_per_packet; + + if (switch_core_codec_init(&codec, + "L16", + NULL, + imp.samples_per_second, + imp.microseconds_per_packet / 1000, + imp.number_of_channels, + 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_ERROR, "Codec Error L16@%uhz %u channels %dms\n", + imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000); + return SWITCH_STATUS_FALSE; + } + + while(switch_channel_ready(channel)) { + status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + if (switch_test_flag(read_frame, SFF_CNG) || !read_frame->samples) { + continue; + } + + + data = (int16_t *) read_frame->data; + peak = 0; + avg = 0; + for (i = 0; i < read_frame->samples; i++) { + const int16_t s = abs(data[i]); + if (s > peak) { + peak = s; + } + avg += s; + } + + avg /= read_frame->samples; + + period_sum += peak; + global_sum += peak; + + global_total++; + period_total++; + + period_avg = period_sum / period_total; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, + "\npacket_avg=%d packet_peak=%d period_avg=%d global_avg=%d\n\n", avg, peak, period_avg, global_avg); + + if (period_total >= period_len) { + global_avg = global_sum / global_total; + period_total = 0; + period_sum = 0; + } + + } + + + switch_core_codec_destroy(&codec); + + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_bool_t sync, switch_input_args_t *args) { switch_channel_t *channel = switch_core_session_get_channel(session);

1 0

[commit] r11657 - freeswitch/trunk/debian
by FreeSWITCH SVN 05 Feb '09

05 Feb '09

Author: nicholas Date: Thu Feb 5 11:29:11 2009 New Revision: 11657 Log: fixed an configure error in rules Modified: freeswitch/trunk/debian/rules Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Thu Feb 5 11:29:11 2009 @@ -61,7 +61,7 @@ touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done - ./configure --prefix=/opt/freeswitch --with-modinstdir=/usr/lib/freeswitch/modules --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} + ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} configure: if test ! -f Makefile.in ; then \

1 0