October 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10215 - in freeswitch/trunk: src src/include w32/Library
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: mikej Date: Fri Oct 31 17:53:07 2008 New Revision: 10215 Added: freeswitch/trunk/src/include/switch_dso.h freeswitch/trunk/src/switch_dso.c Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Log: initial checkin of switch_dso. Added: freeswitch/trunk/src/include/switch_dso.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/include/switch_dso.h Fri Oct 31 17:53:07 2008 @@ -0,0 +1,53 @@ +/* + * Cross Platform dso/dll load abstraction + * Copyright(C) 2008 Michael Jerris + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so. + * + * This work is provided under this license on an "as is" basis, without warranty of any kind, + * either expressed or implied, including, without limitation, warranties that the covered code + * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire + * risk as to the quality and performance of the covered code is with you. Should any covered + * code prove defective in any respect, you (not the initial developer or any other contributor) + * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty + * constitutes an essential part of this license. No use of any covered code is authorized hereunder + * except under this disclaimer. + * + */ + + +#ifndef _SWITCH_DSO_H +#define _SWITCH_DSO_H + +typedef void (*switch_func_ptr_t) (void); +#ifdef WIN32 +typedef HINSTANCE switch_dso_lib_t; +#else +typedef void * switch_dso_lib_t; +#endif +#ifdef WIN32 +typedef FARPROC switch_dso_func_t; +#else +typedef void * switch_dso_func_t; +#endif + +void switch_dso_destroy(switch_dso_lib_t *lib); +switch_dso_lib_t switch_dso_open(const char *path, int global, char **err); +switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err); + + +#endif + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 + */ + Added: freeswitch/trunk/src/switch_dso.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/switch_dso.c Fri Oct 31 17:53:07 2008 @@ -0,0 +1,114 @@ +/* + * Cross Platform dso/dll load abstraction + * Copyright(C) 2008 Michael Jerris + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so. + * + * This work is provided under this license on an "as is" basis, without warranty of any kind, + * either expressed or implied, including, without limitation, warranties that the covered code + * is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire + * risk as to the quality and performance of the covered code is with you. Should any covered + * code prove defective in any respect, you (not the initial developer or any other contributor) + * assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty + * constitutes an essential part of this license. No use of any covered code is authorized hereunder + * except under this disclaimer. + * + */ + +#include <switch.h> +#include "switch_dso.h" +#include <stdlib.h> +#include <string.h> + +#ifdef WIN32 + +void switch_dso_destroy(switch_dso_lib_t *lib) { + if (lib && *lib) { + FreeLibrary(*lib); + *lib = NULL; + } +} + +switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { + HINSTANCE lib; + + lib = LoadLibraryEx(path, NULL, 0); + + if (!lib) { + LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + } + + if (!lib) { + DWORD error = GetLastError(); + *err = switch_mprintf("dll open error [%ul]\n", error); + } + + return lib; +} + +switch_dso_func_t switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { + FARPROC func = GetProcAddress(lib, sym); + if (!func) { + DWORD error = GetLastError(); + *err = switch_mprintf("dll sym error [%ul]\n", error); + } + return func; +} + +#else +/* +** {======================================================================== +** This is an implementation of loadlib based on the dlfcn interface. +** The dlfcn interface is available in Linux, SunOS, Solaris, IRIX, FreeBSD, +** NetBSD, AIX 4.2, HPUX 11, and probably most other Unix flavors, at least +** as an emulation layer on top of native functions. +** ========================================================================= +*/ + + +#include <dlfcn.h> + +void switch_dso_destroy(switch_dso_lib_t *lib) { + if (lib && *lib) { + dlclose(*lib); + *lib = NULL; + } +} + +switch_dso_lib_t switch_dso_open(const char *path, int global, char **err) { + void *lib; + + if (global) { + lib = dlopen(path, RTLD_NOW | RTLD_GLOBAL); + } else { + lib = dlopen(path, RTLD_NOW | RTLD_LOCAL); + } + + if (lib == NULL) { + *err = strdup(dlerror()); + } + return lib; +} + +void *switch_dso_func_sym(switch_dso_lib_t lib, const char *sym, char **err) { + void *func = dlsym(lib, sym); + if (!func) { + *err = strdup(dlerror()); + } + return func; +} +#endif +/* }====================================================== */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 + */ Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Fri Oct 31 17:53:07 2008 @@ -409,6 +409,10 @@ </FileConfiguration> </File> <File + RelativePath="..\..\src\switch_dso.c" + > + </File> + <File RelativePath="..\..\src\switch_event.c" > </File> @@ -571,6 +575,10 @@ > </File> <File + RelativePath="..\..\src\include\switch_dso.h" + > + </File> + <File RelativePath="..\..\src\include\switch_event.h" > </File>

