- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6293 - in freeswitch/trunk: conf/directory conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 17:45:15 2007 New Revision: 6293 Modified: freeswitch/trunk/conf/directory/default.xml freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add from-user param to gateways Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Thu Nov 15 17:45:15 2007 @@ -18,6 +18,8 @@    +  +     Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Thu Nov 15 17:45:15 2007 @@ -10,6 +10,8 @@    +  +     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 Thu Nov 15 17:45:15 2007 @@ -561,6 +561,7 @@ *context = "default", *expire_seconds = "3600", *retry_seconds = "30", + *from_user = "", *from_domain = "", *register_proxy = NULL, *contact_params = NULL, @@ -599,6 +600,8 @@ expire_seconds = val; } else if (!strcmp(var, "retry-seconds")) { retry_seconds = val; + } else if (!strcmp(var, "from-user")) { + from_user = val; } else if (!strcmp(var, "from-domain")) { from_domain = val; } else if (!strcmp(var, "register-proxy")) { @@ -629,6 +632,10 @@ goto skip; } + if (switch_strlen_zero(from_user)) { + from_user = username; + } + if (switch_strlen_zero(extension)) { extension = username; } @@ -672,9 +679,9 @@ params = switch_core_sprintf(gateway->pool, ";transport=%s", register_transport); } - + gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", register_proxy,register_transport); - gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", username, from_domain, register_transport); + gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); gateway->register_contact = switch_core_sprintf(gateway->pool, "<sip:%s@%s:%d%s>", extension, profile->extsipip ? profile->extsipip : profile->sipip, profile->sip_port, params);

1 0

[commit] r6292 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 17:27:33 2007 New Revision: 6292 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Log: double trouble Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Thu Nov 15 17:27:33 2007 @@ -130,7 +130,7 @@ } } -#define teletone_goertzel_result(gs) (float)(((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac)) +#define teletone_goertzel_result(gs) (double)(((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac)) void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate) {

1 0

[commit] r6291 - freeswitch/trunk
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Thu Nov 15 16:28:26 2007 New Revision: 6291 Modified: freeswitch/trunk/configure.in Log: core builds with --enable-64 on suncc now Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Nov 15 16:28:26 2007 @@ -138,6 +138,8 @@ APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) if test "${enable_64}" = "yes"; then APR_ADDTO(SWITCH_AM_CFLAGS, -m64) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -m64) + APR_ADDTO(SWITCH_AM_LDFLAGS, -m64) fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)

1 0

