January 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7201 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 14:27:17 2008 New Revision: 7201 Modified: freeswitch/trunk/libs/sofia-sip/configure.ac freeswitch/trunk/libs/sofia-sip/configure.gnu Log: fix config.cache Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Sun Jan 13 14:27:17 2008 @@ -34,6 +34,7 @@ AC_GNU_SOURCE +CFLAGS="$CFLAGS -DSU_DEBUG=0 $DEBUG_CFLAGS" ### checks for programs ### ------------------- AC_LANG([C]) Modified: freeswitch/trunk/libs/sofia-sip/configure.gnu ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.gnu (original) +++ freeswitch/trunk/libs/sofia-sip/configure.gnu Sun Jan 13 14:27:17 2008 @@ -1,3 +1,3 @@ #! /bin/sh -CFLAGS="$CFLAGS -DSU_DEBUG=0 $DEBUG_CFLAGS" ./configure "$@" --with-pic --with-glib=no --disable-shared +./configure "$@" --with-pic --with-glib=no --disable-shared

1 0

[commit] r7200 - freeswitch/trunk/libs/libedit
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 13:43:51 2008 New Revision: 7200 Modified: freeswitch/trunk/libs/libedit/configure.ac freeswitch/trunk/libs/libedit/configure.gnu Log: allow config.cache or -C on libedit Modified: freeswitch/trunk/libs/libedit/configure.ac ============================================================================== --- freeswitch/trunk/libs/libedit/configure.ac (original) +++ freeswitch/trunk/libs/libedit/configure.ac Sun Jan 13 13:43:51 2008 @@ -16,6 +16,8 @@ *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);; esac +CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" + # Checks for programs. AC_PROG_CXX AC_PROG_CC Modified: freeswitch/trunk/libs/libedit/configure.gnu ============================================================================== --- freeswitch/trunk/libs/libedit/configure.gnu (original) +++ freeswitch/trunk/libs/libedit/configure.gnu Sun Jan 13 13:43:51 2008 @@ -1,2 +1,2 @@ #! /bin/sh -./configure "$@" CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" --disable-shared --with-pic +./configure "$@" --disable-shared --with-pic

1 0

