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

[Freeswitch-svn] [commit] r10126 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: michaelgg Date: Thu Oct 23 00:33:53 2008 New Revision: 10126 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Log: Missed one cdecl Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Thu Oct 23 00:33:53 2008 @@ -61,7 +61,7 @@ InitManagedSession(ManagedSession.getCPtr(this).Handle, inputCallback, hangupCallback); } DtmfCallback _inputCallbackRef; - Action _hangupCallback; + CdeclAction _hangupCallback; /// <summary>Function to execute when this session hangs up.</summary> public Action HangupFunction { get; set; }

1 0

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

23 Oct '08

Author: michaelgg Date: Thu Oct 23 00:29:13 2008 New Revision: 10125 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/managed/Loader.cs freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: cdecl'd calling conventions 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 Thu Oct 23 00:29:13 2008 @@ -37,18 +37,9 @@ #include <switch.h> #include <switch_cpp.h> - -/* calling conventions for Windows */ -#ifndef MANAGED_STDCALL -#ifdef WIN32 -# define MANAGED_STDCALL __stdcall -# else -# define MANAGED_STDCALL -# endif -#endif - -typedef void (MANAGED_STDCALL *hangupFunction)(void); -typedef char* (MANAGED_STDCALL *inputFunction)(void*, switch_input_type_t); + +typedef void (*hangupFunction)(void); +typedef char* (*inputFunction)(void*, switch_input_type_t); #ifndef _MANAGED 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 Thu Oct 23 00:29:13 2008 @@ -94,16 +94,20 @@ } } + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ExecuteDelegate(string cmd, IntPtr streamH, IntPtr eventH); + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool ExecuteBackgroundDelegate(string cmd); + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool RunDelegate(string cmd, IntPtr session); + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate bool LoadAssemblyDelegate(string filename); static readonly ExecuteDelegate _execute = Execute; static readonly ExecuteBackgroundDelegate _executeBackground = ExecuteBackground; static readonly RunDelegate _run = Run; static readonly LoadAssemblyDelegate _loadAssembly = LoadAssembly; //SWITCH_MOD_DECLARE(void) InitManagedDelegates(runFunction run, executeFunction execute, executeBackgroundFunction executeBackground, loadAssemblyFunction loadAssembly) - [DllImport("mod_managed", CharSet = CharSet.Ansi)] + [DllImport("mod_managed", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)] static extern void InitManagedDelegates(RunDelegate run, ExecuteDelegate execute, ExecuteBackgroundDelegate executeBackground, LoadAssemblyDelegate loadAssembly); // Be rather lenient in finding the Load and Unload methods Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs Thu Oct 23 00:29:13 2008 @@ -38,12 +38,15 @@ { // switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type_t itype) // But, process_callback_result is used to turn a string into a switch_status_t - //using DtmfCallback = Func<IntPtr, Native.switch_input_type_t, string>; + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] delegate string DtmfCallback(IntPtr input, Native.switch_input_type_t itype); + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + delegate void CdeclAction(); + public partial class ManagedSession { // SWITCH_DECLARE(void) InitManagedSession(ManagedSession *session, MonoObject *dtmfDelegate, MonoObject *hangupDelegate) - [DllImport("mod_managed.dll", CharSet = CharSet.Ansi)] + [DllImport("mod_managed.dll", CharSet = CharSet.Ansi, CallingConvention=CallingConvention.Cdecl)] static extern void InitManagedSession(IntPtr sessionPtr, DtmfCallback dtmfDelegate, Action hangupDelegate); /// <summary>Initializes the native ManagedSession. Must be called after Originate.</summary> 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 Thu Oct 23 00:29:13 2008 @@ -68,10 +68,10 @@ mod_managed_globals globals = { 0 }; // Global delegates to call managed functions -typedef int (MANAGED_STDCALL *runFunction)(const char *data, void *sessionPtr); -typedef int (MANAGED_STDCALL *executeFunction)(const char *cmd, void *stream, void *Event); -typedef int (MANAGED_STDCALL *executeBackgroundFunction)(const char* cmd); -typedef int (MANAGED_STDCALL *loadAssemblyFunction)(const char* filename); +typedef int (*runFunction)(const char *data, void *sessionPtr); +typedef int (*executeFunction)(const char *cmd, void *stream, void *Event); +typedef int (*executeBackgroundFunction)(const char* cmd); +typedef int (*loadAssemblyFunction)(const char* filename); static runFunction runDelegate; static executeFunction executeDelegate; static executeBackgroundFunction executeBackgroundDelegate;

