February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11750 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 05:41:28 2009 New Revision: 11750 Log: remove openmrcp from modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Feb 11 05:41:28 2009 @@ -91,7 +91,6 @@    -

1 0

[commit] r11749 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 00:14:53 2009 New Revision: 11749 Log: here try this out Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Feb 11 00:14:53 2009 @@ -217,7 +217,6 @@ <action application="export" data="dialed_extension=$1"/> </condition> <condition field="${sip_authorized}" expression="^true"> - <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default ${domain_name} ${dialed_extension}"/>

1 0

[commit] r11748 - in freeswitch/trunk: . libs/libedit
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Wed Feb 11 00:07:46 2009 New Revision: 11748 Log: Adding more output as example. Added libedit cmake Added: freeswitch/trunk/libs/libedit/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Wed Feb 11 00:07:46 2009 @@ -1,5 +1,5 @@ # FREESWITCH CMAKE BUILD -# SHANE BURRELL 2008 (supjigator) +# Created by SHANE BURRELL 2009 (supjigator) PROJECT (freeswitch) @@ -70,6 +70,42 @@ check_include_file(pthread.h HAVE_PTHREAD_H) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) +# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1" +MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} ) +# the short system name, e.g. "Linux", "FreeBSD" or "Windows" +MESSAGE( STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME} ) +# only the version part of CMAKE_SYSTEM +MESSAGE( STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION} ) +# the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz") +MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} ) +# is TRUE on all UNIX-like OS's, including Apple OS X and CygWin +MESSAGE( STATUS "UNIX: " ${UNIX} ) +# is TRUE on Windows, including CygWin +MESSAGE( STATUS "WIN32: " ${WIN32} ) +# is TRUE on Apple OS X +MESSAGE( STATUS "APPLE: " ${APPLE} ) +# is TRUE when using the MinGW compiler in Windows +MESSAGE( STATUS "MINGW: " ${MINGW} ) +# is TRUE on Windows when using the CygWin version of cmake +MESSAGE( STATUS "CYGWIN: " ${CYGWIN} ) +# is TRUE on Windows when using a Borland compiler +MESSAGE( STATUS "BORLAND: " ${BORLAND} ) +# Microsoft compiler +MESSAGE( STATUS "MSVC: " ${MSVC} ) +MESSAGE( STATUS "MSVC_IDE: " ${MSVC_IDE} ) +MESSAGE( STATUS "MSVC60: " ${MSVC60} ) +MESSAGE( STATUS "MSVC70: " ${MSVC70} ) +MESSAGE( STATUS "MSVC71: " ${MSVC71} ) +MESSAGE( STATUS "MSVC80: " ${MSVC80} ) +MESSAGE( STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005} ) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) + +# DO THREADS FIND_PACKAGE(Threads) @@ -92,9 +128,9 @@ INCLUDE_DIRECTORIES (${SNDFILE_INCLUDE_DIR}) # DO LIBEDIT -FIND_PACKAGE (Libedit) -LINK_LIBRARIES (${PATH_LIB_EDIT}) -INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) +#FIND_PACKAGE (Libedit) +#LINK_LIBRARIES (${PATH_LIB_EDIT}) +#INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) # DO SRTP LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libcryptomath.a) @@ -130,13 +166,13 @@ #ADD_SUBDIRECTORY(libs/sqlite/) ADD_SUBDIRECTORY(libs/pcre/) ADD_SUBDIRECTORY(libs/stfu/) -#ADD_SUBDIRECTORY(libs/libedit/) +ADD_SUBDIRECTORY(libs/libedit/) ADD_SUBDIRECTORY(libs/srtp/) SET ( freeswitch_SRCS src/switch.c src/include/switch.h) ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) -TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample switch_ivr switch_ivr_async switch_core switch_core_asr switch_channel switch_core_io switch_apr switch_utils switch_xml switch_buffer switch_caller switch_buffer switch_config switch_console switch_core_codec switch_core_db switch_core_directory switch_core_event_hook switch_core_file switch_core_hash switch_core_media_bug switch_core_memory switch_core_port_allocator switch_core_rwlock switch_core_session switch_core_speech switch_core_sqldb switch_core_state_machine switch_core_timer switch_dso switch_event switch_ivr_async switch_ivr_bridge switch_ivr_menu switch_ivr_originate switch_ivr_play_say switch_loadable_module switch_log switch_odbc switch_pcm switch_regex switch_resample switch_rtp switch_scheduler switch_stun switch_swig switch_time stfu ${optionalLibs}) +TARGET_LINK_LIBRARIES(freeswitch libedit teletone pcre resample switch_ivr switch_ivr_async switch_core switch_core_asr switch_channel switch_core_io switch_apr switch_utils switch_xml switch_buffer switch_caller switch_buffer switch_config switch_console switch_core_codec switch_core_db switch_core_directory switch_core_event_hook switch_core_file switch_core_hash switch_core_media_bug switch_core_memory switch_core_port_allocator switch_core_rwlock switch_core_session switch_core_speech switch_core_sqldb switch_core_state_machine switch_core_timer switch_dso switch_event switch_ivr_async switch_ivr_bridge switch_ivr_menu switch_ivr_originate switch_ivr_play_say switch_loadable_module switch_log switch_odbc switch_pcm switch_regex switch_resample switch_rtp switch_scheduler switch_stun switch_swig switch_time stfu ${optionalLibs}) Added: freeswitch/trunk/libs/libedit/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libedit/CMakeLists.txt Wed Feb 11 00:07:46 2009 @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/ ./ src/) + +SET ( libedit_SRCS src/filecomplete.c src/key.c src/parse.h src/refresh.c src/sig.h src/tty.c src/el.c src/filecomplete.h src/key.h src/prompt.c src/refresh.h src/strlcat.c src/tty.h src/el.h src/hist.c src/prompt.h src/search.c src/strlcpy.c src/unvis.c src/chared.c src/el_term.h src/hist.h src/map.c src/read.c src/search.h src/sys.h src/vi.c src/chared.h src/emacs.c src/histedit.h src/map.h src/read.h src/term.c src/vis.c src/common.c src/fgetln.c src/history.c src/parse.c src/readline.c src/sig.c src/tokenizer.c src/vis.h) + +ADD_LIBRARY(libedit STATIC ${libedit_SRCS}) + + + + + + +

