- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7935 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 14:36:56 2008 New Revision: 7935 Modified: freeswitch/trunk/build/freeswitch.sysconfig Log: we moved this to the init file instead as you allways need it Modified: freeswitch/trunk/build/freeswitch.sysconfig ============================================================================== --- freeswitch/trunk/build/freeswitch.sysconfig (original) +++ freeswitch/trunk/build/freeswitch.sysconfig Wed Mar 19 14:36:56 2008 @@ -4,6 +4,5 @@ ## ServiceRestart: freeswitch # # if not empty: parameters for freeswitch -# for example FREESWITCH_PARAMS="-nc" # -FREESWITCH_PARAMS="-nc" +FREESWITCH_PARAMS=""

1 0

[commit] r7934 - in freeswitch/trunk: libs/curl/lib libs/libresample libs/xmlrpc-c src src/mod/endpoints/mod_iax
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 13:56:27 2008 New Revision: 7934 Modified: freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_rtp.c Log: deal with MODENDP-99 Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Wed Mar 19 13:56:27 2008 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Wed Mar 19 13:56:27 2008 @@ -45,6 +45,8 @@ AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) +echo host $host +echo ax_cv_c_compiler_vendor ${ax_cv_c_compiler_vendor} case "$host" in *-solaris2*) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then Modified: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in Wed Mar 19 13:56:27 2008 @@ -81,5 +81,5 @@ /* Version number of package */ #undef VERSION -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Wed Mar 19 13:56:27 2008 @@ -87,6 +87,8 @@ switch_codec_t write_codec; switch_frame_t read_frame; unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + switch_frame_t cng_frame; + unsigned char cng_databuf[10]; switch_core_session_t *session; struct iax_session *iax_session; switch_caller_profile_t *caller_profile; @@ -441,6 +443,10 @@ { tech_pvt->read_frame.data = tech_pvt->databuf; tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); + tech_pvt->cng_frame.data = tech_pvt->cng_databuf; + tech_pvt->cng_frame.buflen = sizeof(tech_pvt->cng_databuf); + switch_set_flag((&tech_pvt->cng_frame), SFF_CNG); + tech_pvt->cng_frame.datalen = 2; switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); @@ -604,6 +610,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_DTMF)) { + switch_clear_flag_locked(tech_pvt, TFLAG_DTMF); + *frame = &tech_pvt->cng_frame; + return SWITCH_STATUS_SUCCESS; + } + if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { @@ -1107,7 +1119,10 @@ if (globals.debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel)); } + switch_mutex_lock(tech_pvt->flag_mutex); switch_channel_queue_dtmf(channel, &dtmf); + switch_set_flag(tech_pvt, TFLAG_DTMF); + switch_mutex_unlock(tech_pvt->flag_mutex); } break; Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Mar 19 13:56:27 2008 @@ -178,7 +178,7 @@ switch_dtmf_t dtmf = { 0, 0 }; if (switch_channel_dequeue_dtmf(chan_a, &dtmf) == SWITCH_STATUS_SUCCESS) { int send_dtmf = 1; - + if (input_callback) { switch_status_t cb_status = input_callback(session_a, (void *)&dtmf, SWITCH_INPUT_TYPE_DTMF, user_data, 0); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 19 13:56:27 2008 @@ -1098,7 +1098,7 @@ { switch_size_t bytes = 0; switch_status_t status; - uint8_t check = 1; + uint8_t check = 0; stfu_frame_t *jb_frame; int ret = -1; @@ -1125,6 +1125,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_BREAK); + do_2833(rtp_session); bytes = 0; do_cng = 1; goto cng; @@ -1154,8 +1155,8 @@ } else if (bytes) { check++; } - - if (check) { + + if (check || bytes) { do_2833(rtp_session); }

1 0

[commit] r7933 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:48:05 2008 New Revision: 7933 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: let sysconfig override Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:48:05 2008 @@ -14,11 +14,6 @@ # Source function library. . /etc/init.d/functions -# Source options file -if [ -f /etc/sysconfig/freeswitch ]; then - . /etc/sysconfig/freeswitch -fi - PROG_NAME=freeswitch PID_FILE=/opt/freeswitch/log/freeswitch.pid FS_USER=freeswitch @@ -27,6 +22,11 @@ FREESWITCH_ARGS="-nc" RETVAL=0 +# Source options file +if [ -f /etc/sysconfig/freeswitch ]; then + . /etc/sysconfig/freeswitch +fi + # <define any local shell functions used by the code that follows> start() {