1 0

[commit] r10214 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_voicemail mod/say/mod_say_en
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 16:24:06 2008 New Revision: 10214 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c freeswitch/trunk/src/switch_time.c Log: add tz stuff to mod_say_en, other langs need similar code Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Oct 31 16:24:06 2008 @@ -1655,7 +1655,8 @@ SWITCH_DECLARE(void) switch_core_setrlimits(void); SWITCH_DECLARE(void) switch_time_sync(void); SWITCH_DECLARE(time_t) switch_timestamp(time_t *t); -SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len); +SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len, switch_time_t thetime); +SWITCH_DECLARE(switch_status_t) switch_time_exp_tz_name(const char *tz, switch_time_exp_t *tm, switch_time_t thetime); SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload); SWITCH_DECLARE(switch_bool_t) switch_check_network_list_ip_token(const char *ip_str, const char *list_name, const char **token); #define switch_check_network_list_ip(_ip_str, _list_name) switch_check_network_list_ip_token(_ip_str, _list_name, NULL) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Oct 31 16:24:06 2008 @@ -2763,7 +2763,7 @@ } } - if (switch_strftime_tz(tz_name, format, date, sizeof(date)) == SWITCH_STATUS_SUCCESS) { /* The lookup of the zone may fail. */ + if (switch_strftime_tz(tz_name, format, date, sizeof(date), 0) == SWITCH_STATUS_SUCCESS) { /* The lookup of the zone may fail. */ stream->write_function(stream, "%s", date); } else { stream->write_function(stream, "-ERR Invalid Timezone\n"); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 31 16:24:06 2008 @@ -1983,11 +1983,23 @@ } - x_params = switch_xml_child(x_user, "params"); + thepass = thehash = NULL; switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", myid, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, prefs_callback, &cbt); + + x_params = switch_xml_child(x_user, "variables"); + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr_soft(x_param, "name"); + const char *val = switch_xml_attr_soft(x_param, "value"); + + if (!strcasecmp(var, "timezone")) { + switch_channel_set_variable(channel, var, val); + } + } + + x_params = switch_xml_child(x_user, "params"); for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); @@ -2012,6 +2024,9 @@ vm_email = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "storage-dir")) { vm_storage_dir = switch_core_session_strdup(session, val); + + } else if (!strcasecmp(var, "timezone")) { + switch_channel_set_variable(channel, var, val); } } @@ -2188,6 +2203,16 @@ filename = path; } + x_params = switch_xml_child(x_user, "variables"); + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr_soft(x_param, "name"); + const char *val = switch_xml_attr_soft(x_param, "value"); + + if (!strcasecmp(var, "timezone")) { + vm_timezone = switch_core_strdup(pool, val); + } + } + x_params = switch_xml_child(x_user, "params"); for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { @@ -2297,7 +2322,7 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date)) != SWITCH_STATUS_SUCCESS)) { + if (switch_strlen_zero(vm_timezone) || (switch_strftime_tz(vm_timezone, profile->date_fmt, date, sizeof(date), 0) != SWITCH_STATUS_SUCCESS)) { switch_time_exp_lt(&tm, switch_timestamp_now()); switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); } Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Fri Oct 31 16:24:06 2008 @@ -266,7 +266,9 @@ switch_time_t target = 0; switch_time_exp_t tm; uint8_t say_date = 0, say_time = 0; - + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *tz = switch_channel_get_variable(channel, "timezone"); + if (type == SST_TIME_MEASUREMENT) { int64_t hours = 0; int64_t minutes = 0; @@ -291,7 +293,7 @@ } } } else { - if ((seconds = atoi(tosay)) <= 0) { + if ((seconds = atol(tosay)) <= 0) { seconds = (int64_t) switch_timestamp(NULL); } @@ -347,12 +349,22 @@ return SWITCH_STATUS_SUCCESS; } - if ((t = atoi(tosay)) > 0) { + if ((t = atol(tosay)) > 0) { target = switch_time_make(t, 0); } else { target = switch_timestamp_now(); } - switch_time_exp_lt(&tm, target); + + if (tz) { + int check = atoi(tz); + if (check) { + switch_time_exp_tz(&tm, target, check); + } else { + switch_time_exp_tz_name(tz, &tm, target); + } + } else { + switch_time_exp_lt(&tm, target); + } switch (type) { case SST_CURRENT_DATE_TIME: Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Fri Oct 31 16:24:06 2008 @@ -543,9 +543,39 @@ static void tztime(const time_t * const timep, const char *tzstring, struct tm * const tmp ); -SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len) +SWITCH_DECLARE(switch_status_t) switch_time_exp_tz_name(const char *tz, switch_time_exp_t *tm, switch_time_t thetime) +{ + struct tm xtm = { 0 }; + const char *tz_name = tz; + const char *tzdef; + time_t timep; + + if (!thetime) { + thetime = switch_timestamp_now(); + } + + timep = (thetime) / (int64_t) (1000000); + + if (!switch_strlen_zero(tz_name)) { + tzdef = switch_lookup_timezone( tz_name ); + } else { + /* We set the default timezone to GMT. */ + tz_name="GMT"; + tzdef="GMT"; + } + + if (tzdef) { /* The lookup of the zone may fail. */ + tztime( &timep, tzdef, &xtm ); + tm2switchtime( &xtm, tm); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + +} + +SWITCH_DECLARE(switch_status_t) switch_strftime_tz(const char *tz, const char *format, char *date, size_t len, switch_time_t thetime) { - switch_time_t thetime; time_t timep; const char *tz_name = tz; @@ -556,7 +586,9 @@ struct tm tm = { 0 }; switch_time_exp_t stm; - thetime = switch_timestamp_now(); + if (!thetime) { + thetime = switch_timestamp_now(); + } timep = (thetime) / (int64_t) (1000000);