1 0

[commit] r11747 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Tue Feb 10 23:07:56 2009 New Revision: 11747 Log: this makes more sense Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Feb 10 23:07:56 2009 @@ -216,7 +216,7 @@ <action application="set" data="dialed_extension=$1"/> <action application="export" data="dialed_extension=$1"/> </condition> - <condition field="destination_number" expression="^${caller_id_number}$"> + <condition field="${sip_authorized}" expression="^true"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/>

1 0

[commit] r11746 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: rupa Date: Tue Feb 10 23:07:37 2009 New Revision: 11746 Log: add API lcr_admin show profiles Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Feb 10 23:07:37 2009 @@ -35,6 +35,7 @@ #define LCR_SYNTAX "lcr <digits> [<lcr profile>]" +#define LCR_ADMIN_SYNTAX "lcr_admin show profiles" /* SQL Query places */ #define LCR_DIGITS_PLACE 0 @@ -795,9 +796,55 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(dialplan_lcr_admin_function) +{ + char *argv[4] = { 0 }; + int argc; + char *mydata = NULL; + switch_hash_index_t *hi; + void *val; + profile_t *profile; + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + mydata = strdup(cmd); + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if(argc < 2) { + goto usage; + } + if(!strcasecmp(argv[0], "show") && !strcasecmp(argv[1], "profiles")) { + for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + profile = (profile_t *) val; + + stream->write_function(stream, "Name:\t\t%s\n", profile->name); + stream->write_function(stream, "ID:\t\t%d\n", profile->id); + stream->write_function(stream, "order by:\t%s\n", profile->order_by); + if(!switch_strlen_zero(profile->custom_sql)) { + stream->write_function(stream, "custom sql:\t%s\n", profile->custom_sql); + } + stream->write_function(stream, "\n"); + } + } else { + goto usage; + } + } + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; +usage: + switch_safe_free(mydata); + stream->write_function(stream, "-ERR %s\n", LCR_ADMIN_SYNTAX); + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { switch_api_interface_t *dialplan_lcr_api_interface; + switch_api_interface_t *dialplan_lcr_api_admin_interface; switch_application_interface_t *app_interface; switch_dialplan_interface_t *dp_interface; @@ -830,6 +877,7 @@ }; SWITCH_ADD_API(dialplan_lcr_api_interface, "lcr", "Least Cost Routing Module", dialplan_lcr_function, LCR_SYNTAX); + SWITCH_ADD_API(dialplan_lcr_api_admin_interface, "lcr_admin", "Least Cost Routing Module Admin", dialplan_lcr_admin_function, LCR_ADMIN_SYNTAX); SWITCH_ADD_APP(app_interface, "lcr", "Perform an LCR lookup", "Perform an LCR lookup", lcr_app_function, "<number>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_DIALPLAN(dp_interface, "lcr", lcr_dialplan_hunt);

