- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12253 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:29:11 2009 New Revision: 12253 Log: I need coffee Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:29:11 2009 @@ -143,7 +143,7 @@ } -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown) +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_dialplan_directory_shutdown) { switch_safe_free(globals.directory_name); switch_safe_free(globals.host);

1 0

[commit] r12252 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:23:54 2009 New Revision: 12252 Log: Missing prototype Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:23:54 2009 @@ -35,6 +35,7 @@ #include <fcntl.h> SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_dialplan_directory_shutdown); SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, mod_dialplan_directory_shutdown, NULL); static struct {

1 0

[commit] r12251 - in freeswitch/trunk/src/mod: applications/mod_easyroute applications/mod_enum dialplans/mod_dialplan_directory endpoints/mod_alsa endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_reference endpoints/mod_skypiax event_handlers/mod_erlang_event event_handlers/mod_event_multicast event_handlers/mod_event_socket loggers/mod_syslog xml_int/mod_xml_rpc
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 13:17:24 2009 New Revision: 12251 Log: Leaking on unload is strictly forbidden Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Mon Feb 23 13:17:24 2009 @@ -426,6 +426,14 @@ #ifdef SWITCH_HAVE_ODBC switch_odbc_handle_disconnect(globals.master_odbc); #endif + + switch_safe_free(globals.db_username); + switch_safe_free(globals.db_password); + switch_safe_free(globals.db_dsn); + switch_safe_free(globals.default_techprofile); + switch_safe_free(globals.default_gateway); + switch_safe_free(globals.custom_query); + return SWITCH_STATUS_UNLOAD; } 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 Mon Feb 23 13:17:24 2009 @@ -850,6 +850,9 @@ if (globals.pool) { switch_core_destroy_memory_pool(&globals.pool); } + + switch_safe_free(globals.root); + switch_safe_free(globals.isn_root); return SWITCH_STATUS_UNLOAD; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Mon Feb 23 13:17:24 2009 @@ -35,7 +35,7 @@ #include <fcntl.h> SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load); -SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, NULL, NULL); +SWITCH_MODULE_DEFINITION(mod_dialplan_directory, mod_dialplan_directory_load, mod_dialplan_directory_shutdown, NULL); static struct { char *directory_name; @@ -142,11 +142,23 @@ } +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_enum_shutdown) +{ + switch_safe_free(globals.directory_name); + switch_safe_free(globals.host); + switch_safe_free(globals.dn); + switch_safe_free(globals.pass); + switch_safe_free(globals.base); +} + + SWITCH_MODULE_LOAD_FUNCTION(mod_dialplan_directory_load) { switch_dialplan_interface_t *dp_interface; + memset(&globals, 0, sizeof(globals)); load_config(); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_DIALPLAN(dp_interface, "directory", directory_dialplan_hunt); Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon Feb 23 13:17:24 2009 @@ -813,7 +813,7 @@ return SWITCH_STATUS_TERM; } - + memset(&globals, 0, sizeof(globals)); if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; @@ -939,6 +939,14 @@ switch_core_codec_destroy(&globals.write_codec); } switch_core_hash_destroy(&globals.call_hash); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.cid_name); + switch_safe_free(globals.cid_num); + switch_safe_free(globals.ring_file); + switch_safe_free(globals.hold_file); + switch_safe_free(globals.timer_name); + switch_safe_free(globals.device_name); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Feb 23 13:17:24 2009 @@ -1748,6 +1748,8 @@ switch_api_interface_t *api_interface; module_pool = pool; + + memset(&globals, 0, sizeof(globals)); load_config(); @@ -1889,6 +1891,11 @@ switch_core_hash_destroy(&globals.profile_hash); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Feb 23 13:17:24 2009 @@ -802,6 +802,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_iax_load) { + memset(&globals, 0, sizeof(globals)); + module_pool = pool; *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -1148,6 +1150,12 @@ } switch_yield(20000); } + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + switch_safe_free(globals.ip); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Feb 23 13:17:24 2009 @@ -532,6 +532,8 @@ module_pool = pool; + memset(&globals, 0, sizeof(globals)); + load_config(); *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -565,6 +567,13 @@ } switch_yield(20000); } + + /* Free dynamically allocated strings */ + switch_safe_free(globals.dialplan); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + switch_safe_free(globals.ip); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Mon Feb 23 13:17:24 2009 @@ -1071,6 +1071,13 @@ globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread); } } + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.context); + switch_safe_free(globals.destination); + switch_safe_free(globals.codec_string); + switch_safe_free(globals.codec_rates_string); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Feb 23 13:17:24 2009 @@ -1296,7 +1296,9 @@ { switch_application_interface_t *app_interface; switch_api_interface_t *api_interface; - + + memset(&prefs, 0, sizeof(prefs)); + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); /* intialize the unique reference stuff */ @@ -1517,6 +1519,10 @@ switch_sleep(1500000); /* sleep for 1.5 seconds */ + switch_safe_free(prefs.ip); + switch_safe_free(prefs.cookie); + switch_safe_free(prefs.nodename); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Mon Feb 23 13:17:24 2009 @@ -267,6 +267,9 @@ switch_core_hash_destroy(&globals.event_hash); + switch_safe_free(globals.address); + switch_safe_free(globals.bindings); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Feb 23 13:17:24 2009 @@ -471,6 +471,9 @@ switch_event_unbind(&globals.node); + switch_safe_free(prefs.ip); + switch_safe_free(prefs.password); + return SWITCH_STATUS_SUCCESS; } @@ -933,6 +936,8 @@ switch_application_interface_t *app_interface; switch_api_interface_t *api_interface; + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.listener_mutex, SWITCH_MUTEX_NESTED, pool); memset(&listen_list, 0, sizeof(listen_list)); Modified: freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c Mon Feb 23 13:17:24 2009 @@ -152,6 +152,8 @@ { switch_status_t status; *module_interface = &console_module_interface; + + memset(&globals, 0, sizeof(globals)); if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { return status; @@ -162,6 +164,9 @@ setlogmask(LOG_UPTO(LOG_DEBUG)); switch_log_bind_logger(mod_syslog_logger, log_level, SWITCH_FALSE); + switch_safe_free(globals.ident); + switch_safe_free(globals.format); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Mon Feb 23 13:17:24 2009 @@ -851,6 +851,10 @@ switch_yield(100000); } while (globals.running); + switch_safe_free(globals.realm); + switch_safe_free(globals.user); + switch_safe_free(globals.pass); + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12250 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mrene Date: Mon Feb 23 12:48:40 2009 New Revision: 12250 Log: SWITCH_DECLARE_GLOBAL_STRING_FUNC allocated stuff have to be freed on module shutdown Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Feb 23 12:48:40 2009 @@ -973,6 +973,13 @@ switch_core_hash_destroy(&globals.call_hash); switch_event_free_subclass(MY_EVENT_RINGING); + + switch_safe_free(globals.dialplan); + switch_safe_free(globals.cid_name); + switch_safe_free(globals.cid_num); + switch_safe_free(globals.ring_file); + switch_safe_free(globals.hold_file); + switch_safe_free(globals.timer_name); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12249 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: andrew Date: Mon Feb 23 12:34:08 2009 New Revision: 12249 Log: Bind to 0.0.0.0 instead of 127.0.0.1 by default; like most erlang nodes do. Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Mon Feb 23 12:34:08 2009 @@ -316,6 +316,9 @@ { switch_status_t rv; struct sockaddr_in server_addr; + struct hostent *nodehost; + char thishostname[EI_MAXHOSTNAMELEN+1] = ""; + char thisnodename[MAXNODELEN+1]; /* zero out the struct before we use it */ memset(&server_addr, 0, sizeof(server_addr)); @@ -334,14 +337,13 @@ server_addr.sin_family = AF_INET; server_addr.sin_port = htons(prefs.port); - struct hostent *nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET); - - char *thishostname = nodehost->h_name; - char thisnodename[MAXNODELEN+1]; + if ((nodehost = gethostbyaddr(&server_addr.sin_addr.s_addr, sizeof(server_addr.sin_addr.s_addr), AF_INET))) + memcpy(thishostname, nodehost->h_name, EI_MAXHOSTNAMELEN); - if (!strcmp(thishostname, "localhost")) + if (switch_strlen_zero_buf(thishostname)) { gethostname(thishostname, EI_MAXHOSTNAMELEN); - + } + if (prefs.shortname) { char *off; if ((off = strchr(thishostname, '.'))) { Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml Mon Feb 23 12:34:08 2009 @@ -1,6 +1,6 @@ <configuration name="erlang_event.conf" description="Erlang Socket Client"> <settings> - <param name="listen-ip" value="127.0.0.1"/> + <param name="listen-ip" value="0.0.0.0"/> <param name="listen-port" value="8031"/> <param name="cookie" value="ClueCon"/> <param name="shortname" value="true"/> Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Feb 23 12:34:08 2009 @@ -932,7 +932,7 @@ } if (switch_strlen_zero(prefs.ip)) { - set_pref_ip("127.0.0.1"); + set_pref_ip("0.0.0.0"); } if (switch_strlen_zero(prefs.cookie)) { @@ -1423,7 +1423,7 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected and published erlang cnode at %s\n", ec.thisnodename); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connected to epmd and published erlang cnode at %s\n", ec.thisnodename); listen_list.ready = 1;

1 0

[commit] r12248 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Mon Feb 23 12:33:59 2009 New Revision: 12248 Log: declinatio mortuus obfirmo! Modified: freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Feb 23 12:33:59 2009 @@ -1830,7 +1830,7 @@ { char path_buf[1024]; uint8_t hasmain = 0, errcnt = 0; - switch_xml_t new_main; + switch_xml_t new_main, r = NULL; switch_mutex_lock(XML_LOCK); @@ -1838,8 +1838,8 @@ hasmain++; if (!reload) { - switch_mutex_unlock(XML_LOCK); - return switch_xml_root(); + r = switch_xml_root(); + goto done; } switch_thread_rwlock_wrlock(RWLOCK); } @@ -1871,8 +1871,6 @@ switch_thread_rwlock_unlock(RWLOCK); } - switch_mutex_unlock(XML_LOCK); - if (errcnt == 0) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_RELOADXML) == SWITCH_STATUS_SUCCESS) { @@ -1880,10 +1878,14 @@ switch_event_destroy(&event); } } - return switch_xml_root(); + r = switch_xml_root(); } - return NULL; + done: + + switch_mutex_unlock(XML_LOCK); + + return r; } SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, const char **err) @@ -1908,14 +1910,19 @@ SWITCH_DECLARE(switch_status_t) switch_xml_destroy(void) { + switch_status_t status = SWITCH_STATUS_FALSE; + switch_mutex_lock(XML_LOCK); + if (MAIN_XML_ROOT) { switch_xml_t xml = MAIN_XML_ROOT; MAIN_XML_ROOT = NULL; switch_xml_free(xml); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } - return SWITCH_STATUS_FALSE; + switch_mutex_unlock(XML_LOCK); + + return status; } SWITCH_DECLARE(switch_xml_t) switch_xml_open_cfg(const char *file_path, switch_xml_t *node, switch_event_t *params)