[commit] r7199 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_rss mod/codecs/mod_amr mod/endpoints/mod_sofia
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: anthm Date: Sun Jan 13 13:39:51 2008 New Revision: 7199 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c Log: tweak Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sun Jan 13 13:39:51 2008 @@ -797,7 +797,7 @@ \brief Reset the buffers and resampler on a session \param session the session to reset */ -SWITCH_DECLARE(void) switch_core_session_reset(_In_ switch_core_session_t *session); +SWITCH_DECLARE(void) switch_core_session_reset(_In_ switch_core_session_t *session, switch_bool_t flush_dtmf); /*! \brief Write a frame to a session 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 Sun Jan 13 13:39:51 2008 @@ -4369,7 +4369,7 @@ switch_safe_free(dfile); } - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); /* release the readlock */ if (rl) { Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Sun Jan 13 13:39:51 2008 @@ -624,7 +624,7 @@ } switch_xml_free(xml); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); } Modified: freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_amr/mod_amr.c Sun Jan 13 13:39:51 2008 @@ -37,8 +37,8 @@ SWITCH_MODULE_DEFINITION(mod_amr, mod_amr_load, NULL, NULL); #ifndef AMR_PASSTHROUGH -#include "amr/interf_enc.h" -#include "amr/interf_dec.h" +#include "interf_enc.h" +#include "interf_dec.h" /* * Check section 8.1 of rfc3267 for possible sdp options. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sun Jan 13 13:39:51 2008 @@ -1016,7 +1016,7 @@ tech_pvt->read_codec.implementation->iananame, tech_pvt->rm_encoding); switch_core_codec_destroy(&tech_pvt->read_codec); switch_core_codec_destroy(&tech_pvt->write_codec); - switch_core_session_reset(tech_pvt->session); + switch_core_session_reset(tech_pvt->session, SWITCH_TRUE); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->read_codec.implementation->iananame); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sun Jan 13 13:39:51 2008 @@ -575,11 +575,14 @@ } -SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session) +SWITCH_DECLARE(void) switch_core_session_reset(switch_core_session_t *session, switch_bool_t flush_dtmf) { switch_channel_t *channel; switch_size_t has; + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + /* clear resamplers*/ switch_resample_destroy(&session->read_resampler); switch_resample_destroy(&session->write_resampler); @@ -590,12 +593,11 @@ /* wipe theese, they will be recreated if need be */ switch_buffer_destroy(&session->raw_read_buffer); switch_buffer_destroy(&session->raw_write_buffer); - - /* flush dtmf */ - channel = switch_core_session_get_channel(session); - - while ((has = switch_channel_has_dtmf(channel))) { - switch_channel_flush_dtmf(channel); + + if (flush_dtmf) { + while ((has = switch_channel_has_dtmf(channel))) { + switch_channel_flush_dtmf(channel); + } } switch_ivr_deactivate_unicast(session); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Sun Jan 13 13:39:51 2008 @@ -220,7 +220,7 @@ switch_assert(session != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard PARK\n"); switch_channel_clear_flag(session->channel, CF_TRANSFER); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); switch_ivr_park(session, NULL); } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sun Jan 13 13:39:51 2008 @@ -882,7 +882,7 @@ const char *uuid = NULL; switch_assert(session != NULL); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sun Jan 13 13:39:51 2008 @@ -300,7 +300,7 @@ SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; } @@ -664,7 +664,7 @@ status = SWITCH_STATUS_SUCCESS; switch_core_session_set_read_codec(session, read_codec); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); } return status; @@ -720,7 +720,7 @@ SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", file); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sun Jan 13 13:39:51 2008 @@ -222,7 +222,7 @@ end: switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); - switch_core_session_reset(session_a); + switch_core_session_reset(session_a, SWITCH_TRUE); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_channel_clear_flag(chan_a, CF_BRIDGED); @@ -353,8 +353,8 @@ switch_channel_clear_flag(channel, CF_TRANSFER); switch_channel_clear_flag(other_channel, CF_TRANSFER); - switch_core_session_reset(session); - switch_core_session_reset(other_session); + switch_core_session_reset(session, SWITCH_TRUE); + switch_core_session_reset(other_session, SWITCH_TRUE); ready_a = switch_channel_ready(channel); ready_b = switch_channel_ready(other_channel); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Jan 13 13:39:51 2008 @@ -448,7 +448,7 @@ if (!pass && write_codec.implementation) { if (read_codec && !ringback.asis) { switch_core_session_set_read_codec(session, read_codec); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); } switch_core_codec_destroy(&write_codec); } @@ -1116,7 +1116,7 @@ } if (session && (ringback_data || !switch_channel_test_flag(caller_channel, CF_BYPASS_MEDIA))) { - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_FALSE); } for (i = 0; i < and_argc; i++) { @@ -1243,7 +1243,7 @@ if (!pass && write_codec.implementation) { if (read_codec && !ringback.asis) { switch_core_session_set_read_codec(session, read_codec); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_FALSE); } switch_core_codec_destroy(&write_codec); } 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 Sun Jan 13 13:39:51 2008 @@ -371,7 +371,7 @@ read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; } @@ -429,7 +429,7 @@ "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, read_codec->implementation->microseconds_per_frame / 1000); switch_core_file_close(fh); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return SWITCH_STATUS_GENERR; } @@ -551,7 +551,7 @@ switch_core_session_set_read_codec(session, read_codec); switch_core_file_close(fh); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return status; } @@ -747,7 +747,7 @@ read_codec->implementation->number_of_channels, read_codec->implementation->actual_samples_per_second, SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); status = SWITCH_STATUS_NOTFOUND; goto end; } @@ -812,7 +812,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup buffer failed\n"); switch_core_file_close(fh); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); status = SWITCH_STATUS_GENERR; goto end; @@ -839,7 +839,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, interval); switch_core_file_close(fh); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); status = SWITCH_STATUS_GENERR; goto end; } @@ -856,7 +856,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); switch_core_codec_destroy(&codec); switch_core_file_close(fh); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); status = SWITCH_STATUS_GENERR; goto end; } @@ -1103,7 +1103,7 @@ end: free(abuf); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return status; } @@ -1566,7 +1566,7 @@ timer_name = switch_channel_get_variable(channel, "timer_name"); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); read_codec = switch_core_session_get_read_codec(session); rate = read_codec->implementation->actual_samples_per_second; @@ -1577,7 +1577,7 @@ if (switch_core_speech_open(sh, tts_name, voice_name, (uint32_t) rate, interval, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n"); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); if (cache_obj) { switch_channel_set_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME, NULL); } @@ -1603,7 +1603,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz 1 channel %dms\n", codec_name, rate, interval); flags = 0; switch_core_speech_close(sh, &flags); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); if (cache_obj) { switch_channel_set_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME, NULL); } @@ -1620,7 +1620,7 @@ switch_core_codec_destroy(write_frame.codec); flags = 0; switch_core_speech_close(sh, &flags); - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); if (cache_obj) { switch_channel_set_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME, NULL); } @@ -1650,6 +1650,6 @@ } } - switch_core_session_reset(session); + switch_core_session_reset(session, SWITCH_TRUE); return status; }