1 0

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

23 Oct '08

Author: mikej Date: Wed Oct 22 23:57:16 2008 New Revision: 10124 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: tweak calling conventions. 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 Wed Oct 22 23:57:16 2008 @@ -38,8 +38,17 @@ #include <switch.h> #include <switch_cpp.h> -typedef void (*hangupFunction)(void); -typedef char* (*inputFunction)(void*, switch_input_type_t); +/* calling conventions for Windows */ +#ifndef MANAGED_STDCALL +#ifdef WIN32 +# define MANAGED_STDCALL __stdcall +# else +# define MANAGED_STDCALL +# endif +#endif + +typedef void (MANAGED_STDCALL *hangupFunction)(void); +typedef char* (MANAGED_STDCALL *inputFunction)(void*, switch_input_type_t); #ifndef _MANAGED 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 22 23:57:16 2008 @@ -68,10 +68,10 @@ mod_managed_globals globals = { 0 }; // Global delegates to call managed functions -typedef int (*runFunction)(const char *data, void *sessionPtr); -typedef int (*executeFunction)(const char *cmd, void *stream, void *Event); -typedef int (*executeBackgroundFunction)(const char* cmd); -typedef int (*loadAssemblyFunction)(const char* filename); +typedef int (MANAGED_STDCALL *runFunction)(const char *data, void *sessionPtr); +typedef int (MANAGED_STDCALL *executeFunction)(const char *cmd, void *stream, void *Event); +typedef int (MANAGED_STDCALL *executeBackgroundFunction)(const char* cmd); +typedef int (MANAGED_STDCALL *loadAssemblyFunction)(const char* filename); static runFunction runDelegate; static executeFunction executeDelegate; static executeBackgroundFunction executeBackgroundDelegate;

1 0

[Freeswitch-svn] [commit] r10123 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 23:30:18 2008 New Revision: 10123 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak 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 Wed Oct 22 23:30:18 2008 @@ -413,7 +413,7 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND) && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { if (tech_pvt->bcng_pt) { tech_pvt->cng_pt = tech_pvt->bcng_pt; } else if (!tech_pvt->cng_pt) {

1 0

[Freeswitch-svn] [commit] r10122 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 22:46:36 2008 New Revision: 10122 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tweak 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 Wed Oct 22 22:46:36 2008 @@ -2114,11 +2114,6 @@ tech_pvt->dest_to = tech_pvt->dest; } - switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); - - sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); if (profile->pres_type) { @@ -2130,7 +2125,12 @@ caller_profile = switch_caller_profile_clone(nsession, outbound_profile); caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); + switch_channel_set_flag(nchannel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + + sofia_glue_attach_private(nsession, profile, tech_pvt, dest); + if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); }

1 0