1 0

[commit] r10213 - in freeswitch/trunk: . libs/win32/apr-util
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: mikej Date: Fri Oct 31 16:08:21 2008 New Revision: 10213 Added: freeswitch/trunk/Freeswitch.2005.unsupported.sln (props changed) - copied unchanged from r10210, /freeswitch/trunk/Freeswitch.sln Removed: freeswitch/trunk/Freeswitch.sln Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj Log: fix 2005 build Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj Fri Oct 31 16:08:21 2008 @@ -546,7 +546,6 @@ > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -556,7 +555,6 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -570,7 +568,6 @@ > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -580,7 +577,6 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -594,7 +590,6 @@ > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -604,7 +599,6 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -866,7 +860,6 @@ > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -876,7 +869,6 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -913,6 +905,104 @@ /> </FileConfiguration> </File> + <Filter + Name="misc" + > + <File + RelativePath="..\..\apr-util\misc\apr_date.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_queue.c" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_reslist.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\apr-util\misc\apr_rmm.c" + > + <FileConfiguration + Name="Debug|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + /> + </FileConfiguration> + </File> + </Filter> </Filter> <Filter Name="ldap" @@ -991,104 +1081,6 @@ </File> </Filter> <Filter - Name="misc" - > - <File - RelativePath="..\..\apr-util\misc\apr_date.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\apr-util\misc\apr_queue.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\apr-util\misc\apr_reslist.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\..\apr-util\misc\apr_rmm.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="" - /> - </FileConfiguration> - </File> - </Filter> - <Filter Name="sdbm" > <File @@ -1312,7 +1304,6 @@ > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool" @@ -1322,7 +1313,6 @@ </FileConfiguration> <FileConfiguration Name="Release|Win32" - ExcludedFromBuild="true" > <Tool Name="VCCLCompilerTool"