1 0

[commit] r7932 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:37:18 2008 New Revision: 7932 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: cleanup Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:37:18 2008 @@ -11,7 +11,6 @@ # pidfile: /opt/freeswitch/log/freeswitch.pid # -export PATH=$PATH:/opt/freeswitch/bin # Source function library. . /etc/init.d/functions @@ -25,6 +24,7 @@ FS_USER=freeswitch FS_FILE=/opt/freeswitch/bin/freeswitch LOCK_FILE=/var/lock/subsys/freeswitch +FREESWITCH_ARGS="-nc" RETVAL=0 # <define any local shell functions used by the code that follows> @@ -32,7 +32,7 @@ start() { echo -n "Starting $PROG_NAME: " if [ -e $LOCK_FILE ]; then - if [ -e $PID_FILE ] && [ -e /proc/`$PID_FILE` ]; then + if [ -e $PID_FILE ] && [ -e /proc/`cat $PID_FILE` ]; then echo echo -n $"$PROG_NAME is already running."; failure $"$PROG_NAME is already running."; @@ -41,10 +41,11 @@ fi fi - daemon --user $FS_USER --pidfile $PID_FILE "$FS_FILE $FREESWITCH_PARAMS >/dev/null 2>&1" + daemon --user $FS_USER --pidfile $PID_FILE "$FS_FILE $FREESWITCH_ARGS $FREESWITCH_PARAMS >/dev/null 2>&1" echo RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCK_FILE; + echo return $RETVAL }

1 0

[commit] r7931 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 13:21:30 2008 New Revision: 7931 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: cleanup Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 13:21:30 2008 @@ -4,7 +4,7 @@ # # The FreeSwitch Open Source Voice Platform # -# chkconfig: - 89 14 +# chkconfig: 345 89 14 # description: Starts and stops the freeswitch server daemon # processname: freeswitch # config: /opt/freeswitch/conf/freeswitch.conf @@ -33,8 +33,9 @@ echo -n "Starting $PROG_NAME: " if [ -e $LOCK_FILE ]; then if [ -e $PID_FILE ] && [ -e /proc/`$PID_FILE` ]; then - echo -n $"cannot start freeswitch: freeswitch is already running."; - failure $"cannot start freeswitch: freeswitch already running."; + echo + echo -n $"$PROG_NAME is already running."; + failure $"$PROG_NAME is already running."; echo return 1 fi @@ -50,13 +51,14 @@ stop() { echo -n "Shutting down $PROG_NAME: " if [ ! -e $LOCK_FILE ]; then + echo echo -n $"cannot stop $PROG_NAME: $PROG_NAME is not running." failure $"cannot stop $PROG_NAME: $PROG_NAME is not running." echo return 1; fi - /opt/freeswitch/bin/freeswitch -stop > /dev/null 2>&1 - killproc freeswitch + $FS_FILE -stop > /dev/null 2>&1 + killproc $PROG_NAME RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE;

1 0

