- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9907 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Wed Oct 8 21:39:55 2008 New Revision: 9907 Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/vars.xml Log: forgot to add these for internal-ip6 Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Wed Oct 8 21:39:55 2008 @@ -112,6 +112,18 @@    + +  + <param name="tls" value="$${internal_ip6_ssl_enable}"/> +  + <param name="tls-bind-params" value="transport=tls"/> +  + <param name="tls-sip-port" value="5061"/> +  + <param name="tls-cert-dir" value="$${internal_ip6_ssl_dir}"/> +  + <param name="tls-version" value="$${sip_tls_version}"/> + </settings> </profile> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Oct 8 21:39:55 2008 @@ -132,6 +132,9 @@  <X-PRE-PROCESS cmd="set" data="internal_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="internal_ssl_dir=$${base_dir}/conf/ssl"/> +  + <X-PRE-PROCESS cmd="set" data="internal_ip6_ssl_enable=false"/> + <X-PRE-PROCESS cmd="set" data="internal_ip6_ssl_dir=$${base_dir}/conf/ssl"/>  <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/> <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/>

1 0

[commit] r9906 - in freeswitch/trunk/conf: . sip_profiles
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Wed Oct 8 21:13:40 2008 New Revision: 9906 Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/conf/vars.xml Log: more tweaks to the default configs \;\) Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Wed Oct 8 21:13:40 2008 @@ -57,15 +57,15 @@   - <param name="tls" value="false"/> + <param name="tls" value="$${external_ssl_enable}"/>  <param name="tls-bind-params" value="transport=tls"/>  <param name="tls-sip-port" value="5081"/>  - <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/> + <param name="tls-cert-dir" value="$${external_ssl_dir}"/>  - <param name="tls-version" value="tlsv1"/> + <param name="tls-version" value="$${sip_tls_version}"/> </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed Oct 8 21:13:40 2008 @@ -84,15 +84,15 @@   - <param name="tls" value="false"/> + <param name="tls" value="$${internal_ssl_enable}"/>  <param name="tls-bind-params" value="transport=tls"/>  <param name="tls-sip-port" value="5061"/>  - <param name="tls-cert-dir" value="$${base_dir}/conf/ssl"/> + <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>  - <param name="tls-version" value="tlsv1"/> + <param name="tls-version" value="$${sip_tls_version}"/>   Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Oct 8 21:13:40 2008 @@ -124,3 +124,14 @@  <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/> + +  + <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1"/> +  + <X-PRE-PROCESS cmd="set" data="internal_ssl_enable=false"/> + <X-PRE-PROCESS cmd="set" data="internal_ssl_dir=$${base_dir}/conf/ssl"/> +  + <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/> + <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/>

1 0

