- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6018 - freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: trixter Date: Mon Oct 22 14:03:00 2007 New Revision: 6018 Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl Log: this would be nice to have Added: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/voicemail.conf.tpl Mon Oct 22 14:03:00 2007 @@ -0,0 +1,50 @@ +<configuration name="voicemail.conf" description="Voicemail"> + <settings> + </settings> + <profiles> + <profile name="default"> + <param name="file-extension" value="wav"/> + <param name="terminator-key" value="#"/> + <param name="max-login-attempts" value="3"/> + <param name="digit-timeout" value="10000"/> + <param name="max-record-len" value="300"/> + <param name="tone-spec" value="%(1000, 0, 640)"/> + <param name="callback-dialplan" value="XML"/> + <param name="callback-context" value="default"/> + <param name="terminator-key" value="#"/> + <param name="play-new-messages-key" value="1"/> + <param name="play-saved-messages-key" value="2"/> + <param name="main-menu-key" value="0"/> + <param name="config-menu-key" value="5"/> + <param name="record-greeting-key" value="1"/> + <param name="choose-greeting-key" value="2"/> + <param name="record-name-key" value="3"/> + <param name="record-file-key" value="3"/> + <param name="listen-file-key" value="1"/> + <param name="save-file-key" value="2"/> + <param name="delete-file-key" value="7"/> + <param name="undelete-file-key" value="8"/> + <param name="email-key" value="4"/> + <param name="pause-key" value="0"/> + <param name="restart-key" value="1"/> + <param name="ff-key" value="6"/> + <param name="rew-key" value="4"/> + <email> + <body>{literal}<![CDATA[At ${voicemail_time} you were left a message from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +to your account ${voicemail_account}@${voicemail_domain} +]]>{/literal}</body> + <headers>{literal}<![CDATA[From: FreeSWITCH mod_voicemail <${voicemail_account}@${voicemail_domain}> +To: <${voicemail_email}> +Subject: Voicemail from ${voicemail_caller_id_name} ${voicemail_caller_id_number} +X-Priority: ${voicemail_priority} +X-Mailer: FreeSWITCH +]]>{/literal}</headers> +  + <param name="date-fmt" value="%A, %B %d %Y, %I %M %p"/> + <param name="email-from" value="{literal}${voicemail_account}@${voicemail_domain}{/literal}"/> + </email> +  +  + </profile> + </profiles> +</configuration>

1 0

[commit] r6017 - freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: trixter Date: Mon Oct 22 14:02:47 2007 New Revision: 6017 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl Log: updated for new format Modified: freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-curl/templates/switch1/configuration/xml_cdr.conf.tpl Mon Oct 22 14:02:47 2007 @@ -1,6 +1,3 @@ -<?xml version="1.0"?> -<document type="freeswitch/xml"> - <section name="configuration" description="Various Configuration"> <configuration name="xml_cdr.conf" description="XML CDR CURL logger"> <settings>  @@ -13,17 +10,22 @@   -  - -  -  +   -  -  - <param name="logDir" value=""/> +  + <param name="log-dir" value=""/> + +  +  + +  +  +  + +  +  +  </settings> </configuration> -</section> -</document>

1 0

[commit] r6016 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: anthm Date: Mon Oct 22 10:30:21 2007 New Revision: 6016 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: avoiding segfault Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Oct 22 10:30:21 2007 @@ -1774,7 +1774,7 @@ #define check_decode(_var, _session) do { \ assert(_session); \ - if (strchr(_var, '%')) { \ + if (!switch_strlen_zero(_var) && strchr(_var, '%')) { \ char *tmp = switch_core_session_strdup(_session, _var); \ switch_url_decode(tmp); \ _var = tmp; \ @@ -1797,6 +1797,14 @@ port = url->url_port; } + if (switch_strlen_zero(user)) { + user = "nobody"; + } + + if (switch_strlen_zero(host)) { + host = "nowhere"; + } + check_decode(user, session); if (user) {