1 0

[commit] r12247 - freeswitch/trunk/libs/win32
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Mon Feb 23 12:17:27 2009 New Revision: 12247 Log: fix version generator on windows (FSBUILD-115/FSBUILD-69) Modified: freeswitch/trunk/libs/win32/util.vbs Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Mon Feb 23 12:17:27 2009 @@ -254,6 +254,9 @@ Wget ToolsBase & "fs_svnversion.exe", tmpFolder End If + If Not FSO.FileExists(tmpFolder & "libdb44.dll") Then + Wget ToolsBase & "libdb44.dll", tmpFolder + End If If Not FSO.FileExists(tmpFolder & "libsvn_diff-1.dll") Then Wget ToolsBase & "libsvn_diff-1.dll", tmpFolder End If

1 0

[commit] r12246 - in freeswitch/trunk/libs: ilbc/src spandsp/src/spandsp voipcodecs/src/voipcodecs
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Mon Feb 23 11:56:59 2009 New Revision: 12246 Log: use compiler intrinsics for windows x64 build (FSBUILD-131) Modified: freeswitch/trunk/libs/ilbc/src/iLBC_decode.c freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Modified: freeswitch/trunk/libs/ilbc/src/iLBC_decode.c ============================================================================== --- freeswitch/trunk/libs/ilbc/src/iLBC_decode.c (original) +++ freeswitch/trunk/libs/ilbc/src/iLBC_decode.c Mon Feb 23 11:56:59 2009 @@ -41,7 +41,7 @@ #include "syntFilter.h" #if (defined(WIN32) || defined(_WIN32)) && !defined(_WIN64) - __inline double rint(double dbl) + __inline long int rint(double dbl) { _asm { @@ -50,9 +50,15 @@ } } #elif defined (_WIN64) +#include <intrin.h> __inline__ long int rint(double x) { - return (long int) (x); +#ifdef _M_X64 + return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (long int) (x); +#endif } #endif Modified: freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h ============================================================================== --- freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h (original) +++ freeswitch/trunk/libs/spandsp/src/spandsp/fast_convert.h Mon Feb 23 11:56:59 2009 @@ -303,29 +303,26 @@ } #elif defined(WIN64) || defined(_WIN64) /* x86_64 machines will do best with a simple assignment. */ +#include <intrin.h> __inline long int lrint(double x) { - long int i; - - _asm - { - fld x - fistp i - }; - return i; +#ifdef _M_X64 + return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (long int) (x); +#endif } __inline long int lrintf(float x) { - long int i; - - _asm - { - fld x - fistp i - }; - return i; +#ifdef _M_X64 + return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (long int) (x); +#endif } __inline long int lfastrint(double x) Modified: freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h (original) +++ freeswitch/trunk/libs/voipcodecs/src/voipcodecs/dc_restore.h Mon Feb 23 11:56:59 2009 @@ -127,17 +127,34 @@ return retval; } #elif defined(_WIN64) +#include <intrin.h> + __inline__ long int rint(double x) { - return (long int) (x); +#ifdef _M_X64 + return (long int)_mm_cvtsd_si64x( _mm_loadu_pd ((const double*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (long int) (x); +#endif } __inline__ int rintf(float x) { - return (int) rint((double) x); +#ifdef _M_X64 + return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (int) (x); +#endif } __inline__ long int lrintf(float x) { - return (long int) (x); +#ifdef _M_X64 + return _mm_cvt_ss2si( _mm_load_ss((const float*)&x) ); +#else +#warning "Not Supported: Replacing with a simple C cast." + return (long int) (x); +#endif } #endif

