October 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r10146 - freeswitch/trunk
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: mikej Date: Fri Oct 24 18:07:15 2008 New Revision: 10146 Modified: freeswitch/trunk/Freeswitch.2008.sln Log: add some missing dependencies causing first build failure (FSBUILD-86) Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Oct 24 18:07:15 2008 @@ -916,6 +916,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flite", "libs\win32\flite\flite.2008.vcproj", "{0AD1177E-1FD8-4643-9391-431467A11084}" + ProjectSection(ProjectDependencies) = postProject + {D5D2BF72-29FE-4982-A9FA-82FDD086DB1B} = {D5D2BF72-29FE-4982-A9FA-82FDD086DB1B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_flite", "src\mod\asr_tts\mod_flite\mod_flite.2008.vcproj", "{66444AEE-554C-11DD-A9F0-8C5D56D89593}" ProjectSection(ProjectDependencies) = postProject @@ -954,6 +957,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libs\win32\libogg\libogg.2008.vcproj", "{0FEEAEC6-4399-4C46-B7DB-62ECE80D15B4}" + ProjectSection(ProjectDependencies) = postProject + {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_snom", "src\mod\applications\mod_snom\mod_snom.2008.vcproj", "{2A3D00C6-588D-4E86-81AC-9EF5EDE86E03}" ProjectSection(ProjectDependencies) = postProject

1 0

[Freeswitch-svn] [commit] r10145 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 16:30:33 2008 New Revision: 10145 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: add data to params Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Oct 24 16:30:33 2008 @@ -205,6 +205,7 @@ switch_assert(params); switch_channel_event_set_data(channel, params); + switch_caller_profile_event_set_data(caller_profile, "Hunt", params); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params); switch_event_destroy(&params);

1 0

