- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9321 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 19 Aug '08

19 Aug '08

Author: anthm Date: Tue Aug 19 10:52:44 2008 New Revision: 9321 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: enable https on mod_xml_cdr Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Tue Aug 19 10:52:44 2008 @@ -141,6 +141,11 @@ headers = curl_slist_append(headers, "Content-Type: application/x-www-form-plaintext"); } + if (!strncasecmp(globals.url, "https", 5)) { + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); + } + if (!(curl_xml_text = switch_mprintf("cdr=%s", xml_text))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); goto error;

1 0

[commit] r9320 - freeswitch/trunk/docs
by Freeswitch SVN 18 Aug '08

18 Aug '08

Author: brian Date: Mon Aug 18 17:33:39 2008 New Revision: 9320 Modified: freeswitch/trunk/docs/AUTHORS Log: update AUTHORS Modified: freeswitch/trunk/docs/AUTHORS ============================================================================== --- freeswitch/trunk/docs/AUTHORS (original) +++ freeswitch/trunk/docs/AUTHORS Mon Aug 18 17:33:39 2008 @@ -36,6 +36,7 @@ Damjan Jovanovic <moctodliamgtavojtodnajmad backwards> - mod_java Juan Jose Comellas <juanjo(a)comellas.org> - Patch to switch_utils for arg parsing. Dale Thatcher <freeswitch at dalethatcher dot com> - Additions to mod_conference. + Simon Perreault & Marc Blanchet from Viagenie.ca - IPv6 Support. A big THANK YOU goes to:

1 0

[commit] r9319 - freeswitch/trunk/libs/libresample
by Freeswitch SVN 18 Aug '08

18 Aug '08

Author: brian Date: Mon Aug 18 12:53:31 2008 New Revision: 9319 Modified: freeswitch/trunk/libs/libresample/Makefile.am freeswitch/trunk/libs/libresample/configure.in Log: don't build the tests that use libsndfile and libsamplerate (FSBUILD-67) Modified: freeswitch/trunk/libs/libresample/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libresample/Makefile.am (original) +++ freeswitch/trunk/libs/libresample/Makefile.am Mon Aug 18 12:53:31 2008 @@ -20,16 +20,16 @@ testresample_CFLAGS = $(AM_CFLAGS) testresample_LDADD = ${top_builddir}/libresample.la -if SAMPLE -bin_PROGRAMS += compareresample -compareresample_SOURCES = tests/compareresample.c -compareresample_CFLAGS = $(AM_CFLAGS) -compareresample_LDADD = ${top_builddir}/libresample.la -lsamplerate -endif +#if SAMPLE +#bin_PROGRAMS += compareresample +#compareresample_SOURCES = tests/compareresample.c +#compareresample_CFLAGS = $(AM_CFLAGS) +#compareresample_LDADD = ${top_builddir}/libresample.la -lsamplerate +#endif -if SNDFILE -bin_PROGRAMS += resample_sndfile -resample_sndfile_SOURCES = tests/resample-sndfile.c -resample_sndfile_CFLAGS = $(AM_CFLAGS) -resample_sndfile_LDADD = ${top_builddir}/libresample.la -lsndfile -endif +#if SNDFILE +#bin_PROGRAMS += resample_sndfile +#resample_sndfile_SOURCES = tests/resample-sndfile.c +#resample_sndfile_CFLAGS = $(AM_CFLAGS) +#resample_sndfile_LDADD = ${top_builddir}/libresample.la -lsndfile +#endif Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Mon Aug 18 12:53:31 2008 @@ -128,13 +128,13 @@ AC_DEFINE_UNQUOTED([__FUNCTION__],[$FUNC_DEF],[define it the right way ;)]) AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[sunpro is bad at inline]) -AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no) +#AC_CHECK_LIB(sndfile, sf_open, have_libsndfile=yes, have_libsndfile=no) -AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no) +#AC_CHECK_LIB(samplerate, src_simple, have_libsamplerate=yes, have_libsamplerate=no) -AM_CONDITIONAL([SAMPLE], [test $have_libsamplerate = "yes"]) -AM_CONDITIONAL([SNDFILE],[test $have_libsndfile = "yes"]) +#AM_CONDITIONAL([SAMPLE], [test $have_libsamplerate = "yes"]) +#AM_CONDITIONAL([SNDFILE],[test $have_libsndfile = "yes"]) AC_CHECK_HEADERS(inttypes.h) @@ -144,24 +144,24 @@ echo "" -if [[ $have_libsamplerate = "yes" ]] ; then - echo "Configured to build tests/resample-sndfile using libsndfile" - echo "" -else - echo "Could not find libsndfile - needed if you want to" - echo "compile tests/resample-sndfile" - echo "" -fi - -if [[ $have_libsamplerate = "yes" ]] ; then - echo "Configured to build tests/compareresample to compare against" - echo "Erik de Castro Lopo's libsamplerate library." - echo "" -else - echo "Could not find libsamplerate - only needed if you want to" - echo "compile tests/compareresample to compare their performance." - echo "" -fi +#if [[ $have_libsamplerate = "yes" ]] ; then +# echo "Configured to build tests/resample-sndfile using libsndfile" +# echo "" +#else +# echo "Could not find libsndfile - needed if you want to" +# echo "compile tests/resample-sndfile" +# echo "" +#fi + +#if [[ $have_libsamplerate = "yes" ]] ; then +# echo "Configured to build tests/compareresample to compare against" +# echo "Erik de Castro Lopo's libsamplerate library." +# echo "" +#else +# echo "Could not find libsamplerate - only needed if you want to" +# echo "compile tests/compareresample to compare their performance." +# echo "" +#fi echo "Type 'configure --help' to see options." echo ""

1 0