[commit] r7930 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 12:56:24 2008 New Revision: 7930 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: cleanup Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 12:56:24 2008 @@ -5,6 +5,7 @@ # The FreeSwitch Open Source Voice Platform # # chkconfig: - 89 14 +# description: Starts and stops the freeswitch server daemon # processname: freeswitch # config: /opt/freeswitch/conf/freeswitch.conf # pidfile: /opt/freeswitch/log/freeswitch.pid @@ -19,19 +20,19 @@ . /etc/sysconfig/freeswitch fi -prog=freeswitch -pidfile=/opt/freeswitch/log/freeswitch.pid +PROG_NAME=freeswitch +PID_FILE=/opt/freeswitch/log/freeswitch.pid FS_USER=freeswitch FS_FILE=/opt/freeswitch/bin/freeswitch -lockfile=/var/lock/subsys/freeswitch +LOCK_FILE=/var/lock/subsys/freeswitch RETVAL=0 # <define any local shell functions used by the code that follows> start() { - echo -n "Starting $prog: " - if [ -e $lockfile ]; then - if [ -e $pidfile ] && [ -e /proc/`$pidfile` ]; then + echo -n "Starting $PROG_NAME: " + if [ -e $LOCK_FILE ]; then + if [ -e $PID_FILE ] && [ -e /proc/`$PID_FILE` ]; then echo -n $"cannot start freeswitch: freeswitch is already running."; failure $"cannot start freeswitch: freeswitch already running."; echo @@ -39,18 +40,18 @@ fi fi - daemon --user $FS_USER --pidfile $pidfile "$FS_FILE $FREESWITCH_PARAMS >/dev/null 2>&1" + daemon --user $FS_USER --pidfile $PID_FILE "$FS_FILE $FREESWITCH_PARAMS >/dev/null 2>&1" echo RETVAL=$? - [ $RETVAL -eq 0 ] && touch $lockfile; + [ $RETVAL -eq 0 ] && touch $LOCK_FILE; return $RETVAL } stop() { - echo -n "Shutting down $prog: " - if [ ! -e $lockfile ]; then - echo -n $"cannot stop $prog: $prog is not running." - failure $"cannot stop $prog: $prog is not running." + echo -n "Shutting down $PROG_NAME: " + if [ ! -e $LOCK_FILE ]; then + echo -n $"cannot stop $PROG_NAME: $PROG_NAME is not running." + failure $"cannot stop $PROG_NAME: $PROG_NAME is not running." echo return 1; fi @@ -58,12 +59,12 @@ killproc freeswitch RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f $lockfile; + [ $RETVAL -eq 0 ] && rm -f $LOCK_FILE; return $RETVAL } rhstatus() { - status $prog; + status $PROG_NAME; } case "$1" in @@ -74,7 +75,7 @@ stop ;; status) - status $prog + status $PROG_NAME RETVAL=$? ;; restart) @@ -87,10 +88,10 @@ # to restart above> ;; condrestart) - [ -f $pidfile ] && restart || : + [ -f $PID_FILE ] && restart || : ;; *) - echo "Usage: $prog {start|stop|status|reload|restart" + echo "Usage: $PROG_NAME {start|stop|status|reload|restart" exit 1 ;; esac

1 0