1 0

[commit] r10212 - in freeswitch/trunk: libs/libdingaling/src src/mod/applications/mod_enum
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 15:14:19 2008 New Revision: 10212 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: add more debugging Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Fri Oct 31 15:14:19 2008 @@ -1474,7 +1474,7 @@ case IKS_OK: break; case IKS_NET_NODNS: - globals.logger(DL_LOG_DEBUG, "hostname lookup failed\n"); + globals.logger(DL_LOG_DEBUG, "hostname lookup failed for %s\n", handle->server); microsleep(1000); goto fail; case IKS_NET_NOCONN: 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 Fri Oct 31 15:14:19 2008 @@ -685,6 +685,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { dest = argv[0]; root = argv[1]; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Looking up %s@%s\n", dest, root); if (enum_lookup(root, dest, &results) == SWITCH_STATUS_SUCCESS) { for (rp = results; rp; rp = rp->next) { if (!rp->supported) {

1 0

[commit] r10211 - in freeswitch/trunk/src: . mod/applications/mod_voicemail mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: mikej Date: Fri Oct 31 14:22:00 2008 New Revision: 10211 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_utils.c Log: windows build fixes. Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Oct 31 14:22:00 2008 @@ -2249,21 +2249,21 @@ if (insert_db && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { char *usql; - switch_event_t *params; + switch_event_t *message_event; - switch_event_create_subclass(&params, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Action", "leave-message"); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-User", myid); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Name", caller_id_name); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Number", caller_id_number); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-File-Path", file_path); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Flags", read_flags); - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Message-Len", "%u", message_len); - switch_event_add_header(params, SWITCH_STACK_BOTTOM, "VM-Timestamp", "%lu", (unsigned long) switch_timestamp(NULL)); + switch_event_create_subclass(&message_event, SWITCH_EVENT_CUSTOM, VM_EVENT_MAINT); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Action", "leave-message"); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-User", myid); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Domain", domain_name); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Name", caller_id_name); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Caller-ID-Number", caller_id_number); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-File-Path", file_path); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Flags", read_flags); + switch_event_add_header_string(message_event, SWITCH_STACK_BOTTOM, "VM-Folder", myfolder); + switch_event_add_header(message_event, SWITCH_STACK_BOTTOM, "VM-Message-Len", "%u", message_len); + switch_event_add_header(message_event, SWITCH_STACK_BOTTOM, "VM-Timestamp", "%lu", (unsigned long) switch_timestamp(NULL)); - switch_event_fire(&params); + switch_event_fire(&message_event); usql = switch_mprintf("insert into voicemail_msgs values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','%u','','%q')", (long) switch_timestamp(NULL), myid, domain_name, uuid_str, caller_id_name, caller_id_number, 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 Fri Oct 31 14:22:00 2008 @@ -1205,8 +1205,7 @@ id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); contact = sofia_glue_get_url_from_contact(o_contact, 1); - if ((route = strstr(o_contact, ";fs_path="))) { - route = strdup(route + 9); + if ((route = strstr(o_contact, ";fs_path=")) && (route = strdup(route + 9))) { for (p = route; p && *p ; p++) { if (*p == '>' || *p == ';') { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Fri Oct 31 14:22:00 2008 @@ -1071,7 +1071,7 @@ switch_assert(buf); *buf = '\0'; if (sa) { - getnameinfo(sa, salen, buf, len, NULL, 0, NI_NUMERICHOST); + getnameinfo(sa, salen, buf, (socklen_t)len, NULL, 0, NI_NUMERICHOST); } return buf; }

1 0

[commit] r10210 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 13:18:45 2008 New Revision: 10210 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: silence warning 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 Fri Oct 31 13:18:45 2008 @@ -1172,6 +1172,8 @@ } } + switch_assert(globals.read_codec.implementation); + if (!globals.write_codec.implementation) { if (switch_core_codec_init(&globals.write_codec, "L16",

1 0

[commit] r10209 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 13:14:48 2008 New Revision: 10209 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: swigall 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 Fri Oct 31 13:14:48 2008 @@ -4664,30 +4664,6 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_signal_lock(void * jarg1) { - int jresult ; - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - switch_status_t result; - - arg1 = (switch_core_session_t *)jarg1; - result = (switch_status_t)switch_core_session_signal_lock(arg1); - jresult = result; - return jresult; -} - - -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_signal_unlock(void * jarg1) { - int jresult ; - switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; - switch_status_t result; - - arg1 = (switch_core_session_t *)jarg1; - result = (switch_status_t)switch_core_session_signal_unlock(arg1); - jresult = result; - return jresult; -} - - SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_read_lock(void * jarg1) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; 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 Fri Oct 31 13:14:48 2008 @@ -970,16 +970,6 @@ return ret; } - public static switch_status_t switch_core_session_signal_lock(SWIGTYPE_p_switch_core_session session) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_signal_lock(SWIGTYPE_p_switch_core_session.getCPtr(session)); - return ret; - } - - public static switch_status_t switch_core_session_signal_unlock(SWIGTYPE_p_switch_core_session session) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_signal_unlock(SWIGTYPE_p_switch_core_session.getCPtr(session)); - return ret; - } - public static switch_status_t switch_core_session_read_lock(SWIGTYPE_p_switch_core_session session) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_read_lock(SWIGTYPE_p_switch_core_session.getCPtr(session)); return ret; @@ -5271,12 +5261,6 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_destroy")] public static extern int switch_core_destroy(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_signal_lock")] - public static extern int switch_core_session_signal_lock(HandleRef jarg1); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_signal_unlock")] - public static extern int switch_core_session_signal_unlock(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_read_lock")] public static extern int switch_core_session_read_lock(HandleRef jarg1); @@ -22730,7 +22714,8 @@ SWITCH_STATUS_NOTFOUND, SWITCH_STATUS_UNLOAD, SWITCH_STATUS_NOUNLOAD, - SWITCH_STATUS_IGNORE + SWITCH_STATUS_IGNORE, + SWITCH_STATUS_NOT_INITALIZED } }