1 0

[commit] r7198 - freeswitch/trunk/libs/libedit
by Freeswitch SVN 13 Jan '08

13 Jan '08

Author: mikej Date: Sun Jan 13 12:16:54 2008 New Revision: 7198 Removed: freeswitch/trunk/libs/libedit/config.guess freeswitch/trunk/libs/libedit/config.sub freeswitch/trunk/libs/libedit/ltmain.sh Modified: freeswitch/trunk/libs/libedit/configure.ac Log: more generated files Modified: freeswitch/trunk/libs/libedit/configure.ac ============================================================================== --- freeswitch/trunk/libs/libedit/configure.ac (original) +++ freeswitch/trunk/libs/libedit/configure.ac Sun Jan 13 12:16:54 2008 @@ -3,7 +3,7 @@ AC_INIT(libedit, [EL_RELEASE],, libedit-[EL_TIMESTAMP_CVSEXPORT]) AC_CONFIG_SRCDIR([src/strlcat.c]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE AC_PROG_LIBTOOL

1 0

[commit] r7197 - freeswitch/trunk
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 17:37:03 2008 New Revision: 7197 Modified: freeswitch/trunk/Makefile.am Log: fix sounds and sounds-install targets on some machines Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sat Jan 12 17:37:03 2008 @@ -26,6 +26,9 @@ cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\ fi +sounds: sounds-en-us-callie-8000 +sounds-install: sounds-en-us-callie-8000-install + libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \

1 0

[commit] r7196 - in freeswitch/trunk: . libs/sofia-sip
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 17:17:41 2008 New Revision: 7196 Modified: freeswitch/trunk/configure.in freeswitch/trunk/libs/sofia-sip/configure.gnu Log: force debug cflags into sofia lib (SFSIP-42) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Sat Jan 12 17:17:41 2008 @@ -149,6 +149,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -g -ggdb) + export DEBUG_CFLAGS="-g -ggdb" fi fi Modified: freeswitch/trunk/libs/sofia-sip/configure.gnu ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.gnu (original) +++ freeswitch/trunk/libs/sofia-sip/configure.gnu Sat Jan 12 17:17:41 2008 @@ -1,3 +1,3 @@ #! /bin/sh -CFLAGS="$CFLAGS -DSU_DEBUG=0" ./configure "$@" --with-pic --with-glib=no --disable-shared +CFLAGS="$CFLAGS -DSU_DEBUG=0 $DEBUG_CFLAGS" ./configure "$@" --with-pic --with-glib=no --disable-shared

1 0

[commit] r7195 - in freeswitch/trunk/libs/libedit: . doc examples src
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 17:02:49 2008 New Revision: 7195 Removed: freeswitch/trunk/libs/libedit/Makefile.in freeswitch/trunk/libs/libedit/aclocal.m4 freeswitch/trunk/libs/libedit/config.h.in freeswitch/trunk/libs/libedit/configure freeswitch/trunk/libs/libedit/doc/Makefile.in freeswitch/trunk/libs/libedit/examples/Makefile.in freeswitch/trunk/libs/libedit/src/Makefile.in Log: remove generated files from tree. you will need to re-bootstrap or run autoreconf in the libs/libedit directory of updated existing checkouts

1 0

[commit] r7194 - freeswitch/trunk/libs/libedit
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 16:54:25 2008 New Revision: 7194 Modified: freeswitch/trunk/libs/libedit/configure.ac Log: clarify configure error message Modified: freeswitch/trunk/libs/libedit/configure.ac ============================================================================== --- freeswitch/trunk/libs/libedit/configure.ac (original) +++ freeswitch/trunk/libs/libedit/configure.ac Sat Jan 12 16:54:25 2008 @@ -25,7 +25,7 @@ AC_CHECK_LIB(curses, tgetent,, [AC_CHECK_LIB(ncurses, tgetent,, - [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] ) + [AC_MSG_ERROR([libtermcap and libcurses or libncurses are required!])] )] ) # Checks for header files. AC_FUNC_ALLOCA