1 0

[commit] r6015 - freeswitch/trunk
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: mikej Date: Sun Oct 21 21:47:02 2007 New Revision: 6015 Modified: freeswitch/trunk/Makefile.am Log: do a little bit better dependency tracking with module targets when the core is modified. Fix for FSBUILD-19 Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Sun Oct 21 21:47:02 2007 @@ -11,6 +11,8 @@ OSARCH=`uname -s` .DEFAULT: + @target=`echo $@ | sed -e 's|^.*-||'`; \ + if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ libfreeswitch_la_SOURCES = \

1 0

[commit] r6014 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 22 Oct '07

22 Oct '07

Author: mikej Date: Sun Oct 21 21:17:08 2007 New Revision: 6014 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Log: fix build Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sun Oct 21 21:17:08 2007 @@ -25,9 +25,10 @@ SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la include ../../../../build/modmake.rules -$(OPENMRCP_DIR)/.built: + +$(OPENMRCP_DIR)/.built: $(OPENMRCP_DIR)/.update cd $(OPENMRCP_DIR) && ./bootstrap && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip - cd $(OPENMRCP_DIR) && $(MAKE) && touch $(OPENMRCP_DIR)/.built + cd $(OPENMRCP_DIR) && $(MAKE) && touch .built $(OPENMRCP_LIBS): $(SOFIALA) $(OPENMRCP_DIR)/.built

1 0

[commit] r6013 - in freeswitch/trunk/src/mod: applications/mod_voicemail endpoints/mod_sofia
by Freeswitch SVN 21 Oct '07

21 Oct '07