[commit] r9905 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: brian Date: Wed Oct 8 21:05:14 2008 New Revision: 9905 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: remove debug that is no longer needed 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 Wed Oct 8 21:05:14 2008 @@ -885,7 +885,6 @@ } if (!(nh = nua_handle_by_call_id(profile->nua, call_id))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cannot find handle for %s\n", call_id); goto end; }

1 0

[commit] r9904 - in freeswitch/trunk/src: . include
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: anthm Date: Wed Oct 8 20:38:59 2008 New Revision: 9904 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: per leg timeouts and specific cause codes in reject_on_single_fail Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Oct 8 20:38:59 2008 @@ -1206,7 +1206,8 @@ SWITCH_CAUSE_USER_CHALLENGE = 603, SWITCH_CAUSE_MEDIA_TIMEOUT = 604, SWITCH_CAUSE_PICKED_OFF = 605, - SWITCH_CAUSE_USER_NOT_REGISTERED = 606 + SWITCH_CAUSE_USER_NOT_REGISTERED = 606, + SWITCH_CAUSE_PROGRESS_TIMEOUT = 607 } switch_call_cause_t; typedef enum { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 8 20:38:59 2008 @@ -102,6 +102,7 @@ {"MEDIA_TIMEOUT", SWITCH_CAUSE_MEDIA_TIMEOUT}, {"PICKED_OFF", SWITCH_CAUSE_PICKED_OFF}, {"USER_NOT_REGISTERED", SWITCH_CAUSE_USER_NOT_REGISTERED}, + {"PROGRESS_TIMEOUT", SWITCH_CAUSE_PROGRESS_TIMEOUT}, {NULL, 0} }; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 20:38:59 2008 @@ -163,6 +163,37 @@ switch_thread_create(&thread, thd_attr, collect_thread_run, collect, switch_core_session_get_pool(collect->session)); } +static int check_per_channel_timeouts(switch_channel_t **peer_channels, + uint32_t *per_channel_timelimit_sec, + uint32_t *per_channel_progress_timelimit_sec, + int max, + time_t start) +{ + int x = 0,i; + time_t elapsed = switch_timestamp(NULL) - start; + + for (i = 0; i < max; i++) { + if (peer_channels[i] && switch_channel_get_state(peer_channels[i]) < CS_HANGUP) { + if (per_channel_progress_timelimit_sec[i] && elapsed > per_channel_progress_timelimit_sec[i] && + !( + switch_channel_test_flag(peer_channels[i], CF_RING_READY) || + switch_channel_test_flag(peer_channels[i], CF_ANSWERED) || + switch_channel_test_flag(peer_channels[i], CF_EARLY_MEDIA) + ) + ) { + switch_channel_hangup(peer_channels[i], SWITCH_CAUSE_PROGRESS_TIMEOUT); + x++; + } + if (per_channel_timelimit_sec[i] && elapsed > per_channel_timelimit_sec[i]) { + switch_channel_hangup(peer_channels[i], SWITCH_CAUSE_ALLOTTED_TIMEOUT); + x++; + } + } + } + + return x; +} + static uint8_t check_channel_status(switch_channel_t **peer_channels, switch_core_session_t **peer_sessions, uint32_t len, int32_t *idx, uint32_t *hups, char *file, char *key, uint8_t early_ok, @@ -542,9 +573,12 @@ switch_core_session_message_t *message = NULL; switch_event_t *var_event = NULL; uint8_t fail_on_single_reject = 0; + char *fail_on_single_reject_var = NULL; uint8_t ring_ready = 0; char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; + uint32_t per_channel_timelimit_sec[MAX_PEERS] = { 0 }; + uint32_t per_channel_progress_timelimit_sec[MAX_PEERS] = { 0 }; const char *cid_tmp; *bleg = NULL; @@ -702,8 +736,12 @@ } } /* When using the AND operator, the fail_on_single_reject flag may be set in order to indicate that a single - rejections should terminate the attempt rather than a timeout, answer, or rejection by all. */ + rejections should terminate the attempt rather than a timeout, answer, or rejection by all. + If the value is set to 'true' any fail cause will end the attempt otherwise it can contain a comma (,) separated + list of cause names which should be considered fatal + */ if ((var = switch_event_get_header(var_event, "fail_on_single_reject")) && switch_true(var)) { + fail_on_single_reject_var = strdup(var); fail_on_single_reject = 1; } @@ -968,11 +1006,11 @@ switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", early_ok ? "true" : "false"); - if ((reason = - switch_core_session_outgoing_channel(session, var_event, chan_type, new_profile, &new_session, &pool, - myflags)) != SWITCH_CAUSE_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n", chan_type, - switch_channel_cause2str(reason)); + if ((reason = switch_core_session_outgoing_channel(session, var_event, chan_type, + new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n", + chan_type, switch_channel_cause2str(reason)); + if (pool) { switch_core_destroy_memory_pool(&pool); } @@ -1018,6 +1056,28 @@ switch_event_fire(&event); } + if (peer_channels[i]) { + const char *vvar; + + if ((vvar = switch_channel_get_variable(peer_channels[i], "leg_timeout"))) { + int val = atoi(vvar); + if (val > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg timeout to %d\n", + switch_channel_get_name(peer_channels[0]), val); + per_channel_timelimit_sec[i] = (uint32_t) val; + } + } + + if ((vvar = switch_channel_get_variable(peer_channels[i], "leg_progress_timeout"))) { + int val = atoi(vvar); + if (val > 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg progress timeout to %d\n", + switch_channel_get_name(peer_channels[0]), val); + per_channel_progress_timelimit_sec[i] = (uint32_t) val; + } + } + } + if (!table) { table = &originate_state_handlers; } @@ -1049,6 +1109,7 @@ uint32_t valid_channels = 0; for (i = 0; i < and_argc; i++) { int state; + time_t elapsed; if (!peer_channels[i]) { continue; @@ -1069,22 +1130,27 @@ if (caller_channel && !switch_channel_ready(caller_channel)) { goto notready; } - - if ((switch_timestamp(NULL) - start) > (time_t) timelimit_sec) { + + elapsed = switch_timestamp(NULL) - start; + + if (elapsed > (time_t) timelimit_sec) { to++; idx = IDX_TIMEOUT; goto notready; } - if (!sent_ring && !progress && progress_timelimit_sec && (switch_timestamp(NULL) - start) > (time_t) progress_timelimit_sec) { + if (!sent_ring && !progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) { to++; idx = IDX_TIMEOUT; goto notready; } - + switch_yield(10000); } + check_per_channel_timeouts(peer_channels, per_channel_timelimit_sec, per_channel_progress_timelimit_sec, and_argc, start); + + if (valid_channels == 0) { status = SWITCH_STATUS_GENERR; goto done; @@ -1193,19 +1259,51 @@ while ((!caller_channel || switch_channel_ready(caller_channel)) && check_channel_status(peer_channels, peer_sessions, and_argc, &idx, &hups, file, key, early_ok, &ring_ready, &progress, return_ring_ready)) { - + time_t elapsed = switch_timestamp(NULL) - start; if (caller_channel && !sent_ring && ring_ready && !return_ring_ready) { switch_channel_ring_ready(caller_channel); sent_ring = 1; } /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ - if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) - || (fail_on_single_reject && hups)) { + check_per_channel_timeouts(peer_channels, per_channel_timelimit_sec, per_channel_progress_timelimit_sec, and_argc, start); + + if (!sent_ring && !progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) { idx = IDX_TIMEOUT; goto notready; } + if ((to = (uint8_t) (elapsed >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { + int ok = 0; + + if (fail_on_single_reject_var && !switch_true(fail_on_single_reject_var)) { + ok = 1; + for (i = 0; i < and_argc; i++) { + switch_channel_t *pchannel; + switch_call_cause_t cause; + const char *cause_str; + + if (!peer_sessions[i]) { + continue; + } + pchannel = switch_core_session_get_channel(peer_sessions[i]); + + if (switch_channel_get_state(pchannel) >= CS_HANGUP) { + cause = switch_channel_get_cause(pchannel); + cause_str = switch_channel_cause2str(cause); + if (switch_stristr(cause_str, fail_on_single_reject_var)) { + ok = 0; + break; + } + } + } + } + if (!ok) { + idx = IDX_TIMEOUT; + goto notready; + } + } + if (peer_sessions[0] && switch_core_session_dequeue_message(peer_sessions[0], &message) == SWITCH_STATUS_SUCCESS) { if (session && !ringback_data && or_argc == 1 && and_argc == 1) { /* when there is only 1 channel to call and bridge and no ringback */ @@ -1381,6 +1479,8 @@ done: + switch_safe_free(fail_on_single_reject_var); + *cause = SWITCH_CAUSE_NONE; if (caller_channel && !switch_channel_ready(caller_channel)) {

1 0

[commit] r9903 - freeswitch/trunk
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: mikej Date: Wed Oct 8 20:26:28 2008 New Revision: 9903 Modified: freeswitch/trunk/Freeswitch.2008.sln Log: update for mod_managed name change Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Wed Oct 8 20:26:28 2008 @@ -966,10 +966,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_managed", "src\mod\languages\mod_managed\mod_managed.vcproj", "{7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}" ProjectSection(ProjectDependencies) = postProject + {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} = {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mod_managed_lib", "src\mod\languages\mod_managed\managed\mod_managed_lib.csproj", "{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSWITCH.Managed", "src\mod\languages\mod_managed\managed\FreeSWITCH.Managed.csproj", "{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1688,10 +1689,12 @@ {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|Win32.Build.0 = Release|Win32 {B6A9FB7A-1CC4-442B-812D-EC33E4E4A36E}.Release|x64.ActiveCfg = Release|Win32 {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|Win32.ActiveCfg = Debug_CLR|Win32 + {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|Win32.Build.0 = Debug_CLR|Win32 {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Debug|x64.ActiveCfg = Debug_Mono|Win32 {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|Win32.ActiveCfg = Release_CLR|Win32 {7B42BDA1-72C0-4378-A9B6-5C530F8CD61E}.Release|x64.ActiveCfg = Release_Mono|Win32 {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.ActiveCfg = Debug|Any CPU + {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|Win32.Build.0 = Debug|Any CPU {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Debug|x64.ActiveCfg = Debug|Any CPU {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|Win32.ActiveCfg = Release|Any CPU {834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}.Release|x64.ActiveCfg = Release|Any CPU

1 0

[commit] r9902 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 09 Oct '08

09 Oct '08

Author: michaelgg Date: Wed Oct 8 20:23:18 2008 New Revision: 9902 Added: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj Removed: freeswitch/trunk/src/mod/languages/mod_managed/managed/mod_managed_lib.csproj Log: Add renamed mod_managed_lib project... Added: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj Wed Oct 8 20:23:18 2008 @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{834E2B2F-5483-4B80-8FE3-FE48FF76E5C0}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>FreeSWITCH.Managed</RootNamespace> + <AssemblyName>FreeSWITCH.Managed</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <StartupObject> + </StartupObject> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\..\..\..\Debug\mod\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\..\..\..\..\Release\mod\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Xml.Linq"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data.DataSetExtensions"> + <RequiredTargetFramework>3.5</RequiredTargetFramework> + </Reference> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="ManagedSession.cs" /> + <Compile Include="Loader.cs" /> + <Compile Include="Extensions.cs" /> + <Compile Include="Log.cs" /> + <Compile Include="ApiFunction.cs" /> + <Compile Include="AppFunction.cs" /> + <Compile Include="Demo.cs" /> + <Compile Include="swig.cs" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +  +</Project> \ No newline at end of file

1 0

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

09 Oct '08

Author: michaelgg Date: Wed Oct 8 20:11:21 2008 New Revision: 9901 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: Cleanup: Rename mod_managed_lib to FreeSWITCH.Managed Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/AssemblyInfo.cs Wed Oct 8 20:11:21 2008 @@ -5,11 +5,11 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("mod_managed_lib")] +[assembly: AssemblyTitle("FreeSWITCH.Managed")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("mod_managed_lib")] +[assembly: AssemblyProduct("FreeSWITCH.Managed")] [assembly: AssemblyCopyright("Copyright © 2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs Wed Oct 8 20:11:21 2008 @@ -54,7 +54,7 @@ public static bool Load() { managedDir = Path.Combine(Native.freeswitch.SWITCH_GLOBAL_dirs.mod_dir, "managed"); - Log.WriteLine(LogLevel.Debug, "mod_managed_lib loader is starting with directory '{0}'.", managedDir); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed loader is starting with directory '{0}'.", managedDir); if (!Directory.Exists(managedDir)) { Log.WriteLine(LogLevel.Error, "Managed directory not found: {0}", managedDir); return false; @@ -166,7 +166,7 @@ public static void Unload() { - Log.WriteLine(LogLevel.Debug, "mod_managed_lib Loader is unloading."); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed Loader is unloading."); foreach (var t in functions.Values) { try { var unloadMethod = t.GetMethod("Unload", methodBindingFlags, null, Type.EmptyTypes, null); @@ -271,7 +271,7 @@ /// <summary>Runs an application function.</summary> public static bool Run(string command, IntPtr sessionHandle) { - Log.WriteLine(LogLevel.Debug, "mod_managed_lib: attempting to run application '{0}'.", command); + Log.WriteLine(LogLevel.Debug, "FreeSWITCH.Managed: attempting to run application '{0}'.", command); System.Diagnostics.Debug.Assert(sessionHandle != IntPtr.Zero, "sessionHandle is null."); var parsed = parseCommand(command); if (parsed == null) return false; Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Wed Oct 8 20:11:21 2008 @@ -56,7 +56,7 @@ SWITCH_STANDARD_APP(managed_app_function); /* Run */ SWITCH_STANDARD_API(managed_loadassembly); /* Load assembly */ -#define MOD_MANAGED_ASM_NAME "mod_managed_lib" +#define MOD_MANAGED_ASM_NAME "FreeSWITCH.Managed" #define MOD_MANAGED_ASM_V1 1 #define MOD_MANAGED_ASM_V2 0 #define MOD_MANAGED_ASM_V3 2

1 0

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

08 Oct '08

Author: anthm Date: Wed Oct 8 17:47:41 2008 New Revision: 9900 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: possible fix for MODAPP-153 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 Wed Oct 8 17:47:41 2008 @@ -1546,9 +1546,7 @@ } -static void -update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, - const char *myfolder) +static void update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, const char *myfolder) { char *mwi_id; const char *yn = "no"; @@ -1589,7 +1587,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; - const char *thepass = NULL, *myid = id; + const char *thepass = NULL, *myid = id, *actual_id = NULL; char term = 0; uint32_t timeout, attempts = 0; int failed = 0; @@ -1640,6 +1638,7 @@ play_msg_type = MSG_NONE; attempts = profile->max_login_attempts; myid = id; + actual_id = NULL; mypass = NULL; myfolder = "inbox"; vm_check_state = VM_CHECK_AUTH; @@ -1746,7 +1745,7 @@ vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; - update_mwi(profile, id, domain_name, myfolder); + update_mwi(profile, actual_id, domain_name, myfolder); } break; case VM_CHECK_CONFIG: @@ -1950,6 +1949,10 @@ if (x_box) { myid = switch_core_session_strdup(session, x_box); } + + if (!(actual_id = switch_xml_attr(x_user, "id"))) { + actual_id = id; + } } }