[commit] r6290 - freeswitch/trunk/src
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: anthm Date: Thu Nov 15 16:13:49 2007 New Revision: 6290 Modified: freeswitch/trunk/src/switch_xml.cpp Log: tweak Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Thu Nov 15 16:13:49 2007 @@ -1018,7 +1018,10 @@ } } - if ((tcmd = (char *)switch_stristr("<X-pre-process", bp))) { + if ((tcmd = (char *)switch_stristr("X-pre-process", bp))) { + if (*(tcmd-1) != '<') { + continue; + } if ((e = strstr(tcmd, "/>"))) { *e += 2; *e = '\0';

1 0

[commit] r6289 - freeswitch/trunk/src/include
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Thu Nov 15 16:08:58 2007 New Revision: 6289 Modified: freeswitch/trunk/src/include/SimpleGlob.h Log: GLOB_TILDE is not allways supported Modified: freeswitch/trunk/src/include/SimpleGlob.h ============================================================================== --- freeswitch/trunk/src/include/SimpleGlob.h (original) +++ freeswitch/trunk/src/include/SimpleGlob.h Thu Nov 15 16:08:58 2007 @@ -366,7 +366,9 @@ int FindFirstFileS(const char * a_pszFileSpec, unsigned int a_uiFlags) { int nFlags = GLOB_MARK | GLOB_NOSORT; if (a_uiFlags & SG_GLOB_ERR) nFlags |= GLOB_ERR; +#ifdef GLOB_TILDE if (a_uiFlags & SG_GLOB_TILDE) nFlags |= GLOB_TILDE; +#endif int rc = glob(a_pszFileSpec, nFlags, NULL, &m_glob); if (rc == GLOB_NOSPACE) return SG_ERR_MEMORY; if (rc == GLOB_ABORTED) return SG_ERR_FAILURE;

1 0

[commit] r6288 - in freeswitch/trunk/libs: libresample pcre sqlite srtp
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Thu Nov 15 16:02:53 2007 New Revision: 6288 Modified: freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/pcre/configure.ac freeswitch/trunk/libs/sqlite/configure.ac freeswitch/trunk/libs/srtp/configure.in Log: --enable-64 for 64bit suncc build Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Thu Nov 15 16:02:53 2007 @@ -94,6 +94,17 @@ DYNAMIC_LIB_EXTEN="so" ;; esac + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK) Modified: freeswitch/trunk/libs/pcre/configure.ac ============================================================================== --- freeswitch/trunk/libs/pcre/configure.ac (original) +++ freeswitch/trunk/libs/pcre/configure.ac Thu Nov 15 16:02:53 2007 @@ -1,3 +1,4 @@ + dnl Process this file with autoconf to produce a configure script. dnl This configure.in file has been hacked around quite a lot as a result of @@ -86,6 +87,35 @@ BUILD_EXEEXT=${BUILD_EXEEXT:-'$(EXEEXT)'} BUILD_OBJEXT=${BUILD_OBJEXT:-'$(OBJEXT)'} +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + CFLAGS="$CFLAGS -m64" + CXXFLAGS="$CXXFLAGS -m64" + fi +fi + dnl Checks for header files. AC_HEADER_STDC Modified: freeswitch/trunk/libs/sqlite/configure.ac ============================================================================== --- freeswitch/trunk/libs/sqlite/configure.ac (original) +++ freeswitch/trunk/libs/sqlite/configure.ac Thu Nov 15 16:02:53 2007 @@ -180,6 +180,24 @@ . $hints fi +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) + +AX_COMPILER_VENDOR + ######### # Locate a compiler for the build machine. This compiler should # generate command-line programs that run on the build machine. @@ -213,6 +231,11 @@ AC_SUBST(BUILD_CFLAGS) AC_SUBST(BUILD_LIBS) + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + ########## # Locate a compiler that converts C code into *.o files that run on # the target machine. @@ -230,6 +253,11 @@ else TARGET_CFLAGS=$BUILD_CFLAGS fi +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + TARGET_CFLAGS="$TARGET_CFLAGS -m64" + fi +fi AC_MSG_RESULT($TARGET_CFLAGS) AC_MSG_CHECKING([target linker]) if test "$config_TARGET_LINK" = ""; then Modified: freeswitch/trunk/libs/srtp/configure.in ============================================================================== --- freeswitch/trunk/libs/srtp/configure.in (original) +++ freeswitch/trunk/libs/srtp/configure.in Thu Nov 15 16:02:53 2007 @@ -31,6 +31,7 @@ AX_CFLAGS_WARN_ALL_ANSI fi + AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) @@ -85,6 +86,17 @@ DYNAMIC_LIB_EXTEN="so" ;; esac + +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) + +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + new_AM_CFLAGS="$new_AM_CFLAGS -m64" + fi +fi + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) AC_SUBST(SOLINK)

1 0

[commit] r6287 - in freeswitch/trunk: . libs/apr libs/apr/build
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: mikej Date: Thu Nov 15 15:07:34 2007 New Revision: 6287 Added: freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 Modified: freeswitch/trunk/configure.in freeswitch/trunk/libs/apr/configure.in Log: start adding solaris suncc 64 bit support native in the build system Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Nov 15 15:07:34 2007 @@ -138,7 +138,6 @@ APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib) if test "${enable_64}" = "yes"; then APR_ADDTO(SWITCH_AM_CFLAGS, -m64) - APR_ADDTO(SWITCH_AM_LDFLAGS, -L/opt/csw/lib/amd64) fi elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) Added: freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4 Thu Nov 15 15:07:34 2007 @@ -0,0 +1,15 @@ +AC_DEFUN([AX_COMPILER_VENDOR], +[ +AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ +#if !($vencpp) + thisisanerror; +#endif +])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break]) + done + ]) +]) Modified: freeswitch/trunk/libs/apr/configure.in ============================================================================== --- freeswitch/trunk/libs/apr/configure.in (original) +++ freeswitch/trunk/libs/apr/configure.in Thu Nov 15 15:07:34 2007 @@ -116,6 +116,9 @@ dnl preload section from invoking the macro to get compiler info. AC_PROG_CC +#Check for compiler vendor +AX_COMPILER_VENDOR + dnl Preload APR_PRELOAD @@ -254,6 +257,18 @@ fi ])dnl +# Enable 64 bit build +AC_ARG_ENABLE(64, +[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) +# tweak compiler specific flags +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + APR_ADDTO(CFLAGS, -m64) + fi +fi + + + AC_ARG_ENABLE(maintainer-mode,[ --enable-maintainer-mode Turn on debugging and compile time warnings], [APR_ADDTO(CFLAGS,-g) if test "$GCC" = "yes"; then

1 0

[commit] r6286 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:48:03 2007 New Revision: 6286 Modified: freeswitch/trunk/conf/local_stream.conf.xml Log: no comment Modified: freeswitch/trunk/conf/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/local_stream.conf.xml Thu Nov 15 13:48:03 2007 @@ -1,5 +1,5 @@ <configuration name="local_stream.conf" description="stream files from local dir"> -<directory name="foo" path="/var/lib/asterisk/moh"> +<directory name="foo" path="/path/to/moh/files"> <param name="rate" value="8000"/> <param name="channels" value="1"/> <param name="interval" value="2"/>

1 0

[commit] r6285 - in freeswitch/trunk/src/mod: asr_tts/mod_openmrcp event_handlers/mod_cdr
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:44:02 2007 New Revision: 6285 Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.conf.xml Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Log: more cleanup 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 Thu Nov 15 13:44:02 2007 @@ -771,7 +771,7 @@ static switch_status_t do_config() { - char *cf = "mod_openmrcp.conf"; + char *cf = "openmrcp.conf"; switch_xml_t cfg, xml, settings, profiles, xprofile, param; openmrcp_profile_t *mrcp_profile; openmrcp_client_options_t *mrcp_options; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Nov 15 13:44:02 2007 @@ -48,7 +48,7 @@ queue_paused = 0; - strcpy(configfile,"mod_cdr.conf"); + strcpy(configfile,"cdr.conf"); switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; newchannel = 0;

1 0

[commit] r6284 - freeswitch/trunk/conf
by Freeswitch SVN 15 Nov '07

15 Nov '07

Author: brian Date: Thu Nov 15 13:43:49 2007 New Revision: 6284 Added: freeswitch/trunk/conf/cdr.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/local_stream.conf.xml - copied unchanged from r6282, /freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/openmrcp.conf.xml - copied unchanged from r6281, /freeswitch/trunk/conf/mod_openmrcp.conf.xml Removed: freeswitch/trunk/conf/mod_cdr.conf.xml freeswitch/trunk/conf/mod_local_stream.conf.xml freeswitch/trunk/conf/mod_openmrcp.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: cleanup Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Nov 15 13:43:49 2007 @@ -44,7 +44,7 @@   - <XX-PRE-PROCESS cmd="include" data="mod_cdr.conf.xml"/> + <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/> @@ -88,11 +88,11 @@   <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="mod_openmrcp.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/>   - <X-PRE-PROCESS cmd="include" data="mod_local_stream.conf.xml"/> + <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan">

1 0