1 0

[commit] r11745 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: rupa Date: Tue Feb 10 20:55:17 2009 New Revision: 11745 Log: initialize retval Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Feb 10 20:55:17 2009 @@ -241,7 +241,7 @@ { char * tsql; tsql = switch_mprintf(sql, "5555551212"); - switch_bool_t retval; + switch_bool_t retval = SWITCH_FALSE; if (globals.odbc_dsn) { if(switch_odbc_handle_exec(globals.master_odbc, tsql, NULL)

1 0

[commit] r11744 - freeswitch/trunk/cmake_modules
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Tue Feb 10 20:53:31 2009 New Revision: 11744 Log: Initial CMAKE file commit Added: freeswitch/trunk/cmake_modules/ freeswitch/trunk/cmake_modules/FindAPR.cmake freeswitch/trunk/cmake_modules/FindAPRUtil.cmake freeswitch/trunk/cmake_modules/FindLibedit.cmake freeswitch/trunk/cmake_modules/FindSndfile.cmake Added: freeswitch/trunk/cmake_modules/FindAPR.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindAPR.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,51 @@ +# Locate APR include paths and libraries + +# This module defines +# APR_INCLUDES, where to find apr.h, etc. +# APR_LIBS, the libraries to link against to use APR. +# APR_FLAGS, the flags to use to compile +# APR_DEFINITIONS, definitions to use when compiling code that uses APR. +# APR_FOUND, set to 'yes' if found + +find_program(APR_CONFIG_EXECUTABLE + apr-1-config + /usr/local/apr/1.2.12/bin + /usr/local/bin + /usr/bin + C:/Progra~1/apr/bin + ) + +mark_as_advanced(APR_CONFIG_EXECUTABLE) + +macro(_apr_invoke _varname _regexp) + execute_process( + COMMAND ${APR_CONFIG_EXECUTABLE} ${ARGN} + OUTPUT_VARIABLE _apr_output + RESULT_VARIABLE _apr_failed + ) + + if(_apr_failed) + message(FATAL_ERROR "apr-1-config ${ARGN} failed") + else(_apr_failed) + string(REGEX REPLACE "[\r\n]" "" _apr_output "${_apr_output}") + string(REGEX REPLACE " +$" "" _apr_output "${_apr_output}") + + if(NOT ${_regexp} STREQUAL "") + string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}") + endif(NOT ${_regexp} STREQUAL "") + + separate_arguments(_apr_output) + set(${_varname} "${_apr_output}") + endif(_apr_failed) +endmacro(_apr_invoke) + +_apr_invoke(APR_INCLUDES "(^| )-I" --includes) +_apr_invoke(APR_FLAGS --cppflags --cflags) +_apr_invoke(APR_EXTRALIBS "(^| )-l" --libs) +_apr_invoke(APR_LIBS "" --link-ld) + +if(APR_INCLUDES AND APR_EXTRALIBS AND APR_LIBS) + set(APR_FOUND "YES") + message (STATUS "apr found: YES ${APR_LIBS}") +endif(APR_INCLUDES AND APR_EXTRALIBS AND APR_LIBS) + Added: freeswitch/trunk/cmake_modules/FindAPRUtil.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindAPRUtil.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,49 @@ +# Locate APR-Util include paths and libraries + +# This module defines +# APRUTIL_INCLUDES, where to find apr.h, etc. +# APRUTIL_LIBS, the libraries to link against to use APR. +# APRUTIL_FOUND, set to yes if found + +find_program(APRUTIL_CONFIG_EXECUTABLE + apu-1-config + /usr/local/apr-util/1.2.12/bin + /usr/local/bin + /usr/bin + C:/Progra~1/apr/bin + ) + +mark_as_advanced(APRUTIL_CONFIG_EXECUTABLE) + +macro(_apu_invoke _varname _regexp) + execute_process( + COMMAND ${APRUTIL_CONFIG_EXECUTABLE} ${ARGN} + OUTPUT_VARIABLE _apr_output + RESULT_VARIABLE _apr_failed + ) + + if(_apr_failed) + message(FATAL_ERROR "apu-1-config ${ARGN} failed") + else(_apr_failed) + string(REGEX REPLACE "[\r\n]" "" _apr_output "${_apr_output}") + string(REGEX REPLACE " +$" "" _apr_output "${_apr_output}") + + if(NOT ${_regexp} STREQUAL "") + string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}") + endif(NOT ${_regexp} STREQUAL "") + + separate_arguments(_apr_output) + + set(${_varname} "${_apr_output}") + endif(_apr_failed) +endmacro(_apu_invoke) + +_apu_invoke(APRUTIL_INCLUDES "(^| )-I" --includes) +_apu_invoke(APRUTIL_LIBS "" --link-ld) + +if(APRUTIL_LIBS AND APRUTIL_INCLUDES) + set(APRUTIL_FOUND "YES") + set(APRUTIL_DEFINITIONS "") + message (STATUS "apr-util found: YES ${APRUTIL_LIBS}") +endif(APRUTIL_LIBS AND APRUTIL_INCLUDES) + Added: freeswitch/trunk/cmake_modules/FindLibedit.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindLibedit.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,15 @@ + +find_path(PATH_INC_EDIT NAMES "histedit.h" PATHS ${CMAKE_SOURCE_DIR}/libs/libedit/src/) + +if( NOT PATH_INC_EDIT ) + message(FATAL_ERROR"Unable to locate libedit include files" ) +endif( NOT PATH_INC_EDIT ) + +find_library(PATH_LIB_EDIT NAMES "libedit.a" PATHS ${CMAKE_SOURCE_DIR}/libs/libedit/src/.libs/) + +if( NOT PATH_LIB_EDIT ) + message(FATAL_ERROR "Unable to locate libedit library file" ) +endif( NOT PATH_LIB_EDIT ) + +MESSAGE( STATUS "PATH_INC_EDIT = \"${PATH_INC_EDIT}\"" ) +MESSAGE( STATUS "PATH_LIB_EDIT = \"${PATH_LIB_EDIT}\"" ) Added: freeswitch/trunk/cmake_modules/FindSndfile.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindSndfile.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,34 @@ +# - Find sndfile +# Find the native sndfile includes and libraries +# +# SNDFILE_INCLUDE_DIR - where to find sndfile.h, etc. +# SNDFILE_LIBRARIES - List of libraries when using libsndfile. +# SNDFILE_FOUND - True if libsndfile found. + +if(SNDFILE_INCLUDE_DIR) + # Already in cache, be silent + set(SNDFILE_FIND_QUIETLY TRUE) +endif(SNDFILE_INCLUDE_DIR) + +FIND_PATH(SNDFILE_INCLUDE_DIR NAMES sndfile.h PATHS ${CMAKE_SOURCE_DIR}/libs/libsndfile/src/) + +FIND_LIBRARY(SNDFILE_LIBRARY NAMES libsndfile.a PATHS ${CMAKE_SOURCE_DIR}/libs/libsndfile/src/.libs/) + +MESSAGE( STATUS "SNDFILE_INCLUDE_DIR = \"${SNDFILE_INCLUDE_DIR}\"" ) +MESSAGE( STATUS "SNDFILE_LIBRARY = \"${SNDFILE_LIBRARY}\"" ) + +# Handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if +# all listed variables are TRUE. +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SNDFILE DEFAULT_MSG + SNDFILE_INCLUDE_DIR SNDFILE_LIBRARY) + +if(SNDFILE_FOUND) + set(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY}) +else(SNDFILE_FOUND) + set(SNDFILE_LIBRARIES) +endif(SNDFILE_FOUND) + +mark_as_advanced(SNDFILE_INCLUDE_DIR SNDFILE_LIBRARY) +MESSAGE( STATUS "SNDFILE_INCLUDE_DIR = \"${SNDFILE_INCLUDE_DIR}\"" ) +MESSAGE( STATUS "SNDFILE_LIBRARY = \"${SNDFILE_LIBRARY}\"" )

1 0

[commit] r11743 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Tue Feb 10 20:52:41 2009 New Revision: 11743 Log: Initial CMAKE file commit Added: freeswitch/trunk/src/CMakeLists.txt Added: freeswitch/trunk/src/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/src/CMakeLists.txt Tue Feb 10 20:52:41 2009 @@ -0,0 +1,167 @@ +#FREESWITCH CMAKE file +#Shane Burrell 2009 (supjigator) + + +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/ ../libs/libresample/include/ ../libs/srtp/crypto/include/ ../libs/srtp/include/) + +SET ( switch_ivr_SRCS switch_ivr.c include/switch_ivr.h) +ADD_LIBRARY(switch_ivr STATIC ${switch_ivr_SRCS}) + +SET ( switch_core_SRCS switch_core.c include/switch_core.h include/switch_core.h include/private/switch_core_pvt.h) +ADD_LIBRARY(switch_core STATIC ${switch_core_SRCS}) + +SET ( switch_core_io_SRCS switch_core_io.c ) +ADD_LIBRARY(switch_core_io STATIC ${switch_core_io_SRCS}) + +SET ( switch_core_asr_SRCS switch_core_asr.c ) +ADD_LIBRARY(switch_core_asr STATIC ${switch_core_asr_SRCS}) + +SET ( switch_apr_SRCS switch_apr.c ) +ADD_LIBRARY(switch_apr STATIC ${switch_apr_SRCS}) + +if( HAVE_NETDB_H) + add_definitions( -DHAVE_NETDB_H) +endif( HAVE_NETDB_H) + +SET ( switch_utils_SRCS switch_utils.c include/switch_utils.h) +ADD_LIBRARY(switch_utils STATIC ${switch_utils_SRCS}) + +SET ( switch_xml_SRCS switch_xml.c include/switch_xml.h) +ADD_LIBRARY(switch_xml STATIC ${switch_xml_SRCS}) + +SET ( switch_buffer_SRCS switch_buffer.c include/switch_buffer.h) +ADD_LIBRARY(switch_buffer ${switch_buffer_SRCS}) + +SET ( switch_caller_SRCS switch_caller.c include/switch_caller.h) +ADD_LIBRARY(switch_caller ${switch_caller_SRCS}) + +SET ( switch_channel_SRCS switch_channel.c include/switch_channel.h) +ADD_LIBRARY(switch_channel ${switch_channel_SRCS}) + +SET ( switch_config_SRCS switch_config.c include/switch_config.h) +ADD_LIBRARY(switch_config ${switch_config_SRCS}) + +SET ( switch_console_SRCS switch_console.c include/switch_console.h) +ADD_LIBRARY(switch_console ${switch_console_SRCS}) + +SET ( switch_core_codec_SRCS switch_core_codec.c) +ADD_LIBRARY(switch_core_codec ${switch_core_codec_SRCS}) + +SET ( switch_core_db_SRCS switch_core_db.c include/switch_core_db.h) +ADD_LIBRARY(switch_core_db ${switch_core_db_SRCS}) + +SET ( switch_core_directory_SRCS switch_core_directory.c) +ADD_LIBRARY(switch_core_directory ${switch_core_directory_SRCS}) + +SET ( switch_core_event_hook_SRCS switch_core_event_hook.c include/switch_core_event_hook.h) +ADD_LIBRARY(switch_core_event_hook ${switch_core_event_hook_SRCS}) + + + +SET ( switch_core_file_SRCS switch_core_file.c) +ADD_LIBRARY(switch_core_file ${switch_core_file_SRCS}) + +SET ( switch_core_hash_SRCS switch_core_hash.c) +ADD_LIBRARY(switch_core_hash ${switch_core_hash_SRCS}) + + +SET ( switch_core_media_bug_SRCS switch_core_media_bug.c) +ADD_LIBRARY(switch_core_media_bug ${switch_core_media_bug_SRCS}) + +SET ( switch_core_memory_SRCS switch_core_memory.c) +ADD_LIBRARY(switch_core_memory ${switch_core_memory_SRCS}) + +SET ( switch_core_port_allocator_SRCS switch_core_port_allocator.c) +ADD_LIBRARY(switch_core_port_allocator ${switch_core_port_allocator_SRCS}) + +SET ( switch_core_rwlock_SRCS switch_core_rwlock.c) +ADD_LIBRARY(switch_core_rwlock ${switch_core_rwlock_SRCS}) + +SET ( switch_core_session_SRCS switch_core_session.c) +ADD_LIBRARY(switch_core_session ${switch_core_session_SRCS}) + +SET ( switch_core_speech_SRCS switch_core_speech.c) +ADD_LIBRARY(switch_core_speech ${switch_core_speech_SRCS}) + + + + + + +SET ( switch_core_sqldb_SRCS switch_core_sqldb.c) +ADD_LIBRARY(switch_core_sqldb ${switch_core_sqldb_SRCS}) + +SET ( switch_core_state_machine_SRCS switch_core_state_machine.c) +ADD_LIBRARY(switch_core_state_machine ${switch_core_state_machine_SRCS}) + +SET ( switch_core_timer_SRCS switch_core_timer.c) +ADD_LIBRARY(switch_core_timer ${switch_core_timer_SRCS}) + +SET ( switch_dso_SRCS switch_dso.c include/switch_dso.h) +ADD_LIBRARY(switch_dso ${switch_dso_SRCS}) + +SET ( switch_event_SRCS switch_event.c include/switch_event.h) +ADD_LIBRARY(switch_event ${switch_event_SRCS}) + +SET ( switch_ivr_async_SRCS switch_ivr_async.c) +ADD_LIBRARY(switch_ivr_async ${switch_ivr_async_SRCS}) + +SET ( switch_ivr_bridge_SRCS switch_ivr_bridge.c) +ADD_LIBRARY(switch_ivr_bridge ${switch_ivr_bridge_SRCS}) + +SET ( switch_ivr_menu_SRCS switch_ivr_menu.c) +ADD_LIBRARY(switch_ivr_menu ${switch_ivr_menu_SRCS}) + + + + +SET ( switch_ivr_originate_SRCS switch_ivr_originate.c) +ADD_LIBRARY(switch_ivr_originate ${switch_ivr_originate_SRCS}) + +SET ( switch_ivr_play_say_SRCS switch_ivr_play_say.c) +ADD_LIBRARY(switch_ivr_play_say ${switch_ivr_play_say_SRCS}) + +SET ( switch_loadable_module_SRCS switch_loadable_module.c include/switch_loadable_module.h) +ADD_LIBRARY(switch_loadable_module ${switch_loadable_module_SRCS}) + +SET ( switch_log_SRCS switch_log.c include/switch_log.h) +ADD_LIBRARY(switch_log ${switch_log_SRCS}) + + + + + +SET ( switch_odbc_SRCS switch_odbc.c include/switch_odbc.h) +ADD_LIBRARY(switch_odbc ${switch_odbc_SRCS}) + +SET ( switch_pcm_SRCS switch_pcm.c) +ADD_LIBRARY(switch_pcm ${switch_pcm_SRCS}) + +SET ( switch_regex_SRCS switch_regex.c include/switch_regex.h) +ADD_LIBRARY(switch_regex ${switch_regex_SRCS}) + +SET ( switch_resample_SRCS switch_resample.c include/switch_resample.h) +ADD_LIBRARY(switch_resample ${switch_resample_SRCS}) + +SET ( switch_rtp_SRCS switch_rtp.c include/switch_rtp.h) +ADD_LIBRARY(switch_rtp ${switch_rtp_SRCS}) + +SET ( switch_scheduler_SRCS switch_scheduler.c include/switch_scheduler.h) +ADD_LIBRARY(switch_scheduler ${switch_scheduler_SRCS}) + +SET ( switch_stun_SRCS switch_stun.c include/switch_stun.h) +ADD_LIBRARY(switch_stun ${switch_stun_SRCS}) + +SET ( switch_swig_SRCS switch_swig.c) +ADD_LIBRARY(switch_swig ${switch_swig_SRCS}) + +SET ( switch_time_SRCS switch_time.c) +ADD_LIBRARY(switch_time ${switch_time_SRCS}) + + + + + +

1 0

[commit] r11742 - freeswitch/trunk
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Tue Feb 10 20:50:23 2009 New Revision: 11742 Log: Initial CMAKE file commit Added: freeswitch/trunk/CMakeLists.txt Added: freeswitch/trunk/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/CMakeLists.txt Tue Feb 10 20:50:23 2009 @@ -0,0 +1,142 @@ +# FREESWITCH CMAKE BUILD +# SHANE BURRELL 2008 (supjigator) + +PROJECT (freeswitch) + +# project version +SET( ${PROJECT_NAME}_MAJOR_VERSION 0 ) +SET( ${PROJECT_NAME}_MINOR_VERSION 1 ) +SET( ${PROJECT_NAME}_PATCH_LEVEL 0 ) + + +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") +INCLUDE (CheckSymbolExists) +INCLUDE (CheckIncludeFile) +INCLUDE (CheckFunctionExists) + +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +# ADD_DEFINITIONS( "-Wall -ansi -pedantic" ) + +MESSAGE( STATUS ) +MESSAGE( STATUS "FREESWITCH CMAKE Build - Shane Burrell-----------------------------------------" ) +MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" ) +MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) +MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) +MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) +MESSAGE( STATUS "${PROJECT_NAME}_DEPENDS = \"${${PROJECT_NAME}_DEPENDS}\"" ) +MESSAGE( STATUS "BUILD_WITH = \"${BUILD_WITH}\"" ) +MESSAGE( STATUS "INSTALL_DOC = ${INSTALL_DOC}" ) +MESSAGE( STATUS "Change a value with: cmake -D<Variable>=<Value>" ) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) + + + + + +# Configuration checks +check_symbol_exists (strncasecmp "string.h" HAVE_STRNCASECMP) +check_symbol_exists (strcasecmp "string.h" HAVE_STRCASECMP) +check_function_exists (strcasestr HAVE_STRCASESTR) +check_function_exists (strchrnul HAVE_STRCHRNUL) +check_include_file (dirent.h HAVE_DIRENT_H) +check_include_file (sys/ioctl.h HAVE_SYS_IOCTL_H) +check_include_file (sys/utsname.h HAVE_SYS_UTSNAME_H) +check_include_file (wchar.h HAVE_WCHAR_H) +check_include_file (wctype.h HAVE_WCTYPE_H) +check_function_exists (scandir HAVE_SCANDIR) +check_function_exists (alphasort HAVE_ALPHASORT) +check_symbol_exists (iswspace "wctype.h" HAVE_ISWSPACE) +check_symbol_exists (towlower "wctype.h" HAVE_TOWLOWER) +check_include_file(sys/devpoll.h HAVE_SYS_DEVPOLL_H) +check_include_file(sys/epoll.h HAVE_SYS_EPOLL_H) +check_include_file(sys/event.h HAVE_SYS_EVENT_H) +check_include_file(sys/mman.h HAVE_SYS_MMAN_H) +check_include_file(sys/poll.h HAVE_SYS_POLL_H) +check_include_file(sys/port.h HAVE_SYS_PORT_H) +check_include_file(sys/prctl.h HAVE_SYS_PRCTL_H) +check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H) +check_include_file(sys/sendfile.h HAVE_SYS_SENDFILE_H) +check_include_file(sys/select.h HAVE_SYS_SELECT_H) +check_include_file(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(sys/uio.h HAVE_SYS_UIO_H) +check_include_file(sys/un.h HAVE_SYS_UN_H) +check_include_file(sys/wait.h HAVE_SYS_WAIT_H) +check_include_file(sys/time.h HAVE_SYS_TIME_H) +check_include_file(time.h HAVE_TIME_H) +check_include_file(unistd.h HAVE_UNISTD_H) +check_include_file(pthread.h HAVE_PTHREAD_H) + + +FIND_PACKAGE(Threads) + + +# DO APR +FIND_PACKAGE (APR) +FIND_PACKAGE (APRUtil) + +LINK_LIBRARIES (${APR_LIBS} ${APRUTIL_LIBS}) + +MESSAGE( STATUS "APR INFO------------------------------------------" ) +MESSAGE( STATUS "APR_LIBS = ${APR_LIBS}" ) +MESSAGE( STATUS "APRUTIL_LIBS = ${APRUTIL_LIBS}" ) +MESSAGE( STATUS "--------------------------------------------------" ) +INCLUDE_DIRECTORIES (${APR_INCLUDES} ${APRUTIL_INCLUDES}) + + +# DO SNDFILE +FIND_PACKAGE (Sndfile) +LINK_LIBRARIES (${SNDFILE_LIBRARY}) +INCLUDE_DIRECTORIES (${SNDFILE_INCLUDE_DIR}) + +# DO LIBEDIT +FIND_PACKAGE (Libedit) +LINK_LIBRARIES (${PATH_LIB_EDIT}) +INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) + +# DO SRTP +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libcryptomath.a) +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libsrtp.a) +INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/srtp/crypto/include) + +# SQLITE +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/sqlite/.libs/libsqlite3.a) +INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/sqlite/) + +# VOIPCODECS +LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/voipcodecs/src/.libs/libvoipcodecs.a) +INCLUDE_DIRECTORIES ( ${CMAKE_SOURCE_DIR}/libs/voipcodecs/src/) + +# DO POSTGRES +#FIND_PACKAGE(POSTGRES) +IF(POSTGRES_FOUND) + INCLUDE_DIRECTORIES( ${POSTGRES_INCLUDE_DIRECTORIES} ) + SET(optionalLibs ${optionalLibs} ${POSTGRES_LIBRARIES} ) +ENDIF(POSTGRES_FOUND) + +CHECK_INCLUDE_FILE(netdb.h HAVE_NETDB_H) +if( HAVE_NETDB_H) + add_definitions( -DHAVE_NETDB_H) +endif( HAVE_NETDB_H) + + +INCLUDE_DIRECTORIES(src/include/ libs/libteletone/src/ libs/stfu/ libs/apr/include/ libs/apr-util/include/) + +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(libs/libresample/) +ADD_SUBDIRECTORY(libs/libteletone/) +#ADD_SUBDIRECTORY(libs/sqlite/) +ADD_SUBDIRECTORY(libs/pcre/) +ADD_SUBDIRECTORY(libs/stfu/) +#ADD_SUBDIRECTORY(libs/libedit/) +ADD_SUBDIRECTORY(libs/srtp/) + +SET ( freeswitch_SRCS src/switch.c src/include/switch.h) +ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) + + +TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample switch_ivr switch_ivr_async switch_core switch_core_asr switch_channel switch_core_io switch_apr switch_utils switch_xml switch_buffer switch_caller switch_buffer switch_config switch_console switch_core_codec switch_core_db switch_core_directory switch_core_event_hook switch_core_file switch_core_hash switch_core_media_bug switch_core_memory switch_core_port_allocator switch_core_rwlock switch_core_session switch_core_speech switch_core_sqldb switch_core_state_machine switch_core_timer switch_dso switch_event switch_ivr_async switch_ivr_bridge switch_ivr_menu switch_ivr_originate switch_ivr_play_say switch_loadable_module switch_log switch_odbc switch_pcm switch_regex switch_resample switch_rtp switch_scheduler switch_stun switch_swig switch_time stfu ${optionalLibs}) + +

1 0

[commit] r11741 - in freeswitch/trunk/src: . mod/applications/mod_enum
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: anthm Date: Tue Feb 10 18:31:58 2009 New Revision: 11741 Log: MODAPP-211 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Tue Feb 10 18:31:58 2009 @@ -802,7 +802,9 @@ static void event_handler(switch_event_t *event) { if (globals.auto_reload) { + switch_mutex_lock(MUTEX); do_load(); + switch_mutex_unlock(MUTEX); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ENUM Reloaded\n"); } } Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue Feb 10 18:31:58 2009 @@ -658,7 +658,9 @@ static void event_handler(switch_event_t *event) { + switch_mutex_lock(globals.mutex); switch_load_timezones(1); + switch_mutex_unlock(globals.mutex); } static void tztime(const time_t * const timep, const char *tzstring, struct tm * const tmp );

1 0