Author: mikej Date: Sun Oct 21 16:48:50 2007 New Revision: 6013 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: code before declaration. Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sun Oct 21 16:48:50 2007 @@ -1311,6 +1311,7 @@ } if (!x_user) { + char *xtra; int ok = 1; /* TRX added destination_number and caller_id_number from the session object * ideally switch_xml_* would do this for any curl request, but that can get tricky @@ -1318,7 +1319,7 @@ * and see what it would take to make it automagically do that */ caller_profile = switch_channel_get_caller_profile(channel); - char *xtra = switch_mprintf("mailbox=%s&destination_number=%s&caller_id_number=%s", myid,caller_profile->destination_number,caller_profile->caller_id_number); + xtra = switch_mprintf("mailbox=%s&destination_number=%s&caller_id_number=%s", myid,caller_profile->destination_number,caller_profile->caller_id_number); assert(xtra); 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 Sun Oct 21 16:48:50 2007 @@ -2073,9 +2073,10 @@ if (sip->sip_request->rq_url) { sofia_gateway_t *gateway; + char *from_key; char *user = (char *) sip->sip_request->rq_url->url_user; check_decode(user, session); - char *from_key = switch_core_session_sprintf(session, "sip:%s@%s", + from_key = switch_core_session_sprintf(session, "sip:%s@%s", user, (char *) sip->sip_request->rq_url->url_host);

1 0

[commit] r6012 - in freeswitch/trunk/src: . include mod/asr_tts/mod_openmrcp
by Freeswitch SVN 20 Oct '07

20 Oct '07

Author: anthm Date: Sat Oct 20 13:42:35 2007 New Revision: 6012 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/switch_core_asr.c freeswitch/trunk/src/switch_core_speech.c Log: make mod_openmrcp profile name choosable from engine_name parameter e.g. openmrcp:myprofile Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Sat Oct 20 13:42:35 2007 @@ -327,6 +327,8 @@ /*! The Rate */ uint32_t rate; char *grammar; + /*! module specific param*/ + char *param; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; /*! private data for the format module to store handle specific info */ @@ -367,7 +369,9 @@ uint32_t speed; uint32_t samples; char voice[80]; - char engine[80]; + char *engine; + /*! module specific param*/ + char *param; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; /*! private data for the format module to store handle specific info */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/Makefile Sat Oct 20 13:42:35 2007 @@ -25,12 +25,11 @@ SOFIALA=$(SOFIAUA_DIR)/libsofia-sip-ua.la include ../../../../build/modmake.rules - -$(OPENMRCP_DIR)/Makefile: +$(OPENMRCP_DIR)/.built: cd $(OPENMRCP_DIR) && ./bootstrap && ./configure --with-apr=../apr --with-apr-util=../apr-util --with-sofia-sip=../sofia-sip + cd $(OPENMRCP_DIR) && $(MAKE) && touch $(OPENMRCP_DIR)/.built -$(OPENMRCP_LIBS): $(OPENMRCP_DIR)/Makefile $(SOFIALA) - cd $(OPENMRCP_DIR) && $(MAKE) +$(OPENMRCP_LIBS): $(SOFIALA) $(OPENMRCP_DIR)/.built $(SOFIALA): $(SOFIA_DIR) $(SOFIA_DIR)/.update cd $(SOFIA_DIR) && $(MAKE) Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Sat Oct 20 13:42:35 2007 @@ -98,13 +98,14 @@ typedef struct { switch_memory_pool_t *pool; switch_hash_t *profile_hash; - - openmrcp_profile_t *asr_profile; - openmrcp_profile_t *tts_profile; + char *asr_profile_name; + char *tts_profile_name; + //openmrcp_profile_t *asr_profile; + //openmrcp_profile_t *tts_profile; } openmrcp_module_t; static openmrcp_module_t openmrcp_module; - +static switch_status_t openmrcp_profile_run(openmrcp_profile_t *profile); static openmrcp_session_t* openmrcp_session_create(openmrcp_profile_t *profile) { @@ -287,7 +288,9 @@ { openmrcp_session_t *asr_session; mrcp_client_channel_t *asr_channel; - + char *profile_name = openmrcp_module.asr_profile_name; + openmrcp_profile_t *asr_profile = NULL; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "asr_open called, codec: %s, rate: %d\n", codec, rate); if (strcmp(codec, "L16")) { @@ -299,8 +302,19 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Sorry, only 8kz supported\n"); return SWITCH_STATUS_GENERR; } + + if (!switch_strlen_zero(ah->param)) { + profile_name = ah->param; + } + + if (!(asr_profile = switch_core_hash_find(openmrcp_module.profile_hash, profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot locate profile %s\n", profile_name); + return SWITCH_STATUS_GENERR; + } + /* create session */ - asr_session = openmrcp_session_create(openmrcp_module.asr_profile); + asr_session = openmrcp_session_create(asr_profile); + if (!asr_session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "asr_session creation FAILED\n"); return SWITCH_STATUS_GENERR; @@ -593,9 +607,21 @@ { openmrcp_session_t *tts_session; mrcp_client_channel_t *tts_channel; + char *profile_name = openmrcp_module.tts_profile_name; + openmrcp_profile_t *tts_profile = NULL; + + if (!switch_strlen_zero(sh->param)) { + profile_name = sh->param; + } + + if (!(tts_profile = switch_core_hash_find(openmrcp_module.profile_hash, profile_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot locate profile %s\n", profile_name); + return SWITCH_STATUS_GENERR; + } /* create session */ - tts_session = openmrcp_session_create(openmrcp_module.tts_profile); + tts_session = openmrcp_session_create(tts_profile); + if (!tts_session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "tts_session creation FAILED\n"); return SWITCH_STATUS_GENERR; @@ -742,8 +768,6 @@ static switch_status_t do_config() { char *cf = "mod_openmrcp.conf"; - const char *asr_profile_name = NULL; - const char *tts_profile_name = NULL; switch_xml_t cfg, xml, settings, profiles, xprofile, param; openmrcp_profile_t *mrcp_profile; openmrcp_client_options_t *mrcp_options; @@ -760,9 +784,9 @@ const char *val = switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "asr_default_profile")) { - asr_profile_name = val; + openmrcp_module.asr_profile_name = switch_core_strdup(openmrcp_module.pool, val); } else if (!strcasecmp(var, "tts_default_profile")) { - tts_profile_name = val; + openmrcp_module.tts_profile_name = switch_core_strdup(openmrcp_module.pool, val); } else if (!strcasecmp(var, "log_level")) { mrcp_logger.priority = atoi(val); } @@ -805,33 +829,11 @@ } } mrcp_profile->mrcp_options = mrcp_options; - + /* add profile */ if (!switch_core_hash_find(openmrcp_module.profile_hash, mrcp_profile->name)) { switch_core_hash_insert(openmrcp_module.profile_hash, mrcp_profile->name, mrcp_profile); - - /* try to set default asr profile */ - if (!openmrcp_module.asr_profile) { - if (asr_profile_name) { - if (!strcasecmp(mrcp_profile->name, asr_profile_name)) { - openmrcp_module.asr_profile = mrcp_profile; - } - } - else { - openmrcp_module.asr_profile = mrcp_profile; - } - } - /* try to set default tts profile */ - if (!openmrcp_module.tts_profile) { - if (tts_profile_name) { - if (!strcasecmp(mrcp_profile->name, tts_profile_name)) { - openmrcp_module.tts_profile = mrcp_profile; - } - } - else { - openmrcp_module.tts_profile = mrcp_profile; - } - } + openmrcp_profile_run(mrcp_profile); } } } @@ -892,9 +894,6 @@ mrcp_global_init(); openmrcp_module.pool = mrcp_global_pool_get(); - openmrcp_module.asr_profile = NULL; - openmrcp_module.tts_profile = NULL; - switch_core_hash_init(&openmrcp_module.profile_hash, openmrcp_module.pool); /* read config */ @@ -902,43 +901,30 @@ return SWITCH_STATUS_FALSE; } - /* run default asr/tts profiles */ - if(openmrcp_module.asr_profile) { - openmrcp_profile_run(openmrcp_module.asr_profile); - } - if(openmrcp_module.tts_profile && openmrcp_module.tts_profile != openmrcp_module.asr_profile) { - openmrcp_profile_run(openmrcp_module.tts_profile); - } - return SWITCH_STATUS_SUCCESS; } static switch_status_t openmrcp_destroy() { /* destroy asr/tts profiles */ - if(openmrcp_module.asr_profile) { - /* shutdown client engine */ - openmrcp_client_shutdown(openmrcp_module.asr_profile->mrcp_client); - /* destroy client context */ - mrcp_client_context_destroy(openmrcp_module.asr_profile->mrcp_context); - if(openmrcp_module.tts_profile == openmrcp_module.asr_profile) { - openmrcp_module.tts_profile = NULL; - } - openmrcp_module.asr_profile = NULL; - } - if(openmrcp_module.tts_profile) { + switch_hash_index_t *hi; + void *val; + openmrcp_profile_t *mrcp_profile; + + for (hi = switch_hash_first(NULL, openmrcp_module.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + mrcp_profile = (openmrcp_profile_t *) val; /* shutdown client engine */ - openmrcp_client_shutdown(openmrcp_module.tts_profile->mrcp_client); + openmrcp_client_shutdown(mrcp_profile->mrcp_client); /* destroy client context */ - mrcp_client_context_destroy(openmrcp_module.tts_profile->mrcp_context); - openmrcp_module.tts_profile = NULL; + mrcp_client_context_destroy(mrcp_profile->mrcp_context); } - switch_core_hash_destroy(&openmrcp_module.profile_hash); openmrcp_module.profile_hash = NULL; /* one-time mrcp global destroy */ mrcp_global_destroy(); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_core_asr.c ============================================================================== --- freeswitch/trunk/src/switch_core_asr.c (original) +++ freeswitch/trunk/src/switch_core_asr.c Sat Oct 20 13:42:35 2007 @@ -39,6 +39,16 @@ char *codec, int rate, char *dest, switch_asr_flag_t *flags, switch_memory_pool_t *pool) { switch_status_t status; + char buf[256] = ""; + char *param = NULL; + + if (strchr(module_name, ':')) { + switch_set_string(buf, module_name); + if ((param = strchr(buf, ':'))) { + *param++ = '\0'; + module_name = buf; + } + } assert(ah != NULL); @@ -58,6 +68,9 @@ switch_set_flag(ah, SWITCH_ASR_FLAG_FREE_POOL); } + if (param) { + ah->param = switch_core_strdup(ah->memory_pool, param); + } ah->rate = rate; ah->name = switch_core_strdup(ah->memory_pool, module_name); Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Sat Oct 20 13:42:35 2007 @@ -44,13 +44,23 @@ switch_memory_pool_t *pool) { switch_status_t status; + char buf[256] = ""; + char *param = NULL; + + if (strchr(module_name, ':')) { + switch_set_string(buf, module_name); + if ((param = strchr(buf, ':'))) { + *param++ = '\0'; + module_name = buf; + } + } + if ((sh->speech_interface = switch_loadable_module_get_speech_interface(module_name)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speech module [%s]!\n", module_name); return SWITCH_STATUS_GENERR; } - switch_copy_string(sh->engine, module_name, sizeof(sh->engine)); sh->flags = *flags; if (pool) { sh->memory_pool = pool; @@ -60,6 +70,13 @@ } switch_set_flag(sh, SWITCH_SPEECH_FLAG_FREE_POOL); } + + sh->engine = switch_core_strdup(sh->memory_pool, module_name); + if (param) { + sh->param = switch_core_strdup(sh->memory_pool, param); + } + + sh->rate = rate; sh->name = switch_core_strdup(pool, module_name); sh->samples = switch_bytes_per_frame(rate, interval);

1 0

[commit] r6011 - freeswitch/trunk/src
by Freeswitch SVN 20 Oct '07

20 Oct '07

Author: mikej Date: Sat Oct 20 02:46:16 2007 New Revision: 6011 Modified: freeswitch/trunk/src/switch.c Log: Make script_dir setting on command line FSCORE-48 cleanup the usage string Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Oct 20 02:46:16 2007 @@ -221,28 +221,24 @@ {SERVICENAME, &service_main}, {NULL, NULL} }; +#endif usageDesc = "these are the optional arguments you can pass to freeswitch\n" +#ifdef WIN32 "\t-service -- start freeswitch as a service, cannot be used if loaded as a console app\n" "\t-install -- install freeswitch as a service\n" "\t-uninstall -- remove freeswitch as a service\n" - "\t-hp -- enable high priority settings\n" - "\t-nosql -- disable internal sql scoreboard\n" - "\t-stop -- stop freeswitch\n" - "\t-nc -- do not output to a console and background\n" - "\t-conf [confdir] -- specify an alternate config dir\n" - "\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n"; #else - usageDesc = "these are the optional arguments you can pass to freeswitch\n" - "\t-help -- this message\n" "\t-nf -- no forking\n" +#endif + "\t-help -- this message\n" "\t-hp -- enable high priority settings\n" "\t-nosql -- disable internal sql scoreboard\n" "\t-stop -- stop freeswitch\n" "\t-nc -- do not output to a console and background\n" "\t-conf [confdir] -- specify an alternate config dir\n" - "\t-log [logdir] -- specify an alternate log dir\n" "\t-db [dbdir] -- specify an alternate db dir\n"; - -#endif + "\t-log [logdir] -- specify an alternate log dir\n" + "\t-db [dbdir] -- specify an alternate db dir\n" + "\t-scripts [scriptsdir] -- specify an alternate scripts dir\n"; for (x = 1; x < argc; x++) { known_opt = 0; @@ -350,7 +346,19 @@ known_opt++; } - if ((!known_opt || argv[x]) && !strcmp(argv[x], "-help")) { + if (argv[x] && !strcmp(argv[x], "-scripts")) { + x++; + if (argv[x] && strlen(argv[x])) { + SWITCH_GLOBAL_dirs.script_dir = (char *) malloc(strlen(argv[x]) + 1); + strcpy(SWITCH_GLOBAL_dirs.script_dir, argv[x]); + } else { + fprintf(stderr, "When using -scripts you must specify a scripts directory\n"); + return 255; + } + known_opt++; + } + + if ((!known_opt || argv[x]) && (!strcmp(argv[x], "-help") || !strcmp(argv[x], "-h") || !strcmp(argv[x], "-?"))) { printf("%s\n", usageDesc); exit(0); } @@ -362,7 +370,7 @@ } if (alt_dirs && alt_dirs != 3) { - fprintf(stderr, "You must use -conf, -log, and -db together\n"); + fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n"); return 255; }

1 0

[commit] r6010 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 20 Oct '07

20 Oct '07

Author: mikej Date: Sat Oct 20 02:01:41 2007 New Revision: 6010 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix segfaults on bad api command usage MODAPP-34 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sat Oct 20 02:01:41 2007 @@ -333,6 +333,11 @@ time_t to = 0; switch_core_session_t *rsession; + if (!cmd) { + stream->write_function(stream, "USAGE: %s\n", TONE_DETECT_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + mydata = strdup(cmd); assert(mydata != NULL); @@ -989,6 +994,11 @@ SWITCH_STANDARD_API(sched_del_function) { uint32_t cnt = 0; + + if (!cmd) { + stream->write_function(stream, "Invalid syntax\n"); + return SWITCH_STATUS_SUCCESS; + } if (switch_is_digit_string(cmd)) { int64_t tmp; @@ -1010,6 +1020,11 @@ char *dcommand, *edata = NULL, *send = NULL, *command, *arg = NULL; switch_stream_handle_t mystream = { 0 }; int encoded = 0, elen = 0; + + if (!cmd) { + stream->write_function(stream, "Invalid syntax\n"); + return SWITCH_STATUS_SUCCESS; + } if ((dcommand = strdup(cmd))) { if (!strncasecmp(dcommand, "encoded ", 8)) { @@ -1059,7 +1074,10 @@ char *tm = NULL, *dcmd, *group; time_t when; - assert(cmd != NULL); + if (!cmd) { + stream->write_function(stream, "Invalid syntax\n"); + return SWITCH_STATUS_SUCCESS; + } tm = strdup(cmd); assert(tm != NULL);

1 0

[commit] r6009 - in freeswitch/trunk: conf docs/phrase
by Freeswitch SVN 20 Oct '07

20 Oct '07

Author: brian Date: Fri Oct 19 21:47:29 2007 New Revision: 6009 Modified: freeswitch/trunk/conf/voicemail_en.xml freeswitch/trunk/docs/phrase/phrase_en.xml Log: update voicemail_en.xml Modified: freeswitch/trunk/conf/voicemail_en.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en.xml (original) +++ freeswitch/trunk/conf/voicemail_en.xml Fri Oct 19 21:47:29 2007 @@ -158,8 +158,12 @@ <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$3" method="pronounced" type="items"/> <action function="play-file" data="voicemail/vm-delete_recording.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$4" method="pronounced" type="items"/> <action function="play-file" data="voicemail/vm-forward_to_email.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> + <action function="say" data="$4" method="pronounced" type="items"/> + <action function="play-file" data="voicemail/vm-return_call.wav"/> </match> </input> </macro> Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Fri Oct 19 21:47:29 2007 @@ -210,6 +210,7 @@ <prompt phrase="message number" filename="vm-message_number.wav"/> <prompt phrase="deleted" filename="vm-deleted.wav"/> <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> + <prompt phrase="to return the call now" filename="vm-return_call.wav"/> </voicemail> </en> </language>

1 0