[commit] r7929 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 12:03:51 2008 New Revision: 7929 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: update Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Mar 19 12:03:51 2008 @@ -36,6 +36,20 @@ #define FIFO_EVENT "fifo::info" +#define MAX_PRI 10 + +struct fifo_node { + char *name; + switch_mutex_t *mutex; + switch_queue_t *fifo_list[MAX_PRI]; + switch_hash_t *caller_hash; + switch_hash_t *consumer_hash; + int caller_count; + int waiting_count; + int consumer_count; +}; + +typedef struct fifo_node fifo_node_t; static switch_status_t on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) @@ -66,10 +80,17 @@ static switch_status_t read_frame_callback(switch_core_session_t *session, switch_frame_t *frame, void *user_data) { - switch_queue_t *fifo = (switch_queue_t *) user_data; - if (switch_queue_size(fifo)) { + fifo_node_t *node = (fifo_node_t *) user_data; + int x = 0, total = 0; + + for (x = 0; x < MAX_PRI; x++) { + total += switch_queue_size(node->fifo_list[x]); + } + + if (total) { return SWITCH_STATUS_FALSE; } + return SWITCH_STATUS_SUCCESS; } @@ -81,35 +102,24 @@ } globals; -struct fifo_node { - char *name; - switch_mutex_t *mutex; - switch_queue_t *fifo; - switch_hash_t *caller_hash; - switch_hash_t *consumer_hash; - int caller_count; - int waiting_count; - int consumer_count; -}; - -typedef struct fifo_node fifo_node_t; - - static fifo_node_t *create_node(const char *name) { fifo_node_t *node; - + int x = 0; + if (!globals.running) { return NULL; } node = switch_core_alloc(globals.pool, sizeof(*node)); node->name = switch_core_strdup(globals.pool, name); - - switch_queue_create(&node->fifo, SWITCH_CORE_QUEUE_LEN, globals.pool); + for (x = 0; x < MAX_PRI; x++) { + switch_queue_create(&node->fifo_list[x], SWITCH_CORE_QUEUE_LEN, globals.pool); + switch_assert(node->fifo_list[x]); + } switch_core_hash_init(&node->caller_hash, globals.pool); switch_core_hash_init(&node->consumer_hash, globals.pool); - switch_assert(node->fifo); + switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_core_hash_insert(globals.fifo_hash, name, node); @@ -228,6 +238,8 @@ if (!strcasecmp(argv[1], "in")) { const char *uuid = strdup(switch_core_session_get_uuid(session)); + const char *pri; + int p = 0; switch_channel_answer(channel); @@ -253,7 +265,17 @@ node->waiting_count++; send_presence(node); switch_core_hash_insert(node->caller_hash, uuid, session); - switch_queue_push(node->fifo, (void *)uuid); + + if ((pri = switch_channel_get_variable(channel, "fifo_priority"))) { + p = atoi(pri); + } + + if (p >= MAX_PRI) { + p = MAX_PRI - 1; + } + + switch_queue_push(node->fifo_list[p], (void *)uuid); + switch_mutex_unlock(node->mutex); ts = switch_timestamp_now(); @@ -311,7 +333,11 @@ int done = 0; switch_core_session_t *other_session; switch_input_args_t args = { 0 }; - + const char *pop_order = NULL; + int custom_pop = 0; + int pop_array[MAX_PRI] = { 0 }; + char *pop_list[MAX_PRI] = { 0 }; + if (argc > 3) { announce = argv[3]; } @@ -344,27 +370,58 @@ switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_timestamp", date); + if ((pop_order = switch_channel_get_variable(channel, "fifo_pop_order"))) { + char *tmp = switch_core_session_strdup(session, pop_order); + int x; + custom_pop = switch_separate_string(tmp, ',', pop_list, (sizeof(pop_list) / sizeof(pop_list[0]))); + if (custom_pop >= MAX_PRI) { + custom_pop = MAX_PRI -1; + } + + for (x = 0; x < custom_pop; x++) { + int tmp = atoi(pop_list[x]); + if (tmp > -1 && tmp < MAX_PRI) { + pop_array[x] = tmp; + } + } + } + while(switch_channel_ready(channel)) { + int x = 0 ; if (moh) { args.read_frame_callback = read_frame_callback; - args.user_data = node->fifo; + args.user_data = node; switch_ivr_play_file(session, NULL, moh, &args); } + + if (custom_pop) { + for(x = 0; x < MAX_PRI; x++) { + if (switch_queue_trypop(node->fifo_list[pop_array[x]], &pop) == SWITCH_STATUS_SUCCESS && pop) { + break; + } + } + } else { + for(x = 0; x < MAX_PRI; x++) { + if (switch_queue_trypop(node->fifo_list[x], &pop) == SWITCH_STATUS_SUCCESS && pop) { + break; + } + } + } - if (switch_queue_trypop(node->fifo, &pop) != SWITCH_STATUS_SUCCESS) { + if (!pop) { if (nowait) { break; } + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } + continue; } - if (!pop) { - break; - } - + uuid = (char *) pop; if ((other_session = switch_core_session_locate(uuid))) { @@ -615,9 +672,13 @@ } else if (!strcasecmp(argv[0], "count")) { if (argc < 2) { for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { + int x = 0; switch_hash_this(hi, &var, NULL, &val); node = (fifo_node_t *) val; - len = switch_queue_size(node->fifo); + len = 0; + for (x = 0 ;x < MAX_PRI; x++) { + len += switch_queue_size(node->fifo_list[x]); + } switch_mutex_lock(node->mutex); stream->write_function(stream, "%s:%d:%d:%d\n", (char *)var, node->consumer_count, node->caller_count, len); switch_mutex_unlock(node->mutex); @@ -629,7 +690,12 @@ } } else { if ((node = switch_core_hash_find(globals.fifo_hash, argv[1]))) { - len = switch_queue_size(node->fifo); + int x = 0; + len = 0; + for (x = 0 ;x < MAX_PRI; x++) { + len += switch_queue_size(node->fifo_list[x]); + } + } switch_mutex_lock(node->mutex); stream->write_function(stream, "%s:%d:%d:%d\n", argv[1], node->consumer_count, node->caller_count, len); @@ -689,11 +755,14 @@ globals.running = 0; /* Cleanup*/ for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { + int x = 0 ; switch_hash_this(hi, NULL, NULL, &val); node = (fifo_node_t *) val; - while (switch_queue_trypop(node->fifo, &pop) == SWITCH_STATUS_SUCCESS) { - free(pop); - } + for (x = 0; x < MAX_PRI; x++) { + while (switch_queue_trypop(node->fifo_list[x], &pop) == SWITCH_STATUS_SUCCESS) { + free(pop); + } + } switch_core_hash_destroy(&node->caller_hash); switch_core_hash_destroy(&node->consumer_hash); }