1 0

[commit] r9899 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: anthm Date: Wed Oct 8 16:59:16 2008 New Revision: 9899 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Log: add switch_core_session_get_id function Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Oct 8 16:59:16 2008 @@ -522,6 +522,8 @@ */ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session); + /*! \brief Provide the current session_id \return the total number of allocated sessions since core startup Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Oct 8 16:59:16 2008 @@ -964,6 +964,11 @@ return session_manager.session_count; } +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session) +{ + return session->id; +} + SWITCH_DECLARE(switch_size_t) switch_core_session_id(void) { return session_manager.session_id; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 16:59:16 2008 @@ -1199,6 +1199,7 @@ sent_ring = 1; } /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ + if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { idx = IDX_TIMEOUT; @@ -1282,9 +1283,9 @@ } } else { - switch_yield(1000); + switch_yield(10000); } - + } notready:

1 0

[commit] r9898 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 08 Oct '08

08 Oct '08

Author: brian Date: Wed Oct 8 15:32:25 2008 New Revision: 9898 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: tweak 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 Wed Oct 8 15:32:25 2008 @@ -693,7 +693,7 @@ caller_profile->dialplan = switch_core_strdup(caller_profile->pool, "xml"); } - switch_snprintf(name, sizeof(name), "Loopback/%s-a", caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "loopback/%s-a", caller_profile->destination_number); switch_channel_set_name(channel, name); switch_channel_set_caller_profile(channel, caller_profile);

1 0