[commit] r9318 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 18 Aug '08

18 Aug '08

Author: robertj Date: Mon Aug 18 08:23:56 2008 New Revision: 9318 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Log: Fixed compiler warning ... potential uninitialised variable. Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Mon Aug 18 08:23:56 2008 @@ -260,7 +260,7 @@ static JSBool odbc_num_rows(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { odbc_obj_t *odbc_obj = (odbc_obj_t *) JS_GetPrivate(cx, obj); - SQLLEN row_count; + SQLLEN row_count = 0; if (!odbc_obj || switch_odbc_handle_get_state(odbc_obj->handle) != SWITCH_ODBC_STATE_CONNECTED) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database is not connected!\n");

1 0

[commit] r9317 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 18 Aug '08

18 Aug '08

Author: brian Date: Sun Aug 17 20:44:10 2008 New Revision: 9317 Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml Log: doh Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Sun Aug 17 20:44:10 2008 @@ -25,7 +25,7 @@   <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> -  +  <param name="manage-presence" value="true"/>   Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Sun Aug 17 20:44:10 2008 @@ -43,7 +43,7 @@   <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> -  +  <param name="manage-presence" value="true"/>

1 0

[commit] r9316 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 17 Aug '08

17 Aug '08

Author: brian Date: Sun Aug 17 19:23:02 2008 New Revision: 9316 Added: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml - copied unchanged from r9314, /freeswitch/trunk/conf/sip_profiles/internal-ipv6.noload Removed: freeswitch/trunk/conf/sip_profiles/internal-ipv6.noload Log: lets autoload this

1 0

[commit] r9315 - freeswitch/trunk/src
by Freeswitch SVN 17 Aug '08

17 Aug '08

Author: robertj Date: Sun Aug 17 19:08:10 2008 New Revision: 9315 Modified: freeswitch/trunk/src/switch_xml.c Log: Fixed infinite loop caused by 64 bit cleansing change (int to size_t means signed to unsigned) Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sun Aug 17 19:08:10 2008 @@ -2551,7 +2551,7 @@ size_t newsize, len; const char *p; - if (*limit && pglob->gl_pathc > (unsigned int)(*limit)) { + if (*limit && pglob->gl_pathc > *limit) { errno = 0; return (GLOB_NOSPACE); } @@ -2571,7 +2571,7 @@ if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { /* first time around -- clear initial gl_offs items */ pathv += pglob->gl_offs; - for (i = pglob->gl_offs; --i >= 0; ) + for (i = pglob->gl_offs; i-- > 0; ) *--pathv = NULL; } pglob->gl_pathv = pathv;

1 0

[commit] r9314 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 17 Aug '08

17 Aug '08

Author: brian Date: Sun Aug 17 19:01:56 2008 New Revision: 9314 Added: freeswitch/trunk/conf/sip_profiles/internal-ipv6.noload Log: example ipv6 enabled profile called internal-ipv6 Added: freeswitch/trunk/conf/sip_profiles/internal-ipv6.noload ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.noload Sun Aug 17 19:01:56 2008 @@ -0,0 +1,114 @@ + +<profile name="internal-ipv6"> +  + <settings> +  + <param name="debug" value="0"/> + <param name="sip-trace" value="no"/> + <param name="context" value="public"/> + <param name="rfc2833-pt" value="101"/> +  + <param name="sip-port" value="5060"/> + <param name="dialplan" value="XML"/> + <param name="dtmf-duration" value="100"/> + <param name="codec-prefs" value="$${global_codec_prefs}"/> + <param name="use-rtp-timer" value="true"/> + <param name="rtp-timer-name" value="soft"/> +  + <param name="rtp-ip" value="$${local_ip_v6}"/> +  + <param name="sip-ip" value="$${local_ip_v6}"/> + <param name="hold-music" value="$${hold_music}"/> +  +  + <param name="apply-inbound-acl" value="domains"/> +  +  + <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> +  + <param name="manage-presence" value="true"/> +  +  +  +  +  +  +  +  + <param name="inbound-codec-negotiation" value="generous"/> +  +  +  + +  + <param name="tls" value="false"/> +  + <param name="tls-bind-params" value="transport=tls"/> +  + <param name="tls-sip-port" value="5061"/> +  + <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/> +  + <param name="tls-version" value="tlsv1"/> + +  +  +  +  +  + +  +  + +  +  + +  +  + +  +  +  + +  +  + +  +  + +  + <param name="nonce-ttl" value="60"/> +  +  +  +  +  +  + <param name="auth-calls" value="true"/> +  + <param name="auth-all-packets" value="false"/> +  +  +  + <param name="rtp-timeout-sec" value="300"/> + <param name="rtp-hold-timeout-sec" value="1800"/> +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + </settings> +</profile> +

1 0

[commit] r9313 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Aug '08

17 Aug '08

Author: brian Date: Sun Aug 17 15:43:50 2008 New Revision: 9313 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: MODENDP-125 to select the proper AF on a profile based on sipip 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 Aug 17 15:43:50 2008 @@ -540,6 +540,8 @@ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->bindurl), + TAG_IF(!strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP4_ONLY)), + TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)),

1 0

[commit] r9312 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 16 Aug '08

16 Aug '08

Author: anthm Date: Sat Aug 16 11:57:07 2008 New Revision: 9312 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: fail call on extensions with nested conditions Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Sat Aug 16 11:57:07 2008 @@ -64,6 +64,12 @@ switch_safe_free(field_expanded); switch_safe_free(expression_expanded); + if (switch_xml_child(xcond, "condition")) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Nested conditions are not allowed!\n"); + proceed = 1; + goto done; + } + field = (char *) switch_xml_attr(xcond, "field"); if ((xexpression = switch_xml_child(xcond, "expression"))) {

1 0