1 0

[commit] r7193 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_dptools
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: anthm Date: Sat Jan 12 15:30:48 2008 New Revision: 7193 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_io.c Log: Formatting DTMF as a string a '+' separated list of DTMF strings Each element in the list can contain an @ followed by a duration in ms. e.g. 1234@250+4321@500 sends the digits 1 2 3 4 at a rate of 250ms then 4 3 2 1 at a rate of 500 Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Sat Jan 12 15:30:48 2008 @@ -427,6 +427,7 @@ \return SWITCH_STATUS_SUCCESS if successful */ SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf(switch_channel_t *channel, const switch_dtmf_t *dtmf); +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf_string(switch_channel_t *channel, const char *dtmf_string); /*! \brief Retrieve DTMF digits from a given channel Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Jan 12 15:30:48 2008 @@ -845,6 +845,7 @@ \return SWITCH_STATUS_SUCCESS if the dtmf was written */ SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf(_In_ switch_core_session_t *session, const switch_dtmf_t *dtmf); +SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core_session_t *session, const char *dtmf_string); /*! \brief RECV DTMF on a session 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 Sat Jan 12 15:30:48 2008 @@ -2647,20 +2647,6 @@ { switch_event_t *event; char *dtmf = (char *) data; - char *p; - switch_dtmf_t _dtmf = { 0, SWITCH_DEFAULT_DTMF_DURATION }; - int tmp; - - if ((p = strchr(dtmf, '+'))) { - tmp = atoi(p); - if (tmp > 0) { - if (member->orig_read_codec && member->orig_read_codec->implementation) { - _dtmf.duration = tmp * (member->orig_read_codec->implementation->samples_per_second / 1000); - } else { - _dtmf.duration = tmp * (member->conference->rate / 1000); - } - } - } if (member == NULL) { stream->write_function(stream, "Invalid member!\n"); @@ -2676,12 +2662,7 @@ switch_mutex_lock(member->flag_mutex); switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); - p = dtmf; - while(p && *p && is_dtmf(*p)) { - _dtmf.digit = *p; - switch_core_session_send_dtmf(member->session, &_dtmf); - p++; - } + switch_core_session_send_dtmf_string(member->session, (char *)data); switch_mutex_unlock(member->flag_mutex); 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 Sat Jan 12 15:30:48 2008 @@ -181,17 +181,15 @@ SWITCH_STANDARD_APP(queue_dtmf_function) { switch_channel_t *channel; - char *p; - switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + channel = switch_core_session_get_channel(session); + switch_channel_queue_dtmf_string(channel, (const char *) data); + +} - if (!switch_strlen_zero(data)) { - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); - for (p = (char *)data; p && *p; p++) { - dtmf.digit = *p; - switch_channel_queue_dtmf(channel, &dtmf); - } - } + +SWITCH_STANDARD_APP(send_dtmf_function) +{ + switch_core_session_send_dtmf_string(session, (const char *) data); } SWITCH_STANDARD_APP(transfer_function) @@ -1583,6 +1581,7 @@ SWITCH_ADD_APP(app_interface, "deflect", "Send call deflect", "Send a call deflect.", deflect_function, "<deflect_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "reject", "Send session reject (depricated)", "Send a respond message to a session.", respond_function, "<respond_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "queue_dtmf", "Queue dtmf to be sent", "Queue dtmf to be sent from a session", queue_dtmf_function, "<dtmf_data>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "send_dtmf", "Send dtmf to be sent", "Send dtmf to be sent from a session", send_dtmf_function, "<dtmf_data>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_hangup", SCHED_HANGUP_DESCR, SCHED_HANGUP_DESCR, sched_hangup_function, "[+]<time> [<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_broadcast", SCHED_BROADCAST_DESCR, SCHED_BROADCAST_DESCR, sched_broadcast_function, "[+]<time> <path> [aleg|bleg|both]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sched_transfer", SCHED_TRANSF_DESCR, SCHED_TRANSF_DESCR, sched_transfer_function, "[+]<time> <extension> <dialplan> <context>", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Jan 12 15:30:48 2008 @@ -249,6 +249,51 @@ } +SWITCH_DECLARE(switch_status_t) switch_channel_queue_dtmf_string(switch_channel_t *channel, const char *dtmf_string) +{ + char *p; + switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + int sent = 0, dur; + char *string; + int i, argc; + char *argv[256]; + + + switch_assert(channel != NULL); + + if (switch_strlen_zero(dtmf_string)) { + return SWITCH_STATUS_FALSE; + } + + string = switch_core_session_strdup(channel->session, dtmf_string); + argc = switch_separate_string(string, '+', argv, (sizeof(argv) / sizeof(argv[0]))); + + for(i = 0; i < argc; i++) { + dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + dur = SWITCH_DEFAULT_DTMF_DURATION / 8; + if ((p = strchr(argv[i], '@'))) { + *p++ = '\0'; + if ((dur = atoi(p)) > 50) { + dtmf.duration = dur * 8; + } + } + + for (p = argv[i]; p && *p; p++) { + if (is_dtmf(*p)) { + dtmf.digit = *p; + if (switch_channel_queue_dtmf(channel, &dtmf) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Queue dtmf\ndigit=%c ms=%u samples=%u\n", + switch_channel_get_name(channel), dtmf.digit, dur, dtmf.duration); + sent++; + } + } + } + + } + + return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_channel_dequeue_dtmf(switch_channel_t *channel, switch_dtmf_t *dtmf) { switch_event_t *event; Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Sat Jan 12 15:30:48 2008 @@ -954,3 +954,54 @@ return status; } + + + +SWITCH_DECLARE(switch_status_t) switch_core_session_send_dtmf_string(switch_core_session_t *session, const char *dtmf_string) +{ + char *p; + switch_dtmf_t dtmf = {0, SWITCH_DEFAULT_DTMF_DURATION}; + int sent = 0, dur; + char *string; + int i, argc; + char *argv[256]; + + + switch_assert(session != NULL); + + if (switch_strlen_zero(dtmf_string)) { + return SWITCH_STATUS_FALSE; + } + + string = switch_core_session_strdup(session, dtmf_string); + argc = switch_separate_string(string, '+', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc) { + switch_channel_pre_answer(session->channel); + } + + for(i = 0; i < argc; i++) { + dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION; + dur = SWITCH_DEFAULT_DTMF_DURATION / 8; + if ((p = strchr(argv[i], '@'))) { + *p++ = '\0'; + if ((dur = atoi(p)) > 50) { + dtmf.duration = dur * 8; + } + } + + for (p = argv[i]; p && *p; p++) { + if (is_dtmf(*p)) { + dtmf.digit = *p; + if (switch_core_session_send_dtmf(session, &dtmf) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s send dtmf\ndigit=%c ms=%u samples=%u\n", + switch_channel_get_name(session->channel), dtmf.digit, dur, dtmf.duration); + sent++; + } + } + } + + } + + return sent ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +}

1 0

[commit] r7192 - freeswitch/trunk/scripts/contrib/wasim
by Freeswitch SVN 12 Jan '08

12 Jan '08

Author: mikej Date: Sat Jan 12 15:03:00 2008 New Revision: 7192 Added: freeswitch/trunk/scripts/contrib/wasim/ freeswitch/trunk/scripts/contrib/wasim/cFS.pl freeswitch/trunk/scripts/contrib/wasim/cdrload.pl freeswitch/trunk/scripts/contrib/wasim/fshour.pl Log: add scripts from wasim (MODAPP-69 MODEVENT-11) Added: freeswitch/trunk/scripts/contrib/wasim/cFS.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/cFS.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,84 @@ +#!/usr/bin/perl + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +#$0 -t day -s 30 -e 20 -p 92 will get stats on daily basis for the last 30 to 20 hours for number beginning with 92 +# make sure end_timestamp is indexed in the db + +#use warnings; +use strict; +use DBI(); +use Getopt::Long; + +GetOptions ( + 't|time:s' => \(my $t = 'hour'), + 's|start:i' => \(my $i = '24'), + 'e|end:i' => \(my $j = '0'), + 'p|prefix:s' => \(my $prefix = 'WHERE 1') +); + +my $prefix = "WHERE destination_number like '$prefix%' " if ($prefix ne 'WHERE 1'); + +my $dbh = DBI->connect("DBI:mysql:database=freeswitch;host=x.x.x.x","USER","PASS") or &die_call; + +my ($tcalls,$tans,$tmins,$tamins,$tacd,$tasr,$tbpct,$tbmins,$tpdd); +while ($i > $j) { + &get_stats($i); + $i--; +} +$tasr = eval { ( sprintf("%.2f", $tans / $tcalls * 100)) }; +$tacd = eval { ( sprintf("%.2f", $tamins / $tans)) }; +$tbpct = eval { ( sprintf("%.2f", $tamins / $tmins * 100)) }; +$tpdd = eval { ( sprintf("%.2f", (($tbmins - $tamins) * 60) / $tans)) }; + +print "\t\t\t ------ \t -----\t ------\t ------ \t ---- \t -----\t ------\n" if $tans; +print "\t\t\ttotal: $tcalls\tanswer: $tans\tasr: $tasr%\tminute: $tamins\tacd: $tacd\tpdd: $tpdd\tbill%: $tbpct%\n" if $tans; + +exit; + +sub get_stats { + my ($calls,$ans,$mins,$amins,$acd,$asr,$bpct,$pdd,$bmins); + my $time = shift; + my $ntime = $time-1; + my $stm = "select count(*) as calls, sum(duration)/60 as mins from cdr $prefix and end_timestamp between + date_sub(now(), interval $time $t) and date_sub(now(), interval $ntime $t)"; + my $res = &do_db($stm); + $calls = $res->{'calls'}; + $tcalls = $tcalls + $calls; + $mins = sprintf("%.0f", $res->{'mins'}); + $tmins = $tmins + $mins; + + $stm = "select count(*) as ans, sum(billsec)/60 as amins, sum(duration)/60 as bmins,date_sub(now(), + interval $ntime $t) as start from cdr $prefix AND HANGUP_CAUSE='NORMAL_CLEARING' + and end_timestamp between date_sub(now(), interval $time $t) and date_sub(now(), interval $ntime $t)"; + $res = &do_db($stm); + my $when = $res->{'start'}; + $ans = $res->{'ans'}; + $tans = $tans + $ans; + $amins = sprintf("%.0f", $res->{'amins'}); + $tamins = $tamins + $amins; + $bmins = sprintf("%.0f", $res->{'bmins'}); + $tbmins = $tbmins + $bmins; + + $asr = eval { ( sprintf("%.2f", $ans / $calls * 100)) }; + $acd = eval { ( sprintf("%.2f", $amins / $ans)) }; + $bpct = eval { ( sprintf("%.2f", $amins / $mins * 100)) }; + $pdd = eval { ( sprintf("%.2f", (($bmins - $amins) * 60) / $ans)) }; + + print "$time $when\tcalls: $calls\tanswer: $ans\tasr: $asr%\tminute: $amins\tacd: $acd\tpdd: $pdd\tbill%: $bpct%\n" if $ans; +} + +sub do_db { + my $sql = shift; +# print "$sql\n"; + my $get = $dbh->prepare($sql) or die "Couldn't prepare statement: " . $dbh->errstr; + $get->execute(); + my $res = $get->fetchrow_hashref(); + $get->finish(); + return $res; +} Added: freeswitch/trunk/scripts/contrib/wasim/cdrload.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/cdrload.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,32 @@ +#!/usr/bin/perl -w + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +use strict; +use DBI(); + +my @cc = ("killall", "-HUP", "freeswitch"); +system(@cc) == 0 + or die "$0: system @cc failed: $?"; + +my $dbh = DBI->connect("DBI:mysql:database=DB;host=HOST","USER","PASSWORD") + or die "$0: Couldn't connect to database: " . DBI->errstr; + +my @LS = `ls -1t /usr/local/freeswitch/log/cdr-csv/Master.csv.*`; +foreach my $line (@LS) { + chop($line); + my $stm = "load data local infile '$line' into table TABLE fields enclosed by '\"' terminated by ','"; + my $ul = $dbh->prepare($stm) + or die "$0: Couldn't prepare statement $stm: " . $dbh->errstr;; + $ul->execute(); + $ul->finish; + system("cat $line >> /usr/local/freeswitch/log/cdr-csv/FULL_Master.csv"); + unlink $line; +} + +exit; Added: freeswitch/trunk/scripts/contrib/wasim/fshour.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/wasim/fshour.pl Sat Jan 12 15:03:00 2008 @@ -0,0 +1,87 @@ +#!/usr/bin/perl + +# Convergence FreeSwitch Tools Version 7.0 : AGI +# (c) MMII Convergence. All rights reserved. +# <info(a)convergence.pk> http://www.convergence.pk + +# This program is free software, distributed under the terms of +# the GNU General Public License.http://www.gnu.org/licenses.html + +# usage: $0 interval start end prefix +# for example: $0 day 30 20 92 will get stats on daily basis for the last 30 to 30 hours for number beginning with 92 +# make sure end_timestamp is indexed in the db + +#use warnings; +my $debug=0; +use strict; +use DBI(); +use Getopt::Long; + +GetOptions ( + 't|time:s' => \(my $t = 'hour'), + 's|start:i' => \(my $i = '24'), + 'e|end:i' => \(my $j = '0'), + 'p|prefix:s' => \(my $p = 'WHERE 1'), + 'n|notprefix:s' => \(my $n = 'AND 1'), + 'd|date:s' => \(my $d = 'NOW()') +); + +$p = "WHERE destination_number like '$p%' " if ($p ne 'WHERE 1'); +$n = "AND destination_number not like '$n%' " if ($n ne 'AND 1'); +my $dbh = DBI->connect("DBI:mysql:database=freeswitch;host=x.x.x.x","USER","PASS") or &die_call; + +my ($tcalls,$tans,$tmins,$tamins,$tacd,$tasr,$tbpct,$tbmins,$tpdd); + +while ($i > $j) { + &get_stats($d,$i); + $i--; +} +$tasr = eval { ( sprintf("%.2f", $tans / $tcalls * 100)) }; +$tacd = eval { ( sprintf("%.2f", $tamins / $tans)) }; +$tbpct = eval { ( sprintf("%.2f", $tamins / $tmins * 100)) }; +$tpdd = eval { ( sprintf("%.2f", (($tbmins - $tamins) * 60) / $tans)) }; + +print "\t\t\t ------ \t -----\t ------\t ------ \t ---- \t -----\t ------\n" if $tans; +print "\t\t\ttotal: $tcalls\tanswer: $tans\tasr: $tasr%\tminute: $tamins\tacd: $tacd\tpdd: $tpdd\tbill%: $tbpct%\n" if $tans; + +exit; + +sub get_stats { + my $x = shift; + my $i = shift; + my $j = $i-1; + my ($calls,$ans,$mins,$amins,$acd,$asr,$bpct,$pdd,$bmins); + my $stm = "SELECT COUNT(*) AS calls, SUM(duration)/60 AS mins FROM cdr $p $n AND end_timestamp BETWEEN DATE_SUB($d, INTERVAL $i $t) AND DATE_SUB($d, INTERVAL $j $t)"; + my $res = &do_db($stm); + $calls = $res->{'calls'}; + $tcalls = $tcalls + $calls; + $mins = sprintf("%.0f", $res->{'mins'}); + $tmins = $tmins + $mins; + + $stm = "SELECT COUNT(*) AS ans, SUM(billsec)/60 AS amins, SUM(duration)/60 AS bmins, DATE_SUB($d, INTERVAL $i $t) AS start FROM cdr $p $n AND HANGUP_CAUSE='NORMAL_CLEARING' AND end_timestamp BETWEEN DATE_SUB($d, INTERVAL $i $t) AND DATE_SUB($d, INTERVAL $j $t)"; + $res = &do_db($stm); + my $when = $res->{'start'}; + $ans = $res->{'ans'}; + $tans = $tans + $ans; + $amins = sprintf("%.0f", $res->{'amins'}); + $tamins = $tamins + $amins; + $bmins = sprintf("%.0f", $res->{'bmins'}); + $tbmins = $tbmins + $bmins; + + $asr = eval { ( sprintf("%.2f", $ans / $calls * 100)) }; + $acd = eval { ( sprintf("%.2f", $amins / $ans)) }; + $bpct = eval { ( sprintf("%.2f", $amins / $mins * 100)) }; + $pdd = eval { ( sprintf("%.2f", (($bmins - $amins) * 60) / $ans)) }; + + print "$i $when\tcalls: $calls\tanswer: $ans\tasr: $asr%\tminute: $amins\tacd: $acd\tpdd: $pdd\tbill%: $bpct%\n" if $ans; +} + +sub do_db { + my $sql = shift; + print "$sql\n" if $debug; + my $get = $dbh->prepare($sql) or die "Couldn't prepare statement: " . $dbh->errstr; + $get->execute(); + my $res = $get->fetchrow_hashref(); + $get->finish(); + return $res; +}

1 0