[Freeswitch-svn] [commit] r10144 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 16:12:08 2008 New Revision: 10144 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: revert patch Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Oct 24 16:12:08 2008 @@ -204,10 +204,6 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); - if (!switch_strlen_zero(caller_profile->context)) { - switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Hunt-Context", caller_profile->context); - } - switch_channel_event_set_data(channel, params); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params);

1 0

[Freeswitch-svn] [commit] r10143 - freeswitch/trunk/src
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 15:31:41 2008 New Revision: 10143 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: oops Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Oct 24 15:31:41 2008 @@ -954,7 +954,6 @@ } else { vdata = NULL; } - printf("WTF [%s][%s]\n", vdata, chan_type); if ((chan_data = strchr(chan_type, '/')) != 0) { *chan_data = '\0';

1 0

[Freeswitch-svn] [commit] r10142 - freeswitch/trunk/src
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Fri Oct 24 15:25:07 2008 New Revision: 10142 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix parser err Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Oct 24 15:25:07 2008 @@ -917,12 +917,12 @@ end = switch_find_end_paren(p, '[', ']'); } - if (end && p && *p == ',') { + if (end && p < end && *p == ',') { *p = '|'; } if (p == end) { - e = NULL; + end = NULL; } p++; @@ -954,6 +954,7 @@ } else { vdata = NULL; } + printf("WTF [%s][%s]\n", vdata, chan_type); if ((chan_data = strchr(chan_type, '/')) != 0) { *chan_data = '\0';

1 0

[Freeswitch-svn] [commit] r10141 - in freeswitch/trunk: . src/mod/endpoints/mod_loopback
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: mikej Date: Fri Oct 24 12:52:53 2008 New Revision: 10141 Added: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/mod/endpoints/mod_loopback/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: add mod_loopback to windows build Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Oct 24 12:52:53 2008 @@ -980,6 +980,11 @@ {E796E337-DE78-4303-8614-9A590862EE95} = {E796E337-DE78-4303-8614-9A590862EE95} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_loopback", "src\mod\endpoints\mod_loopback\mod_loopback.2008.vcproj", "{B3F424EC-3D8F-417C-B244-3919D5E1A577}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1718,6 +1723,12 @@ {419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.ActiveCfg = Release|Win32 {419C8F80-D858-4B48-A25C-AF4007608137}.Release|Win32.Build.0 = Release|Win32 {419C8F80-D858-4B48-A25C-AF4007608137}.Release|x64.ActiveCfg = Release|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|Win32.ActiveCfg = Debug|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|Win32.Build.0 = Debug|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Debug|x64.ActiveCfg = Debug|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|Win32.ActiveCfg = Release|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|Win32.Build.0 = Release|Win32 + {B3F424EC-3D8F-417C-B244-3919D5E1A577}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1735,6 +1746,7 @@ {FE3540C5-3303-46E0-A69E-D92F775687F1} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {B3F424EC-3D8F-417C-B244-3919D5E1A577} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} Added: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.2008.vcproj Fri Oct 24 12:52:53 2008 @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="mod_loopback" + ProjectGUID="{B3F424EC-3D8F-417C-B244-3919D5E1A577}" + RootNamespace="mod_loopback" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="2" + InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath=".\mod_loopback.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> 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 Fri Oct 24 12:52:53 2008 @@ -130,7 +130,7 @@ NULL, switch_core_session_get_pool(session)); - if (status != SWITCH_STATUS_SUCCESS) { + if (status != SWITCH_STATUS_SUCCESS || !tech_pvt->read_codec.implementation) { goto end; } @@ -206,10 +206,10 @@ switch_caller_profile_t *caller_profile; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { @@ -325,10 +325,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel)); switch_clear_flag_locked(tech_pvt, TFLAG_LINKED); @@ -356,10 +356,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (sig) { case SWITCH_SIG_BREAK: @@ -419,8 +419,7 @@ static switch_status_t channel_on_hibernate(switch_core_session_t *session) { - private_t *tech_pvt = switch_core_session_get_private(session); - switch_assert(tech_pvt != NULL); + switch_assert(switch_core_session_get_private(session)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s HIBERNATE\n", switch_channel_get_name(switch_core_session_get_channel(session))); @@ -448,7 +447,7 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (tech_pvt->other_channel) { switch_channel_queue_dtmf(tech_pvt->other_channel, dtmf); @@ -464,10 +463,10 @@ switch_status_t status = SWITCH_STATUS_FALSE; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_LINKED)) { goto end; @@ -530,10 +529,10 @@ switch_status_t status = SWITCH_STATUS_FALSE; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (switch_test_flag(frame, SFF_CNG) || switch_test_flag(tech_pvt, TFLAG_CNG) || switch_test_flag(tech_pvt, TFLAG_BOWOUT)) { return SWITCH_STATUS_SUCCESS; @@ -594,10 +593,10 @@ private_t *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER:

1 0

[Freeswitch-svn] [commit] r10140 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: mikej Date: Fri Oct 24 11:51:13 2008 New Revision: 10140 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Log: make line endings consistent. Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h Fri Oct 24 11:51:13 2008 @@ -1,146 +1,146 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed - * Copyright (C) 2008, Michael Giagnocavo <mgg(a)packetrino.com> - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed - * - * The Initial Developer of the Original Code is - * Michael Giagnocavo <mgg(a)packetrino.com> - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Michael Giagnocavo <mgg(a)packetrino.com> - * Jeff Lenk <jlenk(a)frontiernet.net> - Modified class to support Dotnet - * - * freeswitch_managed.h -- Header for ManagedSession and globals - * - */ - -#ifndef FREESWITCH_MANAGED_H -#define FREESWITCH_MANAGED_H - -SWITCH_BEGIN_EXTERN_C - -#include <switch.h> -#include <switch_cpp.h> - -typedef void (*hangupFunction)(void); -typedef char* (*inputFunction)(void*, switch_input_type_t); - - -#ifndef _MANAGED -#include <glib.h> -#include <mono/jit/jit.h> -#include <mono/metadata/assembly.h> -#include <mono/metadata/environment.h> -#include <mono/metadata/threads.h> -#include <mono/metadata/debug-helpers.h> -#endif - -#ifndef SWIG -struct mod_managed_globals { - switch_memory_pool_t *pool; -#ifndef _MANAGED - MonoDomain *domain; - MonoAssembly *mod_mono_asm; - switch_bool_t embedded; - - MonoMethod *loadMethod; -#endif -}; -typedef struct mod_managed_globals mod_managed_globals; -extern mod_managed_globals globals; -#endif - -#ifdef _MANAGED -#define ATTACH_THREADS -#else -#define ATTACH_THREADS mono_thread_attach(globals.domain); -#endif - -#ifdef WIN32 -#define RESULT_FREE(x) CoTaskMemFree(x) -#else -#define RESULT_FREE(x) g_free(x) -#endif - -SWITCH_END_EXTERN_C - -#ifdef _MANAGED -// this section remove linker error LNK4248 for these opaque structures - struct switch_core_session {char foo[];}; - struct apr_pool_t {char foo[];}; - struct switch_channel {char foo[];}; - struct apr_thread_t {char foo[];}; - struct switch_hash {char foo[];}; - struct apr_thread_mutex_t {char foo[];}; - struct switch_network_list {char foo[];}; - struct switch_xml_binding {char foo[];}; - struct apr_sockaddr_t {char foo[];}; - struct switch_core_port_allocator {char foo[];}; - struct switch_media_bug {char foo[];}; - struct switch_rtp {char foo[];}; - struct sqlite3_stmt {char foo[];}; - struct switch_buffer {char foo[];}; - struct switch_ivr_menu {char foo[];}; - struct switch_event_node {char foo[];}; - struct switch_ivr_digit_stream_parser {char foo[];}; - struct sqlite3 {char foo[];}; - struct switch_ivr_digit_stream {char foo[];}; - struct real_pcre {char foo[];}; - struct HashElem {char foo[];}; - struct switch_ivr_menu_xml_ctx {char foo[];}; - struct apr_file_t {char foo[];}; - struct apr_thread_rwlock_t {char foo[];}; - struct apr_pollfd_t {char foo[];}; - struct apr_queue_t {char foo[];}; - struct apr_socket_t {char foo[];}; -// LNK Error - -using namespace System; -using namespace System::Reflection; -using namespace System::Runtime::InteropServices; - -public ref class FreeSwitchManaged -{ -public: - static Assembly^ mod_dotnet_managed; - static MethodInfo^ loadMethod; -}; - -#endif - -class ManagedSession : public CoreSession -{ -public: - ManagedSession(void); - ManagedSession(char *uuid); - ManagedSession(switch_core_session_t *session); - virtual ~ManagedSession(); - - virtual bool begin_allow_threads(); - virtual bool end_allow_threads(); - virtual void check_hangup_hook(); - - virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); - - // P/Invoke function pointer to delegates - inputFunction dtmfDelegate; - hangupFunction hangupDelegate; -}; - -#endif +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed + * Copyright (C) 2008, Michael Giagnocavo <mgg(a)packetrino.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - mod_managed + * + * The Initial Developer of the Original Code is + * Michael Giagnocavo <mgg(a)packetrino.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Michael Giagnocavo <mgg(a)packetrino.com> + * Jeff Lenk <jlenk(a)frontiernet.net> - Modified class to support Dotnet + * + * freeswitch_managed.h -- Header for ManagedSession and globals + * + */ + +#ifndef FREESWITCH_MANAGED_H +#define FREESWITCH_MANAGED_H + +SWITCH_BEGIN_EXTERN_C + +#include <switch.h> +#include <switch_cpp.h> + +typedef void (*hangupFunction)(void); +typedef char* (*inputFunction)(void*, switch_input_type_t); + + +#ifndef _MANAGED +#include <glib.h> +#include <mono/jit/jit.h> +#include <mono/metadata/assembly.h> +#include <mono/metadata/environment.h> +#include <mono/metadata/threads.h> +#include <mono/metadata/debug-helpers.h> +#endif + +#ifndef SWIG +struct mod_managed_globals { + switch_memory_pool_t *pool; +#ifndef _MANAGED + MonoDomain *domain; + MonoAssembly *mod_mono_asm; + switch_bool_t embedded; + + MonoMethod *loadMethod; +#endif +}; +typedef struct mod_managed_globals mod_managed_globals; +extern mod_managed_globals globals; +#endif + +#ifdef _MANAGED +#define ATTACH_THREADS +#else +#define ATTACH_THREADS mono_thread_attach(globals.domain); +#endif + +#ifdef WIN32 +#define RESULT_FREE(x) CoTaskMemFree(x) +#else +#define RESULT_FREE(x) g_free(x) +#endif + +SWITCH_END_EXTERN_C + +#ifdef _MANAGED +// this section remove linker error LNK4248 for these opaque structures + struct switch_core_session {char foo[];}; + struct apr_pool_t {char foo[];}; + struct switch_channel {char foo[];}; + struct apr_thread_t {char foo[];}; + struct switch_hash {char foo[];}; + struct apr_thread_mutex_t {char foo[];}; + struct switch_network_list {char foo[];}; + struct switch_xml_binding {char foo[];}; + struct apr_sockaddr_t {char foo[];}; + struct switch_core_port_allocator {char foo[];}; + struct switch_media_bug {char foo[];}; + struct switch_rtp {char foo[];}; + struct sqlite3_stmt {char foo[];}; + struct switch_buffer {char foo[];}; + struct switch_ivr_menu {char foo[];}; + struct switch_event_node {char foo[];}; + struct switch_ivr_digit_stream_parser {char foo[];}; + struct sqlite3 {char foo[];}; + struct switch_ivr_digit_stream {char foo[];}; + struct real_pcre {char foo[];}; + struct HashElem {char foo[];}; + struct switch_ivr_menu_xml_ctx {char foo[];}; + struct apr_file_t {char foo[];}; + struct apr_thread_rwlock_t {char foo[];}; + struct apr_pollfd_t {char foo[];}; + struct apr_queue_t {char foo[];}; + struct apr_socket_t {char foo[];}; +// LNK Error + +using namespace System; +using namespace System::Reflection; +using namespace System::Runtime::InteropServices; + +public ref class FreeSwitchManaged +{ +public: + static Assembly^ mod_dotnet_managed; + static MethodInfo^ loadMethod; +}; + +#endif + +class ManagedSession : public CoreSession +{ +public: + ManagedSession(void); + ManagedSession(char *uuid); + ManagedSession(switch_core_session_t *session); + virtual ~ManagedSession(); + + virtual bool begin_allow_threads(); + virtual bool end_allow_threads(); + virtual void check_hangup_hook(); + + virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); + + // P/Invoke function pointer to delegates + inputFunction dtmfDelegate; + hangupFunction hangupDelegate; +}; + +#endif

1 0

[Freeswitch-svn] [commit] r10139 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: mikej Date: Fri Oct 24 11:50:46 2008 New Revision: 10139 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix windows build. 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 Fri Oct 24 11:50:46 2008 @@ -573,7 +573,11 @@ goto end; } else if (!strcasecmp(wcmd, "destroy-listener")) { char *id = switch_event_get_header(stream->param_event, "listen-id"); - uint32_t idl = (uint32_t) atol(id); + uint32_t idl = 0; + + if (id) { + idl = (uint32_t) atol(id); + } if ((listener = find_listener(idl))) { remove_listener(listener); @@ -589,10 +593,14 @@ } else if (!strcasecmp(wcmd, "check-listener")) { char *id = switch_event_get_header(stream->param_event, "listen-id"); - uint32_t idl = (uint32_t) atol(id); + uint32_t idl = 0; void *pop; - switch_event_t *pevent; + switch_event_t *pevent = NULL; + if (id) { + idl = (uint32_t) atol(id); + } + if (!(listener = find_listener(idl))) { stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); goto end; @@ -604,8 +612,8 @@ stream->write_function(stream, "<events>\n"); while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - pevent = (switch_event_t *) pop; char *etype; + pevent = (switch_event_t *) pop; if (listener->format == EVENT_FORMAT_PLAIN) { etype = "plain"; @@ -1039,7 +1047,7 @@ if (!strncasecmp(cmd, "connect", 7)) { switch_snprintf(reply, reply_len, "+OK"); goto done; - } else if (!strncasecmp(cmd, "sendmsg", 7)) { + } else if (listener->session && !strncasecmp(cmd, "sendmsg", 7)) { if (switch_test_flag(listener, LFLAG_ASYNC)) { if ((status = switch_core_session_queue_private_event(listener->session, event)) == SWITCH_STATUS_SUCCESS) { switch_snprintf(reply, reply_len, "+OK");

1 0

[Freeswitch-svn] [commit] r10138 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Thu Oct 23 20:31:40 2008 New Revision: 10138 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: add patch from stangor Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Thu Oct 23 20:31:40 2008 @@ -204,6 +204,10 @@ switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); + if (!switch_strlen_zero(caller_profile->context)) { + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "Hunt-Context", caller_profile->context); + } + switch_channel_event_set_data(channel, params); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params);

1 0

[Freeswitch-svn] [commit] r10137 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 24 Oct '08

24 Oct '08

Author: anthm Date: Thu Oct 23 20:28:10 2008 New Revision: 10137 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: patch from MODAPP-156 with mods 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 Thu Oct 23 20:28:10 2008 @@ -1983,22 +1983,33 @@ thehash = val; } else if (!strcasecmp(var, "vm-a1-hash")) { vmhash = val; - } else if (!strcasecmp(var, "password")) { - thepass = val; - } else if (!strcasecmp(var, "vm-password")) { + } else if (!auth && !thepass && !strcasecmp(var, "password")) { thepass = val; + } else if (!auth && !strcasecmp(var, "vm-password")) { + if (!switch_strlen_zero(val) && !strcasecmp(val, "user-choose")) { + if (switch_strlen_zero(cbt.password)) { + auth = 1; + } else { + thepass = val; + } + } else { + thepass = val; + } } else if (!strcasecmp(var, "vm-mailto")) { 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 (!switch_strlen_zero(cbt.password) && !thepass) { - thepass = cbt.password; - } + } + } if (vmhash) { thehash = vmhash; } + + if (!auth && !thepass && !switch_strlen_zero(cbt.password)) { + thepass = cbt.password; + } if (!auth) { if (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) {

1 0