1 0

[commit] r12245 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: mikej Date: Mon Feb 23 10:59:35 2009 New Revision: 12245 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Mon Feb 23 10:59:35 2009 @@ -1532,6 +1532,17 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() { + int jresult ; + int result; + + result = (int) 1000; + + jresult = result; + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) { switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ; char arg2 ; @@ -5491,17 +5502,19 @@ } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, void * jarg2, char * jarg3) { +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, int jarg2, void * jarg3, char * jarg4) { void * jresult ; switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ; - switch_memory_pool_t **arg2 = (switch_memory_pool_t **) 0 ; - char *arg3 = (char *) 0 ; + switch_call_direction_t arg2 ; + switch_memory_pool_t **arg3 = (switch_memory_pool_t **) 0 ; + char *arg4 = (char *) 0 ; switch_core_session_t *result = 0 ; arg1 = (switch_endpoint_interface_t *)jarg1; - arg2 = (switch_memory_pool_t **)jarg2; - arg3 = (char *)jarg3; - result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,(char const *)arg3); + arg2 = (switch_call_direction_t)jarg2; + arg3 = (switch_memory_pool_t **)jarg3; + arg4 = (char *)jarg4; + result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,arg3,(char const *)arg4); jresult = (void *)result; return jresult; } @@ -5567,15 +5580,17 @@ } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_by_name(char * jarg1, void * jarg2) { +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_by_name(char * jarg1, int jarg2, void * jarg3) { void * jresult ; char *arg1 = (char *) 0 ; - switch_memory_pool_t **arg2 = (switch_memory_pool_t **) 0 ; + switch_call_direction_t arg2 ; + switch_memory_pool_t **arg3 = (switch_memory_pool_t **) 0 ; switch_core_session_t *result = 0 ; arg1 = (char *)jarg1; - arg2 = (switch_memory_pool_t **)jarg2; - result = (switch_core_session_t *)switch_core_session_request_by_name((char const *)arg1,arg2); + arg2 = (switch_call_direction_t)jarg2; + arg3 = (switch_memory_pool_t **)jarg3; + result = (switch_core_session_t *)switch_core_session_request_by_name((char const *)arg1,arg2,arg3); jresult = (void *)result; return jresult; } @@ -18013,15 +18028,17 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_alloc(void * jarg1, void * jarg2) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_alloc(void * jarg1, int jarg2, void * jarg3) { int jresult ; switch_channel_t **arg1 = (switch_channel_t **) 0 ; - switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ; + switch_call_direction_t arg2 ; + switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ; switch_status_t result; arg1 = (switch_channel_t **)jarg1; - arg2 = (switch_memory_pool_t *)jarg2; - result = (switch_status_t)switch_channel_alloc(arg1,arg2); + arg2 = (switch_call_direction_t)jarg2; + arg3 = (switch_memory_pool_t *)jarg3; + result = (switch_status_t)switch_channel_alloc(arg1,arg2,arg3); jresult = result; return jresult; } Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Mon Feb 23 10:59:35 2009 @@ -1100,8 +1100,8 @@ return ret; } - public static SWIGTYPE_p_switch_core_session switch_core_session_request_uuid(switch_endpoint_interface endpoint_interface, SWIGTYPE_p_p_apr_pool_t pool, string use_uuid) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_uuid(switch_endpoint_interface.getCPtr(endpoint_interface), SWIGTYPE_p_p_apr_pool_t.getCPtr(pool), use_uuid); + public static SWIGTYPE_p_switch_core_session switch_core_session_request_uuid(switch_endpoint_interface endpoint_interface, switch_call_direction_t direction, SWIGTYPE_p_p_apr_pool_t pool, string use_uuid) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_uuid(switch_endpoint_interface.getCPtr(endpoint_interface), (int)direction, SWIGTYPE_p_p_apr_pool_t.getCPtr(pool), use_uuid); SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false); return ret; } @@ -1130,8 +1130,8 @@ return ret; } - public static SWIGTYPE_p_switch_core_session switch_core_session_request_by_name(string endpoint_name, SWIGTYPE_p_p_apr_pool_t pool) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_by_name(endpoint_name, SWIGTYPE_p_p_apr_pool_t.getCPtr(pool)); + public static SWIGTYPE_p_switch_core_session switch_core_session_request_by_name(string endpoint_name, switch_call_direction_t direction, SWIGTYPE_p_p_apr_pool_t pool) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_by_name(endpoint_name, (int)direction, SWIGTYPE_p_p_apr_pool_t.getCPtr(pool)); SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false); return ret; } @@ -2365,8 +2365,8 @@ return ret; } - public static switch_status_t switch_channel_alloc(SWIGTYPE_p_p_switch_channel channel, SWIGTYPE_p_apr_pool_t pool) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_alloc(SWIGTYPE_p_p_switch_channel.getCPtr(channel), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); + public static switch_status_t switch_channel_alloc(SWIGTYPE_p_p_switch_channel channel, switch_call_direction_t direction, SWIGTYPE_p_apr_pool_t pool) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_alloc(SWIGTYPE_p_p_switch_channel.getCPtr(channel), (int)direction, SWIGTYPE_p_apr_pool_t.getCPtr(pool)); return ret; } @@ -4178,6 +4178,7 @@ public static readonly string SWITCH_UUID_BRIDGE = freeswitchPINVOKE.SWITCH_UUID_BRIDGE_get(); public static readonly int SWITCH_BITS_PER_BYTE = freeswitchPINVOKE.SWITCH_BITS_PER_BYTE_get(); public static readonly int SWITCH_DEFAULT_FILE_BUFFER_LEN = freeswitchPINVOKE.SWITCH_DEFAULT_FILE_BUFFER_LEN_get(); + public static readonly int SWITCH_DTMF_LOG_LEN = freeswitchPINVOKE.SWITCH_DTMF_LOG_LEN_get(); public static readonly int SWITCH_MAX_STACKS = freeswitchPINVOKE.SWITCH_MAX_STACKS_get(); public static readonly int SWITCH_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_THREAD_STACKSIZE_get(); public static readonly int SWITCH_SYSTEM_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_SYSTEM_THREAD_STACKSIZE_get(); @@ -4766,6 +4767,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_DEFAULT_FILE_BUFFER_LEN_get")] public static extern int SWITCH_DEFAULT_FILE_BUFFER_LEN_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_DTMF_LOG_LEN_get")] + public static extern int SWITCH_DTMF_LOG_LEN_get(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_dtmf_t_digit_set")] public static extern void switch_dtmf_t_digit_set(HandleRef jarg1, char jarg2); @@ -5724,7 +5728,7 @@ public static extern IntPtr switch_core_session_get_pool(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_request_uuid")] - public static extern IntPtr switch_core_session_request_uuid(HandleRef jarg1, HandleRef jarg2, string jarg3); + public static extern IntPtr switch_core_session_request_uuid(HandleRef jarg1, int jarg2, HandleRef jarg3, string jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_set_uuid")] public static extern int switch_core_session_set_uuid(HandleRef jarg1, string jarg2); @@ -5742,7 +5746,7 @@ public static extern IntPtr switch_core_session_id(); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_request_by_name")] - public static extern IntPtr switch_core_session_request_by_name(string jarg1, HandleRef jarg2); + public static extern IntPtr switch_core_session_request_by_name(string jarg1, int jarg2, HandleRef jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_thread_launch")] public static extern int switch_core_session_thread_launch(HandleRef jarg1); @@ -8739,7 +8743,7 @@ public static extern IntPtr switch_channel_get_timetable(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_alloc")] - public static extern int switch_channel_alloc(HandleRef jarg1, HandleRef jarg2); + public static extern int switch_channel_alloc(HandleRef jarg1, int jarg2, HandleRef jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_init")] public static extern int switch_channel_init(HandleRef jarg1, HandleRef jarg2, int jarg3, int jarg4); @@ -16661,6 +16665,22 @@ namespace FreeSWITCH.Native { +public enum switch_call_direction_t { + SWITCH_CALL_DIRECTION_INBOUND, + SWITCH_CALL_DIRECTION_OUTBOUND +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + using System; using System.Runtime.InteropServices;

1 0

[commit] r12244 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_fifo mod/endpoints/mod_alsa mod/endpoints/mod_dingaling mod/endpoints/mod_iax mod/endpoints/mod_loopback mod/endpoints/mod_opal mod/endpoints/mod_portaudio mod/endpoints/mod_reference mod/endpoints/mod_skypiax mod/endpoints/mod_skypiax/asterisk mod/endpoints/mod_sofia mod/endpoints/mod_unicall
by FreeSWITCH SVN 23 Feb '09

23 Feb '09

Author: anthm Date: Mon Feb 23 10:31:59 2009 New Revision: 12244 Log: add direction col to sql db, add direction param to session_create, log dtmf digits to digits_dialed variable for cdr Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_sqldb.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Feb 23 10:31:59 2009 @@ -139,7 +139,7 @@ \param pool memory_pool to use for allocation \return SWITCH_STATUS_SUCCESS if successful */ -SWITCH_DECLARE(switch_status_t) switch_channel_alloc(_In_ switch_channel_t **channel, _In_ switch_memory_pool_t *pool); +SWITCH_DECLARE(switch_status_t) switch_channel_alloc(_In_ switch_channel_t **channel, _In_ switch_call_direction_t direction, _In_ switch_memory_pool_t *pool); /*! \brief Connect a newly allocated channel to a session object and setup it's initial state Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Feb 23 10:31:59 2009 @@ -529,9 +529,10 @@ \param pool the pool to use for the allocation (a new one will be used if NULL) \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ switch_endpoint_interface_t *endpoint_interface, +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(_In_ switch_endpoint_interface_t *endpoint_interface, + _In_ switch_call_direction_t direction, _Inout_opt_ switch_memory_pool_t **pool, _In_opt_z_ const char *use_uuid); -#define switch_core_session_request(_ep, _p) switch_core_session_request_uuid(_ep, _p, NULL) +#define switch_core_session_request(_ep, _d, _p) switch_core_session_request_uuid(_ep, _d, _p, NULL) SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session_t *session, const char *use_uuid); @@ -565,7 +566,9 @@ \param pool the pool to use \return the newly created session */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(_In_z_ const char *endpoint_name, _Inout_ switch_memory_pool_t **pool); +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(_In_z_ const char *endpoint_name, + _In_ switch_call_direction_t direction, + _Inout_ switch_memory_pool_t **pool); /*! \brief Launch the session thread (state machine) on a given session Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Feb 23 10:31:59 2009 @@ -168,6 +168,7 @@ #define SWITCH_UUID_BRIDGE "uuid_bridge" #define SWITCH_BITS_PER_BYTE 8 #define SWITCH_DEFAULT_FILE_BUFFER_LEN 65536 +#define SWITCH_DTMF_LOG_LEN 1000 typedef uint8_t switch_byte_t; @@ -177,6 +178,11 @@ } switch_dtmf_t; typedef enum { + SWITCH_CALL_DIRECTION_INBOUND, + SWITCH_CALL_DIRECTION_OUTBOUND +} switch_call_direction_t; + +typedef enum { SBF_DIAL_ALEG = (1 << 0), SBF_EXEC_ALEG = (1 << 1), SBF_DIAL_BLEG = (1 << 2), 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 Mon Feb 23 10:31:59 2009 @@ -604,7 +604,7 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", conference->name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_ROUTING"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", conference->count == 1 ? "early" : "confirmed"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", conference->count == 1 ? "outbound" : "inbound"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "presence-call-direction", conference->count == 1 ? "outbound" : "inbound"); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon Feb 23 10:31:59 2009 @@ -617,7 +617,7 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", wait_count > 0 ? "CS_ROUTING" : "CS_HANGUP"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", node->name); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", wait_count > 0 ? "early" : "terminated"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", "inbound"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "presence-call-direction", "inbound"); switch_event_fire(&event); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Mon Feb 23 10:31:59 2009 @@ -757,7 +757,7 @@ switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(&channel_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(&channel_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; @@ -1412,7 +1412,7 @@ } dest = argv[0]; - if ((session = switch_core_session_request(&channel_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(&channel_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { private_t *tech_pvt; switch_channel_t *channel; char *dialplan = globals.dialplan; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Feb 23 10:31:59 2009 @@ -1569,7 +1569,7 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(dingaling_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(dingaling_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { struct private_object *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile = NULL; @@ -2547,7 +2547,7 @@ status = LDL_STATUS_FALSE; goto done; } - if ((session = switch_core_session_request(dingaling_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(dingaling_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { switch_core_session_add_stream(session, NULL); if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object))) != 0) { Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Feb 23 10:31:59 2009 @@ -702,7 +702,7 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(iax_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(iax_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; @@ -1008,7 +1008,7 @@ switch_core_session_t *session; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel %s!\n", iaxevent->ies.calling_name); - if ((session = switch_core_session_request(iax_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(iax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { switch_core_session_add_stream(session, NULL); if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) { channel = switch_core_session_get_channel(session); Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Feb 23 10:31:59 2009 @@ -214,7 +214,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !switch_test_flag(tech_pvt, TFLAG_BLEG)) { - if (!(b_session = switch_core_session_request(loopback_endpoint_interface, NULL))) { + if (!(b_session = switch_core_session_request(loopback_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure.\n"); goto end; } @@ -648,7 +648,7 @@ switch_channel_pre_answer(channel); } - if ((*new_session = switch_core_session_request(loopback_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(loopback_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Mon Feb 23 10:31:59 2009 @@ -483,7 +483,8 @@ { opal_private_t *tech_pvt; FSManager & mgr = (FSManager &) endpoint.GetManager(); - m_fsSession = switch_core_session_request(mgr.GetSwitchInterface(), NULL); + m_fsSession = switch_core_session_request(mgr.GetSwitchInterface(), + outbound_profile ? SWITCH_CALL_DIRECTION_OUTBOUND : SWITCH_CALL_DIRECTION_INBOUND, NULL); m_fsChannel = switch_core_session_get_channel(m_fsSession); tech_pvt = (opal_private_t *) switch_core_session_alloc(m_fsSession, sizeof(*tech_pvt)); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Feb 23 10:31:59 2009 @@ -708,7 +708,7 @@ switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(portaudio_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; @@ -1668,7 +1668,7 @@ } dest = argv[0]; - if ((session = switch_core_session_request(portaudio_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(portaudio_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { private_t *tech_pvt; switch_channel_t *channel; char *dialplan = globals.dialplan; Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Mon Feb 23 10:31:59 2009 @@ -399,7 +399,7 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(reference_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(reference_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/asterisk/chan_skypiax.c Mon Feb 23 10:31:59 2009 @@ -1852,7 +1852,7 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if ((session = switch_core_session_request(skypiax_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { switch_core_session_add_stream(session, NULL); channel = switch_core_session_get_channel(session); skypiax_tech_init(tech_pvt, session); Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Mon Feb 23 10:31:59 2009 @@ -506,7 +506,7 @@ switch_memory_pool_t ** pool, switch_originate_flag_t flags) { - if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, pool)) != 0) { + if ((*new_session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { private_t *tech_pvt; switch_channel_t *channel; switch_caller_profile_t *caller_profile; @@ -1139,7 +1139,7 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if ((session = switch_core_session_request(skypiax_endpoint_interface, NULL)) != 0) { + if ((session = switch_core_session_request(skypiax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) { switch_core_session_add_stream(session, NULL); channel = switch_core_session_get_channel(session); skypiax_tech_init(tech_pvt, session); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Feb 23 10:31:59 2009 @@ -2335,7 +2335,7 @@ *new_session = NULL; - if (!(nsession = switch_core_session_request(sofia_endpoint_interface, pool))) { + if (!(nsession = switch_core_session_request(sofia_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); goto error; } 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 Feb 23 10:31:59 2009 @@ -4016,9 +4016,9 @@ if (sofia_endpoint_interface) { if (sofia_test_pflag(profile, PFLAG_CALLID_AS_UUID)) { - session = switch_core_session_request_uuid(sofia_endpoint_interface, NULL, sip->sip_call_id->i_id); + session = switch_core_session_request_uuid(sofia_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL, sip->sip_call_id->i_id); } else { - session = switch_core_session_request(sofia_endpoint_interface, NULL); + session = switch_core_session_request(sofia_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Feb 23 10:31:59 2009 @@ -830,7 +830,7 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "unique-id", uuid); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", state); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "astate", state); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-direction", direction); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "presence-call-direction", direction); } switch_event_fire(&event); @@ -1030,7 +1030,7 @@ if (helper->event) { switch_stream_handle_t stream = { 0 }; - const char *direction = switch_str_nil(switch_event_get_header(helper->event, "call-direction")); + const char *direction = switch_str_nil(switch_event_get_header(helper->event, "presence-call-direction")); const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id")); const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state")); const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status")); Modified: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c Mon Feb 23 10:31:59 2009 @@ -202,7 +202,7 @@ *sp = NULL; - if (!(session = switch_core_session_request(openzap_endpoint_interface, NULL))) + if (!(session = switch_core_session_request(openzap_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Initialization Error!\n"); return ZAP_FAIL; @@ -1540,7 +1540,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_outgoing_channel(%p)\n", (void *) session); - if ((*new_session = switch_core_session_request(unicall_endpoint_interface, pool)) == NULL) + if ((*new_session = switch_core_session_request(unicall_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) == NULL) { return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Feb 23 10:31:59 2009 @@ -109,7 +109,9 @@ struct switch_channel { char *name; + switch_call_direction_t direction; switch_queue_t *dtmf_queue; + switch_queue_t *dtmf_log_queue; switch_mutex_t *dtmf_mutex; switch_mutex_t *flag_mutex; switch_mutex_t *state_mutex; @@ -210,7 +212,7 @@ return times; } -SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel, switch_memory_pool_t *pool) +SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel, switch_call_direction_t direction, switch_memory_pool_t *pool) { switch_assert(pool != NULL); @@ -221,7 +223,8 @@ switch_event_create(&(*channel)->variables, SWITCH_EVENT_GENERAL); switch_core_hash_init(&(*channel)->private_hash, pool); - switch_queue_create(&(*channel)->dtmf_queue, 128, pool); + switch_queue_create(&(*channel)->dtmf_queue, SWITCH_DTMF_LOG_LEN, pool); + switch_queue_create(&(*channel)->dtmf_log_queue, SWITCH_DTMF_LOG_LEN, pool); switch_mutex_init(&(*channel)->dtmf_mutex, SWITCH_MUTEX_NESTED, pool); switch_mutex_init(&(*channel)->flag_mutex, SWITCH_MUTEX_NESTED, pool); @@ -229,6 +232,7 @@ switch_mutex_init(&(*channel)->profile_mutex, SWITCH_MUTEX_NESTED, pool); (*channel)->hangup_cause = SWITCH_CAUSE_NONE; (*channel)->name = ""; + (*channel)->direction = direction; return SWITCH_STATUS_SUCCESS; } @@ -355,7 +359,12 @@ if (switch_queue_trypop(channel->dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { dt = (switch_dtmf_t *) pop; *dtmf = *dt; - free(dt); + + if (switch_queue_trypush(channel->dtmf_log_queue, dt) != SWITCH_STATUS_SUCCESS) { + free(dt); + } + + dt = NULL; if (dtmf->duration > switch_core_max_dtmf_duration(0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", @@ -404,14 +413,21 @@ switch_mutex_lock(channel->dtmf_mutex); while (switch_queue_trypop(channel->dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) { - switch_safe_free(pop); + switch_dtmf_t *dt = (switch_dtmf_t *) pop; + if (channel->state >= CS_HANGUP || switch_queue_trypush(channel->dtmf_log_queue, dt) != SWITCH_STATUS_SUCCESS) { + free(dt); + } } switch_mutex_unlock(channel->dtmf_mutex); } SWITCH_DECLARE(void) switch_channel_uninit(switch_channel_t *channel) { + void *pop; switch_channel_flush_dtmf(channel); + while (switch_queue_trypop(channel->dtmf_log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + switch_safe_free(pop); + } switch_core_hash_destroy(&channel->private_hash); switch_mutex_lock(channel->profile_mutex); switch_event_destroy(&channel->variables); @@ -2234,6 +2250,9 @@ switch_time_t uduration = 0, legbillusec = 0, billusec = 0, progresssec = 0, progressusec = 0, progress_mediasec = 0, progress_mediausec = 0; time_t tt_created = 0, tt_answered = 0, tt_progress = 0, tt_progress_media = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created, mtt_progress = 0, mtt_progress_media = 0; + void *pop; + char dtstr[SWITCH_DTMF_LOG_LEN+1] = ""; + int x = 0; if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) { return SWITCH_STATUS_FALSE; @@ -2256,6 +2275,22 @@ cid_buf = caller_profile->caller_id_number; } + while (x < SWITCH_DTMF_LOG_LEN && switch_queue_trypop(channel->dtmf_log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + switch_dtmf_t *dt = (switch_dtmf_t *) pop; + + if (dt) { + dtstr[x++] = dt->digit; + free(dt); + dt = NULL; + } + } + + if (x) { + switch_channel_set_variable(channel, "digits_dialed", dtstr); + } else { + switch_channel_set_variable(channel, "digits_dialed", "none"); + } + if (caller_profile->times) { switch_time_exp_t tm; switch_size_t retsize; Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Feb 23 10:31:59 2009 @@ -269,6 +269,8 @@ switch_assert(channel != NULL); + switch_channel_set_flag(channel, CF_OUTBOUND); + forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); if (!switch_strlen_zero(forwardvar)) { forwardval = atoi(forwardvar) - 1; @@ -1043,7 +1045,10 @@ } SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_endpoint_interface_t - *endpoint_interface, switch_memory_pool_t **pool, const char *use_uuid) + *endpoint_interface, + switch_call_direction_t direction, + switch_memory_pool_t **pool, + const char *use_uuid) { switch_memory_pool_t *usepool; switch_core_session_t *session; @@ -1091,10 +1096,14 @@ session = switch_core_alloc(usepool, sizeof(*session)); session->pool = usepool; - if (switch_channel_alloc(&session->channel, session->pool) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_alloc(&session->channel, direction, session->pool) != SWITCH_STATUS_SUCCESS) { abort(); } + if (direction == SWITCH_CALL_DIRECTION_OUTBOUND) { + switch_channel_set_flag(session->channel, CF_OUTBOUND); + } + switch_channel_init(session->channel, session, CS_NEW, 0); /* The session *IS* the pool you may not alter it because you have no idea how @@ -1154,7 +1163,9 @@ } -SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(const char *endpoint_name, switch_memory_pool_t **pool) +SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_by_name(const char *endpoint_name, + switch_call_direction_t direction, + switch_memory_pool_t **pool) { switch_endpoint_interface_t *endpoint_interface; switch_core_session_t *session; @@ -1164,7 +1175,7 @@ return NULL; } - session = switch_core_session_request(endpoint_interface, pool); + session = switch_core_session_request(endpoint_interface, direction, pool); UNPROTECT_INTERFACE(endpoint_interface); Modified: freeswitch/trunk/src/switch_core_sqldb.c ============================================================================== --- freeswitch/trunk/src/switch_core_sqldb.c (original) +++ freeswitch/trunk/src/switch_core_sqldb.c Mon Feb 23 10:31:59 2009 @@ -275,8 +275,10 @@ break; } case SWITCH_EVENT_CHANNEL_CREATE: - sql = switch_mprintf("insert into channels (uuid,created,created_epoch, name,state,dialplan,context) values('%q','%q','%ld','%q','%q','%q','%q')", + sql = switch_mprintf("insert into channels (uuid,direction,created,created_epoch, name,state,dialplan,context) " + "values('%q','%q','%q','%ld','%q','%q','%q','%q')", switch_event_get_header_nil(event, "unique-id"), + switch_event_get_header_nil(event, "call-direction"), switch_event_get_header_nil(event, "event-date-local"), (long)switch_epoch_time_now(NULL), switch_event_get_header_nil(event, "channel-name"), @@ -434,6 +436,7 @@ char create_channels_sql[] = "CREATE TABLE channels (\n" " uuid VARCHAR(255),\n" + " direction VARCHAR(255),\n" " created VARCHAR(255),\n" " created_epoch INTEGER,\n" " name VARCHAR(255),\n" Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Feb 23 10:31:59 2009 @@ -1277,7 +1277,7 @@ switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "unique-id", alt_event_type); switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "channel-state", channel_state); switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "answer-state", answer_state); - switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "call-direction", call_direction); + switch_event_add_header_string(pres_event, SWITCH_STACK_TOP, "presence-call-direction", call_direction); switch_event_fire_detailed(file, func, line, &pres_event, NULL); return SWITCH_STATUS_SUCCESS; }

1 0