1 0

[commit] r10208 - freeswitch/trunk/src
by Freeswitch SVN 31 Oct '08

31 Oct '08

Author: anthm Date: Fri Oct 31 11:20:18 2008 New Revision: 10208 Modified: freeswitch/trunk/src/switch_core_session.c Log: one more for good measure Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Oct 31 11:20:18 2008 @@ -57,10 +57,11 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_channel_get_state(session->channel) >= CS_HANGUP || + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || + switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL;

1 0

[commit] r10207 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 19:37:16 2008 New Revision: 10207 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: update filters to have optional - prefix to omit a match within a match from the positive filter 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 Thu Oct 30 19:37:16 2008 @@ -239,22 +239,51 @@ } } - if (send && l->filters) { + if (send && l->filters && l->filters->headers) { switch_event_header_t *hp; const char *hval; send = 0; switch_mutex_lock(l->filter_mutex); - for (hp = l->filters->headers; hp && !send; hp = hp->next) { + for (hp = l->filters->headers; hp; hp = hp->next) { if ((hval = switch_event_get_header(event, hp->name))) { + const char *comp_to = hp->value; + int pos = 1, cmp = 0; + + while (comp_to && *comp_to) { + if (*comp_to == '+') { + pos = 1; + } else if (*comp_to == '-') { + pos = 0; + } else if (*comp_to != ' ') { + break; + } + comp_to++; + } + + if (send && pos) { + continue; + } + + if (!comp_to) { + continue; + } + if (*hp->value == '/') { switch_regex_t *re = NULL; int ovector[30]; - send = switch_regex_perform(hval, hp->value, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); + cmp = !!switch_regex_perform(hval, comp_to, &re, ovector, sizeof(ovector) / sizeof(ovector[0])); switch_regex_safe_free(re); } else { - if (!strcasecmp(hp->value, hval)) { + cmp = !strcasecmp(hval, comp_to); + } + + if (cmp) { + if (pos) { send = 1; + } else { + send = 0; + break; } } }

1 0

[commit] r10206 - in freeswitch/trunk/src: . include include/private mod/endpoints/mod_iax mod/endpoints/mod_sofia
by Freeswitch SVN 30 Oct '08

30 Oct '08

Author: anthm Date: Thu Oct 30 18:40:39 2008 New Revision: 10206 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_core_state_machine.c Log: redo some stuff Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Thu Oct 30 18:40:39 2008 @@ -121,7 +121,6 @@ switch_mutex_t *mutex; switch_mutex_t *resample_mutex; - switch_mutex_t *signal_mutex; switch_thread_cond_t *cond; switch_thread_rwlock_t *rwlock; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Oct 30 18:40:39 2008 @@ -297,9 +297,6 @@ ///\ingroup core1 ///\{ -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session); -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session); - #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(_In_ switch_core_session_t *session, const char *file, const char *func, int line); #endif 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 Thu Oct 30 18:40:39 2008 @@ -938,7 +938,6 @@ if ((tech_pvt = iax_get_private(iaxevent->session))) { channel = switch_core_session_get_channel(tech_pvt->session); - switch_core_session_signal_lock(tech_pvt->session); } if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) { @@ -1122,9 +1121,6 @@ } iax_event_free(iaxevent); switch_mutex_unlock(globals.mutex); - if (tech_pvt && tech_pvt->session) { - switch_core_session_signal_unlock(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 Thu Oct 30 18:40:39 2008 @@ -292,7 +292,7 @@ switch_core_session_rwunlock(a_session); } - switch_mutex_lock(tech_pvt->profile->flag_mutex); + if (tech_pvt->nh && !switch_test_flag(tech_pvt, TFLAG_BYE)) { char reason[128] = ""; @@ -326,6 +326,7 @@ switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } + switch_mutex_lock(tech_pvt->sofia_mutex); if (switch_test_flag(tech_pvt, TFLAG_ANS)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); @@ -357,10 +358,12 @@ TAG_END()); } } + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag(tech_pvt, TFLAG_BYE); switch_safe_free(stream.data); } + switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_clear_flag(tech_pvt, TFLAG_IO); tech_pvt->profile->inuse--; switch_mutex_unlock(tech_pvt->profile->flag_mutex); @@ -416,23 +419,21 @@ /* This if statement check and handles the 3pcc proxy mode */ if ((tech_pvt->profile->pflags & PFLAG_3PCC_PROXY) && switch_test_flag(tech_pvt, TFLAG_3PCC)) { /* Send the 200 OK */ + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n"); /* Unlock the session signal to allow the ack to make it in */ // Maybe we should timeout? - switch_core_session_signal_unlock(session); + while(switch_channel_ready(channel) && !switch_test_flag(tech_pvt, TFLAG_3PCC_HAS_ACK)) { switch_yield(1000); } - // if we never got the ack should we PUNT? - /* Get the lock back before we continue */ - switch_core_session_signal_lock(session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n"); } @@ -452,7 +453,9 @@ if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + //switch_mutex_lock(tech_pvt->sofia_mutex); //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //switch_mutex_unlock(tech_pvt->sofia_mutex); return SWITCH_STATUS_FALSE; } } @@ -491,7 +494,7 @@ } - + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, NUTAG_AUTOANSWER(0), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), @@ -499,7 +502,7 @@ SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); - + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_ANS); return SWITCH_STATUS_SUCCESS; @@ -796,7 +799,9 @@ case DTMF_INFO: snprintf(message, sizeof(message), "Signal=%c\r\nDuration=%d\r\n", dtmf->digit, dtmf->duration / 8); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/dtmf-relay"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); break; default: break; @@ -831,10 +836,15 @@ " <media_control>\r\n" " <vc_primitive>\r\n" " <to_encoder>\r\n" - " <picture_fast_update>\r\n" " </picture_fast_update>\r\n" " </to_encoder>\r\n" " </vc_primitive>\r\n" " </media_control>\r\n"; + " <picture_fast_update>\r\n" + " </picture_fast_update>\r\n" + " </to_encoder>\r\n" + " </vc_primitive>\r\n" + " </media_control>\r\n"; + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/media_control+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); - + switch_mutex_unlock(tech_pvt->sofia_mutex); } break; @@ -851,10 +861,12 @@ if (ip && port) { sofia_glue_set_local_sdp(tech_pvt, ip, atoi(port), msg->string_arg, 1); } + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_answered(channel); } break; @@ -936,7 +948,9 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -948,7 +962,9 @@ if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -1007,7 +1023,9 @@ if (!switch_strlen_zero(msg->string_arg)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_set_flag_locked(tech_pvt, TFLAG_BYE); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg); @@ -1024,8 +1042,9 @@ } else { switch_set_string(ref_to, msg->string_arg); } - + switch_mutex_lock(tech_pvt->sofia_mutex); nua_refer(tech_pvt->nh, SIPTAG_REFER_TO_STR(ref_to), SIPTAG_REFERRED_BY_STR(tech_pvt->contact_url), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } break; @@ -1082,9 +1101,11 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); if (!switch_channel_test_flag(channel, CF_ANSWERED)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } @@ -1104,12 +1125,16 @@ sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt); } + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } else { + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); @@ -1121,7 +1146,9 @@ case SWITCH_MESSAGE_INDICATE_RINGING: if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_channel_mark_ring_ready(channel); } break; @@ -1161,7 +1188,9 @@ sofia_glue_tech_prepare_codecs(tech_pvt); if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); + //switch_mutex_lock(tech_pvt->sofia_mutex); //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); + //switch_mutex_unlock(tech_pvt->sofia_mutex); status = SWITCH_STATUS_FALSE; goto end; } @@ -1190,6 +1219,7 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } + switch_mutex_lock(tech_pvt->sofia_mutex); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), @@ -1199,6 +1229,7 @@ SOATAG_ORDERED_USER(1), SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } } break; @@ -1225,11 +1256,13 @@ } if (tech_pvt->hash_key) { + switch_mutex_lock(tech_pvt->sofia_mutex); msg_nh = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_FROM_STR(tech_pvt->chat_from), NUTAG_URL(tech_pvt->chat_to), SIPTAG_TO_STR(tech_pvt->chat_to), SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private); nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR("text/html"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + switch_mutex_unlock(tech_pvt->sofia_mutex); } return SWITCH_STATUS_SUCCESS; @@ -1946,6 +1979,7 @@ goto error; } switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); + switch_mutex_init(&tech_pvt->sofia_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession)); data = switch_core_session_strdup(nsession, outbound_profile->destination_number); if ((dest_to = strchr(data, '^'))) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Oct 30 18:40:39 2008 @@ -467,6 +467,7 @@ unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; + switch_mutex_t *sofia_mutex; switch_payload_t te; switch_payload_t bte; switch_payload_t cng_pt; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Oct 30 18:40:39 2008 @@ -180,6 +180,7 @@ } else if (!switch_strlen_zero(sofia_private->uuid)) { if ((session = switch_core_session_locate(sofia_private->uuid))) { tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt); channel = switch_core_session_get_channel(tech_pvt->session); if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); @@ -196,7 +197,7 @@ } if (session) { - switch_core_session_signal_lock(session); + switch_mutex_lock(tech_pvt->sofia_mutex); if (channel && switch_channel_get_state(channel) >= CS_HANGUP) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n"); @@ -353,7 +354,7 @@ } if (session) { - switch_core_session_signal_unlock(session); + switch_mutex_unlock(tech_pvt->sofia_mutex); switch_core_session_rwunlock(session); } } @@ -3486,6 +3487,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_mutex_init(&tech_pvt->sofia_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); tech_pvt->remote_port = network_port; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Oct 30 18:40:39 2008 @@ -1702,9 +1702,7 @@ const char *var; switch_assert(tech_pvt != NULL); - - switch_core_session_signal_lock(tech_pvt->session); - + switch_mutex_lock(tech_pvt->sofia_mutex); if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { switch_set_flag_locked(tech_pvt, TFLAG_SECURE); @@ -2027,7 +2025,7 @@ end: - switch_core_session_signal_unlock(tech_pvt->session); + switch_mutex_unlock(tech_pvt->sofia_mutex); return status; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Oct 30 18:40:39 2008 @@ -390,7 +390,9 @@ { switch_channel_flush_dtmf(channel); switch_core_hash_destroy(&channel->private_hash); + switch_mutex_lock(channel->profile_mutex); switch_event_destroy(&channel->variables); + switch_mutex_unlock(channel->profile_mutex); } SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, switch_core_session_t *session, switch_channel_state_t state, @@ -562,7 +564,7 @@ { switch_assert(channel != NULL); - if (!switch_strlen_zero(varname)) { + if (channel->variables && !switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); if (!switch_strlen_zero(value)) { @@ -584,7 +586,7 @@ va_list ap; switch_assert(channel != NULL); - if (!switch_strlen_zero(varname)) { + if (channel->variables && !switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Thu Oct 30 18:40:39 2008 @@ -35,15 +35,6 @@ #include <switch.h> #include "private/switch_core_pvt.h" -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session) -{ - return switch_mutex_lock(session->signal_mutex); -} - -SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session) -{ - return switch_mutex_unlock(session->signal_mutex); -} #ifdef SWITCH_DEBUG_RWLOCKS SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(switch_core_session_t *session, const char *file, const char *func, int line) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Oct 30 18:40:39 2008 @@ -57,9 +57,10 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || + switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL; @@ -418,8 +419,6 @@ return status; } - switch_core_session_signal_lock(session); - if (session->endpoint_interface->io_routines->receive_message) { status = session->endpoint_interface->io_routines->receive_message(session, message); } @@ -433,9 +432,6 @@ } switch_core_session_kill_channel(session, SWITCH_SIG_BREAK); - - switch_core_session_signal_unlock(session); - switch_core_session_rwunlock(session); return status; @@ -988,7 +984,6 @@ switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool); switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool); - switch_mutex_init(&session->signal_mutex, SWITCH_MUTEX_NESTED, session->pool); switch_thread_rwlock_create(&session->bug_rwlock, session->pool); switch_thread_cond_create(&session->cond, session->pool); switch_thread_rwlock_create(&session->rwlock, session->pool); Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Oct 30 18:40:39 2008 @@ -396,9 +396,8 @@ do_extra_handlers = 0; } } - switch_core_session_signal_lock(session); + STATE_MACRO(hangup, "HANGUP"); - switch_core_session_signal_unlock(session); hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE); @@ -418,19 +417,13 @@ } goto done; case CS_INIT: /* Basic setup tasks */ - switch_core_session_signal_lock(session); STATE_MACRO(init, "INIT"); - switch_core_session_signal_unlock(session); break; case CS_ROUTING: /* Look for a dialplan and find something to do */ - switch_core_session_signal_lock(session); STATE_MACRO(routing, "ROUTING"); - switch_core_session_signal_unlock(session); break; case CS_RESET: /* Reset */ - switch_core_session_signal_lock(session); STATE_MACRO(reset, "RESET"); - switch_core_session_signal_unlock(session); break; /* These other states are intended for prolonged durations so we do not signal lock for them */ case CS_EXECUTE: /* Execute an Operation */

1 0