[Freeswitch-svn] [commit] r10121 - freeswitch/trunk/src
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 21:39:04 2008 New Revision: 10121 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Log: build tweaks Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 22 21:39:04 2008 @@ -1534,14 +1534,14 @@ switch_mutex_lock(channel->profile_mutex); channel->caller_profile->times->progress_media = switch_timestamp_now(); if (channel->caller_profile->originator_caller_profile) { - switch_core_session_t *other_session; - if ((other_session = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { + switch_core_session_t *osession; + if ((osession = switch_core_session_locate(channel->caller_profile->originator_caller_profile->uuid))) { switch_channel_t *other_channel; - other_channel = switch_core_session_get_channel(other_session); + other_channel = switch_core_session_get_channel(osession); if (other_channel->caller_profile) { other_channel->caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } - switch_core_session_rwunlock(other_session); + switch_core_session_rwunlock(osession); } channel->caller_profile->originator_caller_profile->times->progress_media = channel->caller_profile->times->progress_media; } 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 22 21:39:04 2008 @@ -878,7 +878,7 @@ for (r = 0; r < or_argc; r++) { uint32_t hups; - char *p, *e = NULL; + char *p, *end = NULL; const char *var_begin, *var_end; reason = SWITCH_CAUSE_NONE; @@ -914,14 +914,14 @@ p = pipe_names[r]; while(p && *p) { if (*p == '[') { - e = switch_find_end_paren(p, '[', ']'); + end = switch_find_end_paren(p, '[', ']'); } - if (e && p && *p == ',') { + if (end && p && *p == ',') { *p = '|'; } - if (p == e) { + if (p == end) { e = NULL; } @@ -937,7 +937,7 @@ for (i = 0; i < and_argc; i++) { char *vdata; - e = NULL; + end = NULL; chan_type = peer_names[i]; while (chan_type && *chan_type && *chan_type == ' ') { @@ -945,12 +945,12 @@ } vdata = chan_type; - e = switch_find_end_paren(vdata, '[', ']'); + end = switch_find_end_paren(vdata, '[', ']'); - if (e) { + if (end) { vdata++; - *e++ = '\0'; - chan_type = e; + *end++ = '\0'; + chan_type = end; } else { vdata = NULL; }

1 0

[Freeswitch-svn] [commit] r10120 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Oct '08

23 Oct '08

Author: mikej Date: Wed Oct 22 21:14:07 2008 New Revision: 10120 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: don't put CN in sdp answer if it was not in the offer. 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 Wed Oct 22 21:14:07 2008 @@ -2114,6 +2114,9 @@ tech_pvt->dest_to = tech_pvt->dest; } + switch_channel_set_flag(nchannel, CF_OUTBOUND); + switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); + sofia_glue_attach_private(nsession, profile, tech_pvt, dest); if (tech_pvt->local_url) { @@ -2127,8 +2130,6 @@ caller_profile = switch_caller_profile_clone(nsession, outbound_profile); caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_profile); - switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (switch_channel_get_state(nchannel) == CS_NEW) { switch_channel_set_state(nchannel, CS_INIT); 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 Wed Oct 22 21:14:07 2008 @@ -413,7 +413,7 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND) && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { if (tech_pvt->bcng_pt) { tech_pvt->cng_pt = tech_pvt->bcng_pt; } else if (!tech_pvt->cng_pt) {

1 0

[Freeswitch-svn] [commit] r10119 - freeswitch/trunk/src/mod/languages/mod_managed/managed
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: michaelgg Date: Wed Oct 22 18:10:58 2008 New Revision: 10119 Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Log: de-oops demo Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Wed Oct 22 18:10:58 2008 @@ -36,68 +36,45 @@ using System.Linq; using System.Text; -namespace FreeSWITCH.Demo -{ - public class AppDemo : AppFunction - { - new protected static bool Load() - { +namespace FreeSWITCH.Demo { + public class AppDemo : AppFunction { + new protected static bool Load() { Log.WriteLine(LogLevel.Info, "Inside AppDemo::Load."); return true; } protected override void Run() { - bool isRecording = false; + Session.Answer(); Session.DtmfReceivedFunction = (d, t) => { - Log.WriteLine(LogLevel.Critical, "RECORDING is {0}", Session.GetVariable("RECORDING")); Log.WriteLine(LogLevel.Info, "Received {0} for {1}.", d, t); - - if (isRecording) { - Log.WriteLine(LogLevel.Info, "Recording: [TRUE] Returning crap"); - return "1"; - } else { - Log.WriteLine(LogLevel.Info, "Recording: [FALSE] Returning null"); - return null; - } + return ""; }; - Session.StreamFile(@"C:\freeswitch\Debug\sounds\en\us\callie\voicemail\8000\vm-hello.wav", 0); - var fn = @"C:\" + Session.GetHashCode() + ".wav"; - isRecording = true; - Session.SetVariable("RECORDING", "true"); - Session.RecordFile(fn, 600, 500, 3); - isRecording = false; - Session.SetVariable("RECORDING", "false"); - Session.sleep(500); - Log.WriteLine(LogLevel.Info, "WW GROUP: Finished Recording file"); - var res = Session.PlayAndGetDigits(1, 1, 3, 3000, "*", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", "1|2|3|9|#"); - Log.WriteLine(LogLevel.Info, "WW GROUP: Message Menu [" + res + "]"); - } - - void hangupHook() - { + Log.WriteLine(LogLevel.Info, "Inside AppDemo.Run (args '{0}'); HookState is {1}. Now will collect digits.", Arguments, Session.HookState); + Session.CollectDigits(5000); // Hanging up here will cause an abort and the next line won't be written + Log.WriteLine(LogLevel.Info, "AppDemo is finishing its run and will now hang up."); + Session.Hangup("USER_BUSY"); + } + + void hangupHook() { Log.WriteLine(LogLevel.Debug, "AppDemo hanging up, UUID: {0}.", this.Uuid); } - protected override bool AbortOnHangup { get { return true; } } + protected override bool AbortOnHangup { get { return true; } } } - public class ApiDemo : ApiFunction - { - new protected static bool Load() - { + public class ApiDemo : ApiFunction { + new protected static bool Load() { Log.WriteLine(LogLevel.Debug, "Inside ApiDemo::Load."); return true; } - public override void ExecuteBackground(string args) - { + public override void ExecuteBackground(string args) { Log.WriteLine(LogLevel.Debug, "ApiDemo on a background thread #({0}), with args '{1}'.", System.Threading.Thread.CurrentThread.ManagedThreadId, args); } - public override void Execute(Native.Stream stream, Native.Event evt, string args) - { + public override void Execute(Native.Stream stream, Native.Event evt, string args) { stream.Write(string.Format("ApiDemo executed with args '{0}' and event type {1}.", args, evt == null ? "<none>" : evt.GetEventType())); }

1 0

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

22 Oct '08

Author: michaelgg Date: Wed Oct 22 18:02:58 2008 New Revision: 10118 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: Make cpp code as unmanaged as possible Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Wed Oct 22 18:02:58 2008 @@ -34,6 +34,10 @@ #include <switch_cpp.h> #include "freeswitch_managed.h" +#ifdef _MANAGED +#pragma unmanaged +#endif + ManagedSession::ManagedSession():CoreSession() { Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/Demo.cs Wed Oct 22 18:02:58 2008 @@ -46,17 +46,31 @@ return true; } - protected override void Run() - { - Session.Answer(); + protected override void Run() { + bool isRecording = false; Session.DtmfReceivedFunction = (d, t) => { + Log.WriteLine(LogLevel.Critical, "RECORDING is {0}", Session.GetVariable("RECORDING")); Log.WriteLine(LogLevel.Info, "Received {0} for {1}.", d, t); - return ""; + + if (isRecording) { + Log.WriteLine(LogLevel.Info, "Recording: [TRUE] Returning crap"); + return "1"; + } else { + Log.WriteLine(LogLevel.Info, "Recording: [FALSE] Returning null"); + return null; + } }; - Log.WriteLine(LogLevel.Info, "Inside AppDemo.Run (args '{0}'); HookState is {1}. Now will collect digits.", Arguments, Session.HookState); - Session.CollectDigits(5000); // Hanging up here will cause an abort and the next line won't be written - Log.WriteLine(LogLevel.Info, "AppDemo is finishing its run and will now hang up."); - Session.Hangup("USER_BUSY"); + Session.StreamFile(@"C:\freeswitch\Debug\sounds\en\us\callie\voicemail\8000\vm-hello.wav", 0); + var fn = @"C:\" + Session.GetHashCode() + ".wav"; + isRecording = true; + Session.SetVariable("RECORDING", "true"); + Session.RecordFile(fn, 600, 500, 3); + isRecording = false; + Session.SetVariable("RECORDING", "false"); + Session.sleep(500); + Log.WriteLine(LogLevel.Info, "WW GROUP: Finished Recording file"); + var res = Session.PlayAndGetDigits(1, 1, 3, 3000, "*", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", @"C:\freeswitch\libs\sounds\en\us\callie\ivr\8000\ivr-sample_submenu.wav", "1|2|3|9|#"); + Log.WriteLine(LogLevel.Info, "WW GROUP: Message Menu [" + res + "]"); } void hangupHook() 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 22 18:02:58 2008 @@ -362,6 +362,9 @@ return SWITCH_STATUS_SUCCESS; } +#ifdef _MANAGED +#pragma unmanaged +#endif SWITCH_STANDARD_API(managedrun_api_function) { if (switch_strlen_zero(cmd)) {

1 0

[Freeswitch-svn] [commit] r10117 - freeswitch/trunk/src
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: mikej Date: Wed Oct 22 17:55:06 2008 New Revision: 10117 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: windows build 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 22 17:55:06 2008 @@ -625,6 +625,7 @@ *e = '\0'; data = e + 1; } else { + int j = 0, k = 0; if (e) { *e = ','; } @@ -633,11 +634,10 @@ goto var_extract_error; } /* swallow the opening bracket */ - int i = 0, j = 0; - while ((data + i) && *(data + i)) { - j = i; i++; + while ((data + k) && *(data + k)) { + j = k; k++; /* note that this affects vars[] */ - data[j] = data[i]; + data[j] = data[k]; } *(--e) = '\0'; data = e + 1;

1 0