1 0

[commit] r7928 - freeswitch/trunk/src
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 11:56:24 2008 New Revision: 7928 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: update 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 Wed Mar 19 11:56:24 2008 @@ -702,16 +702,18 @@ char *dup; if (!strncasecmp(file, "phrase:", 7)) { - char *arg; + char *arg = NULL; char *lang = NULL; alt = file + 7; dup = switch_core_session_strdup(session, alt); - if ((arg = strchr(dup, ':'))) { - *arg++ = '\0'; - if ((lang = strchr(arg, ':'))) { - *lang++ = '\0'; + + if ((lang = strchr(dup, ':'))) { + *lang++ = '\0'; + if ((arg = strchr(lang, ':'))) { + *arg++ = '\0'; } } + if (dup) { return switch_ivr_phrase_macro(session, dup, arg, lang, args); } else {

1 0

[commit] r7927 - freeswitch/trunk/src
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: anthm Date: Wed Mar 19 11:34:43 2008 New Revision: 7927 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: update 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 Wed Mar 19 11:34:43 2008 @@ -682,6 +682,7 @@ const char *prefix; const char *timer_name; const char *prebuf; + const char *alt = NULL; switch_zmalloc(abuf, FILE_STARTSAMPLES * sizeof(*abuf)); @@ -697,6 +698,49 @@ goto end; } + if ((alt = strchr(file, ':'))) { + char *dup; + + if (!strncasecmp(file, "phrase:", 7)) { + char *arg; + char *lang = NULL; + alt = file + 7; + dup = switch_core_session_strdup(session, alt); + if ((arg = strchr(dup, ':'))) { + *arg++ = '\0'; + if ((lang = strchr(arg, ':'))) { + *lang++ = '\0'; + } + } + if (dup) { + return switch_ivr_phrase_macro(session, dup, arg, lang, args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n"); + return SWITCH_STATUS_FALSE; + } + } else if (!strncasecmp(file, "say:", 4)) { + char *engine = NULL, *voice = NULL, *text = NULL; + alt = file + 4; + dup = switch_core_session_strdup(session, alt); + engine = dup; + + if ((voice = strchr(engine, ':'))) { + *voice++ = '\0'; + if ((text = strchr(voice, ':'))) { + *text++ = '\0'; + } + } + if (engine && voice && text) { + return switch_ivr_speak_text(session, engine, voice, dup, args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n"); + return SWITCH_STATUS_FALSE; + } + } + + } + + if (!prefix) { prefix = SWITCH_GLOBAL_dirs.base_dir; }

1 0

[commit] r7926 - freeswitch/trunk/build
by Freeswitch SVN 19 Mar '08

19 Mar '08

Author: mikej Date: Wed Mar 19 11:18:19 2008 New Revision: 7926 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: redhat init file tweak from Andrew... thanks Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Wed Mar 19 11:18:19 2008 @@ -22,6 +22,7 @@ prog=freeswitch pidfile=/opt/freeswitch/log/freeswitch.pid FS_USER=freeswitch +FS_FILE=/opt/freeswitch/bin/freeswitch lockfile=/var/lock/subsys/freeswitch RETVAL=0 @@ -38,8 +39,9 @@ fi fi - daemon --user $FS_USER --pidfile $pidfile $prog $FREESWITCH_PARAMS - RETVAL=$? + daemon --user $FS_USER --pidfile $pidfile "$FS_FILE $FREESWITCH_PARAMS >/dev/null 2>&1" + echo + RETVAL=$? [ $RETVAL -eq 0 ] && touch $lockfile; return $RETVAL } @@ -52,7 +54,7 @@ echo return 1; fi - /opt/freeswitch/bin/freeswitch -stop + /opt/freeswitch/bin/freeswitch -stop > /dev/null 2>&1 killproc freeswitch RETVAL=$? echo

1 0