- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7242 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 14:59:32 2008 New Revision: 7242 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Log: add menu demo using tts from Cherebrum Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Tue Jan 15 14:59:32 2008 @@ -24,6 +24,19 @@ <entry action="menu-back" digits="#"/> <entry action="menu-top" digits="*"/> </menu> + + <menu name="demo3" + greet-long="say:Press 1 to join the conference, Press 2 to join the other conference" + greet-short="say:Press 1 to join the conference, Press 2 to join the other conference" + invalid-sound="say:invalid extension" + exit-sound="say:exit sound" timeout ="15" + max-failures="3" + tts-voice="callie" tts-engine="cepstral"> + <entry action="menu-exit" digits="*"/> +  + <entry action="menu-call-transfer" digits="1" param="1000"/> + <entry action="menu-call-transfer" digits="2" param="1001"/> + </menu> <menu name="menu8" greet-long="/soundfiles/ivr/menu8/greet-long.wav"

1 0

[commit] r7241 - freeswitch/trunk/src
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 13:08:47 2008 New Revision: 7241 Modified: freeswitch/trunk/src/switch_core_speech.c Log: add error checking. Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Tue Jan 15 13:08:47 2008 @@ -47,6 +47,10 @@ char buf[256] = ""; char *param = NULL; + if (!sh || !flags || switch_strlen_zero(module_name)) { + return SWITCH_STATUS_FALSE; + } + if (strchr(module_name, ':')) { switch_set_string(buf, module_name); if ((param = strchr(buf, ':'))) {

1 0

[commit] r7240 - freeswitch/trunk
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: stkn Date: Tue Jan 15 12:17:41 2008 New Revision: 7240 Modified: freeswitch/trunk/Makefile.am Log: Install switch_config.h (config file parser) too Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Jan 15 12:17:41 2008 @@ -92,6 +92,7 @@ src/include/switch_scheduler.h\ src/include/switch_core.h\ src/include/switch_core_db.h\ +src/include/switch_config.h\ src/include/switch_event.h\ src/include/switch_frame.h\ src/include/switch_ivr.h\

1 0

[commit] r7239 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 11:41:00 2008 New Revision: 7239 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix spelling error. If you are using conference events over event socket, you will need to fix your code as well. 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 Tue Jan 15 11:41:00 2008 @@ -44,7 +44,7 @@ /* Size to allocate for audio buffers */ #define CONF_BUFFER_SIZE 1024 * 128 -#define CONF_EVENT_MAINT "conference::maintenence" +#define CONF_EVENT_MAINT "conference::maintenance" #define CONF_DEFAULT_LEADIN 20 #define CONF_DBLOCK_SIZE CONF_BUFFER_SIZE

1 0

[commit] r7238 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 11:30:48 2008 New Revision: 7238 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: fun Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Jan 15 11:30:48 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH/" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7237 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 11:30:16 2008 New Revision: 7237 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Jan 15 11:30:16 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/-mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7236 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 11:28:27 2008 New Revision: 7236 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: tweak Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Jan 15 11:28:27 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " " SWITCH_VERSION_REVISION "-mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO "/" SWITCH_VERSION_REVISION "/-mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7235 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Tue Jan 15 11:27:42 2008 New Revision: 7235 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Log: remove ( ) from default user agent. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Jan 15 11:27:42 2008 @@ -66,7 +66,7 @@ #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" #define SOFIA_REPLACES_HEADER "_sofia_replaces_" -#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_sofia" +#define SOFIA_USER_AGENT "FreeSWITCH-" SWITCH_VERSION_MAJOR "." SWITCH_VERSION_MINOR "." SWITCH_VERSION_MICRO " " SWITCH_VERSION_REVISION "-mod_sofia" #define SOFIA_CHAT_PROTO "sip" #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_"

1 0

[commit] r7234 - in freeswitch/trunk: . scripts
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: stkn Date: Tue Jan 15 09:53:05 2008 New Revision: 7234 Added: freeswitch/trunk/scripts/gentls_cert.in Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Log: Add gentls_cert script to create a CA and certificate for mod_sofia TLS Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Jan 15 09:53:05 2008 @@ -156,6 +156,7 @@ libfreeswitch_la_LDFLAGS += -lodbc endif +bin_SCRIPTS = scripts/gentls_cert libs/libedit/src/.libs/libedit.a: Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jan 15 09:53:05 2008 @@ -424,7 +424,8 @@ src/include/switch_am_config.h build/getsounds.sh build/getlib.sh - build/modmake.rules]) + build/modmake.rules + scripts/gentls_cert]) AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin]) Added: freeswitch/trunk/scripts/gentls_cert.in ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/gentls_cert.in Tue Jan 15 09:53:05 2008 @@ -0,0 +1,172 @@ +#!/bin/sh + +CONFDIR=@prefix@/conf/ssl +DAYS=365 + +TMPFILE="/tmp/fs-ca-$$-$(date +%Y%m%d%H%M%S)" + +COMMON_NAME="FreesSWITCH CA" +ALT_NAME="DNS:test.freeswitch.org" +ORG_NAME="FreeSWITCH" + +umask 037 + +setup_ca() { + echo "Creating new CA..." + + if [ ! -d "${CONFDIR}/CA" ]; then + mkdir -p -m 750 "${CONFDIR}/CA" || exit 1 + fi + + if [ ! -e "${CONFDIR}/CA/config.tpl" ]; then + cat > "${CONFDIR}/CA/config.tpl" <<-EOF + [ req ] + default_bits = 1024 + prompt = no + distinguished_name = req_dn + + [ req_dn ] + commonName = %CN% + organizationName = %ORG% + + [ ext ] + basicConstraints=CA:FALSE + subjectKeyIdentifier=hash + authorityKeyIdentifier=keyid,issuer:always + subjectAltName=%ALTNAME% + EOF + fi + + sed \ + -e "s|%CN%|$COMMON_NAME|" \ + -e "s|%ORG%|$ORG_NAME|" \ + -e "/%ALTNAME%/d" \ + -e "s|CA:FALSE|CA:TRUE|" \ + "${CONFDIR}/CA/config.tpl" \ + > "${TMPFILE}.cfg" || exit 1 + + openssl req -new -out "${CONFDIR}/CA/careq.pem" \ + -newkey rsa:1024 -keyout "${CONFDIR}/CA/cakey.pem" \ + -config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1 + + openssl x509 -req -signkey "${CONFDIR}/CA/cakey.pem" -in "${CONFDIR}/CA/careq.pem" \ + -out "${CONFDIR}/CA/cacert.pem" -extfile "${TMPFILE}.cfg" \ + -extensions ext -days ${DAYS} -sha1 >/dev/null || exit 1 + + rm "${TMPFILE}.cfg" + + echo "DONE" +} + +generate_cert() { + local val="" + + echo "Generating new certificate..." + + echo + echo "--------------------------------------------------------" + echo "CN: \"${COMMON_NAME}\"" + echo "ORG_NAME: \"${ORG_NAME}\"" + echo "ALT_NAME: \"${ALT_NAME}\"" + echo + echo "[Enter \"OK\" to accept]" + read val + if [ "${val}" != "OK" ]; then + return 2 + fi + + sed \ + -e "s|%CN%|$COMMON_NAME|" \ + -e "s|%ALTNAME%|$ALT_NAME|" \ + -e "s|%ORG%|$ORG_NAME|" \ + "${CONFDIR}/CA/config.tpl" \ + > "${TMPFILE}.cfg" || exit 1 + + openssl req -new -out "${TMPFILE}.req" \ + -newkey rsa:1024 -keyout "${TMPFILE}.key" \ + -config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1 + + openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \ + -in "${TMPFILE}.req" -out "${TMPFILE}.crt" -extfile "${TMPFILE}.cfg" \ + -extensions ext -days ${DAYS} -sha1 >/dev/null || exit 1 + + cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem" + cat "${TMPFILE}.crt" "${TMPFILE}.key" > "${CONFDIR}/agent.pem" + + rm "${TMPFILE}.cfg" "${TMPFILE}.crt" "${TMPFILE}.key" "${TMPFILE}.req" + + echo "DONE" +} + +remove_ca() { + echo "Cleaning CA" + + if [ ! -d "${CONFDIR}/CA" ]; then + rm "${CONFDIR}/CA/"* + rmdir "${CONFDIR}/CA" + fi + + echo "DONE" +} + +command="$1" +shift + +while [ $# -gt 0 ]; do + case $1 in + -cn) + shift + COMMON_NAME="$1" + ;; + -alt) + shift + ALT_NAME="$1" + ;; + -org) + shift + ORG_NAME="$1" + ;; + esac + shift +done + + +case ${command} in + setup) + setup_ca + ;; + + create) + generate_cert + ;; + + remove) + echo "Are you sure you want to delete the CA? [YES to delete]" + read val + if [ "${val}" = "YES" ]; then + remove_ca + else + echo "Not deleting CA" + fi + ;; + + *) + cat <<-EOF + $0 <setup|create|clean> [options] + + * commands: + + setup - Setup new CA + create - Create new certificate (overwriting old!) + remove - Remove CA + + * options: + + -cn Set common name + -alt Set alternative name (use prefix 'DNS:' or 'URI:') + -org Set organization name + + EOF + exit 1 + ;; +esac

1 0

[commit] r7233 - freeswitch/trunk/src
by Freeswitch SVN 15 Jan '08

15 Jan '08

Author: mikej Date: Mon Jan 14 22:28:09 2008 New Revision: 7233 Modified: freeswitch/trunk/src/switch_utils.c Log: null is not a lan address Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Jan 14 22:28:09 2008 @@ -356,7 +356,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip) { - + if (switch_strlen_zero(ip)) return SWITCH_FALSE; return ( strncmp(ip, "10.", 3) &&

1 0