October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9798 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: michaelgg Date: Thu Oct 2 15:05:21 2008 New Revision: 9798 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp Log: Or maybe its FreeCoTaskMem 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 Thu Oct 2 15:05:21 2008 @@ -104,7 +104,7 @@ char *result = dtmfDelegate(input, itype); switch_status_t status = process_callback_result(result); - Marshal::FreeHGlobal(IntPtr(result)); // I think this is right + Marshal::FreeCoTaskMem(IntPtr(result)); // I think this is right return status; }

1 0

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

02 Oct '08

Author: michaelgg Date: Thu Oct 2 14:59:09 2008 New Revision: 9797 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/managed/ManagedSession.cs freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp Log: P/Invoke should do all the work for us 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 Thu Oct 2 14:59:09 2008 @@ -74,9 +74,6 @@ // Don't let any callbacks use this CoreSession anymore switch_channel_set_private(channel, "CoreSession", NULL); } - // Free delegates - hangupDelegateHandle.Free(); - dtmfDelegateHandle.Free(); } bool ManagedSession::begin_allow_threads() @@ -91,22 +88,23 @@ void ManagedSession::check_hangup_hook() { - if (!hangupDelegateHandle.IsAllocated) { + if (!hangupDelegate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hangupDelegateHandle didn't get an object."); return; } - ((HangupDelegate^)hangupDelegateHandle.Target)(); + hangupDelegate(); } switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type_t itype) { - if (!dtmfDelegateHandle.IsAllocated) { + if (!dtmfDelegate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dtmfDelegateHandle didn't get an object."); return SWITCH_STATUS_FALSE;; } - char *result = ((InputDelegate^)dtmfDelegateHandle.Target)(input, itype); + char *result = dtmfDelegate(input, itype); switch_status_t status = process_callback_result(result); + Marshal::FreeHGlobal(IntPtr(result)); // I think this is right return status; } 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 2 14:59:09 2008 @@ -99,8 +99,8 @@ using namespace System::Reflection; using namespace System::Runtime::InteropServices; -delegate void HangupDelegate(void); -delegate char* InputDelegate(void* input, switch_input_type_t type); +typedef void (*hangupFunction)(void); +typedef char* (*inputFunction)(void*, switch_input_type_t); public ref class FreeSwitchManaged { @@ -130,8 +130,9 @@ virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); #ifdef _MANAGED - GCHandle dtmfDelegateHandle; // GCHandle to the input delegate - GCHandle hangupDelegateHandle; // GCHandle to the hangup delegate + // P/Invoke function pointer to delegates + inputFunction dtmfDelegate; + hangupFunction hangupDelegate; #else guint32 dtmfDelegateHandle; // GCHandle to the input delegate guint32 hangupDelegateHandle; // GCHandle to the hangup delegate 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 2 14:59:09 2008 @@ -47,8 +47,16 @@ /// <summary>Initializes the native ManagedSession. Must be called after Originate.</summary> public void Initialize() { + // P/Invoke generated function pointers stick around until the delegate is collected + // By sticking the delegates in fields, their lifetime won't be less than the session + // So we don't need to worry about GCHandles and all that.... + // Info here: http://blogs.msdn.com/cbrumme/archive/2003/05/06/51385.aspx + this._inputCallbackRef = inputCallback; + this._hangupCallback = hangupCallback; InitManagedSession(ManagedSession.getCPtr(this).Handle, inputCallback, hangupCallback); } + DtmfCallback _inputCallbackRef; + Action _hangupCallback; /// <summary>Function to execute when this session hangs up.</summary> public Action HangupFunction { get; set; } 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 2 14:59:09 2008 @@ -452,8 +452,7 @@ // Sets up delegates (and anything else needed) on the ManagedSession object // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC // Exported method. - -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, void *dtmfDelegate, void *hangupDelegate) +SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, inputFunction dtmfDelegate, hangupFunction hangupDelegate) { switch_assert(session); if (!session) { @@ -461,8 +460,8 @@ } session->setDTMFCallback(NULL, ""); session->setHangupHook(NULL); - session->dtmfDelegateHandle = GCHandle::Alloc(Marshal::GetDelegateForFunctionPointer(IntPtr(dtmfDelegate), InputDelegate::typeid)); - session->hangupDelegateHandle = GCHandle::Alloc(Marshal::GetDelegateForFunctionPointer(IntPtr(hangupDelegate), HangupDelegate::typeid)); + session->dtmfDelegate = dtmfDelegate; + session->hangupDelegate = hangupDelegate; } switch_status_t loadModDotnetManaged()

1 0

[commit] r9796 - in freeswitch/trunk: libs/xmlrpc-c/include/xmlrpc-c libs/xmlrpc-c/lib/abyss/src src src/mod/formats/mod_shout src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: anthm Date: Thu Oct 2 14:50:09 2008 New Revision: 9796 Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch.c Log: fix xml_rpc socket shutdown Modified: freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h (original) +++ freeswitch/trunk/libs/xmlrpc-c/include/xmlrpc-c/abyss.h Thu Oct 2 14:50:09 2008 @@ -191,7 +191,7 @@ ServerSetMimeType(TServer * const serverP, MIMEType * const MIMETypeP); -void +int ServerInit(TServer * const serverP); void Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Thu Oct 2 14:50:09 2008 @@ -42,12 +42,12 @@ srvP->terminationRequested = true; - if (srvP->chanSwitchP) + if (srvP->chanSwitchP) { ChanSwitchInterrupt(srvP->chanSwitchP); + ChanSwitchDestroy(srvP->chanSwitchP); + } } - - void ServerResetTerminate(TServer * const serverP) { @@ -651,7 +651,7 @@ -void +int ServerInit(TServer * const serverP) { /*---------------------------------------------------------------------------- Initialize a server to accept connections. @@ -700,9 +700,11 @@ } if (retError) { TraceMsg("ServerInit() failed. %s", retError); - exit(1); + return 0; xmlrpc_strfree(retError); } + + return 1; } Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_unix.c Thu Oct 2 14:50:09 2008 @@ -40,7 +40,7 @@ #include "socket_unix.h" -#define sane_close(_it) if (_it > -1) {close(_it) ; _it = -1; } +#define sane_close(_it) do {if (_it > -1) { close(_it) ; _it = -1; }} while (_it > -1) typedef struct { int interruptorFd; @@ -849,6 +849,7 @@ struct sockaddr_in name; int rc; + int one = 1; name.sin_family = AF_INET; name.sin_port = htons(portNumber); @@ -857,6 +858,7 @@ else name.sin_addr.s_addr = INADDR_ANY; + setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)); rc = bind(fd, (struct sockaddr *)&name, sizeof(name)); if (rc == -1) Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/socket_win.c Thu Oct 2 14:50:09 2008 @@ -838,6 +838,7 @@ struct sockaddr_in name; int rc; + int one = 1; ZeroMemory(&name, sizeof(name)); name.sin_family = AF_INET; @@ -845,6 +846,7 @@ if (addrP) name.sin_addr = *addrP; + setsockopt(winsock, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof(int)); rc = bind(winsock, (struct sockaddr *)&name, sizeof(name)); if (rc != 0) { Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Thu Oct 2 14:50:09 2008 @@ -11,7 +11,7 @@ LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la SHOUTLA=$(SHOUT_DIR)/src/libshout.la -MPG123LA=$(MPG123_DIR)/src/libmpg123/.libs/libmpg123.la +MPG123LA=$(MPG123_DIR)/src/libmpg123/libmpg123.la LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA) Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Oct 2 14:50:09 2008 @@ -809,21 +809,19 @@ ServerCreate(&globals.abyssServer, "XmlRpcServer", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir, logfile); xmlrpc_server_abyss_set_handler(&env, &globals.abyssServer, "/RPC2", registryP); - ServerInit(&globals.abyssServer); -#if 0 if (ServerInit(&globals.abyssServer) != TRUE) { globals.running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to start HTTP Port %d\n", globals.port); return SWITCH_STATUS_TERM; } -#endif ServerAddHandler(&globals.abyssServer, handler_hook); ServerAddHandler(&globals.abyssServer, auth_hook); ServerSetKeepaliveTimeout(&globals.abyssServer, 1); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Starting HTTP Port %d, DocRoot [%s]\n", globals.port, SWITCH_GLOBAL_dirs.htdocs_dir); ServerRun(&globals.abyssServer); + switch_yield(1000000); globals.running = 0; return SWITCH_STATUS_TERM; @@ -834,9 +832,10 @@ //globals.abyssServer.running = 0; //shutdown(globals.abyssServer.listensock, 2); ServerTerminate(&globals.abyssServer); - while (globals.running) { + + do { switch_yield(100000); - } + } while (globals.running); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Oct 2 14:50:09 2008 @@ -617,6 +617,7 @@ } if (destroy_status == SWITCH_STATUS_RESTART) { + sleep(1); ret = execv(argv[0], argv); }

1 0

[commit] r9795 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: michaelgg Date: Thu Oct 2 14:10:48 2008 New Revision: 9795 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_managed.h freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.cpp freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Log: First attempt at making CLR delegate stuff work 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 Thu Oct 2 14:10:48 2008 @@ -74,6 +74,9 @@ // Don't let any callbacks use this CoreSession anymore switch_channel_set_private(channel, "CoreSession", NULL); } + // Free delegates + hangupDelegateHandle.Free(); + dtmfDelegateHandle.Free(); } bool ManagedSession::begin_allow_threads() @@ -88,20 +91,20 @@ void ManagedSession::check_hangup_hook() { - if (!hangupDelegateHandle) { + if (!hangupDelegateHandle.IsAllocated) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hangupDelegateHandle didn't get an object."); return; } - hangupDelegateHandle(); + ((HangupDelegate^)hangupDelegateHandle.Target)(); } switch_status_t ManagedSession::run_dtmf_callback(void *input, switch_input_type_t itype) { - if (!dtmfDelegateHandle) { + if (!dtmfDelegateHandle.IsAllocated) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dtmfDelegateHandle didn't get an object."); return SWITCH_STATUS_FALSE;; } - char* result = dtmfDelegateHandle(input, itype); + char *result = ((InputDelegate^)dtmfDelegateHandle.Target)(input, itype); switch_status_t status = process_callback_result(result); return status; 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 2 14:10:48 2008 @@ -38,7 +38,7 @@ #include <switch.h> #include <switch_cpp.h> -#ifdef _MANAGED +#ifndef _MANAGED // this section remove linker error LNK4248 for these opaque structures struct switch_core_session {char foo[];}; struct apr_pool_t {char foo[];}; @@ -69,11 +69,6 @@ struct apr_socket_t {char foo[];}; // LNK Error -typedef char* (CALLBACK* inputtype)(void * input, switch_input_type_t type); -typedef void (CALLBACK* hanguptype)(); - -#else - #include <mono/jit/jit.h> #include <mono/metadata/assembly.h> @@ -104,7 +99,8 @@ using namespace System::Reflection; using namespace System::Runtime::InteropServices; -delegate void HangupMethod(); +delegate void HangupDelegate(void); +delegate char* InputDelegate(void* input, switch_input_type_t type); public ref class FreeSwitchManaged { @@ -134,8 +130,8 @@ virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); #ifdef _MANAGED - inputtype dtmfDelegateHandle; // GCHandle to the input delegate - hanguptype hangupDelegateHandle; // GCHandle to the hangup delegate + GCHandle dtmfDelegateHandle; // GCHandle to the input delegate + GCHandle hangupDelegateHandle; // GCHandle to the hangup delegate #else guint32 dtmfDelegateHandle; // GCHandle to the input delegate guint32 hangupDelegateHandle; // GCHandle to the hangup delegate 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 2 14:10:48 2008 @@ -448,10 +448,12 @@ //char *cor_version; } globals; + // Sets up delegates (and anything else needed) on the ManagedSession object // Called from ManagedSession.Initialize Managed -> this is Unmanaged code so all pointers are marshalled and prevented from GC // Exported method. -SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession * session, inputtype dtmfDelegate, hanguptype hangupDelegate) + +SWITCH_MOD_DECLARE(void) InitManagedSession(ManagedSession *session, void *dtmfDelegate, void *hangupDelegate) { switch_assert(session); if (!session) { @@ -459,8 +461,8 @@ } session->setDTMFCallback(NULL, ""); session->setHangupHook(NULL); - session->dtmfDelegateHandle = dtmfDelegate; - session->hangupDelegateHandle = hangupDelegate; + session->dtmfDelegateHandle = GCHandle::Alloc(Marshal::GetDelegateForFunctionPointer(IntPtr(dtmfDelegate), InputDelegate::typeid)); + session->hangupDelegateHandle = GCHandle::Alloc(Marshal::GetDelegateForFunctionPointer(IntPtr(hangupDelegate), HangupDelegate::typeid)); } switch_status_t loadModDotnetManaged() @@ -469,50 +471,6 @@ char filename[256]; switch_snprintf(filename, 256, "%s%s%s", SWITCH_GLOBAL_dirs.mod_dir, SWITCH_PATH_SEPARATOR, MOD_MANAGED_DLL); - //HRESULT hr; - //wchar_t wCORVersion[256]; - //if (globals.cor_version) { - // MultiByteToWideChar(CP_UTF8, 0, globals.cor_version, -1, - // wCORVersion, sizeof(wCORVersion) / sizeof(wchar_t)); - //} - //else { - // DWORD bytes; - // hr = GetCORVersion(wCORVersion, sizeof(wCORVersion) - // / sizeof(wchar_t) - 1, &bytes); - // if (FAILED(hr)) { - // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - // "mod_dotnet: GetCORVersion failed to return " - // "the .NET CLR engine version."); - // return SWITCH_STATUS_FALSE; - // } - // int len = WideCharToMultiByte(CP_UTF8, 0, wCORVersion, -1, - // NULL, 0, NULL, NULL); - // globals.cor_version = (char *)apr_palloc(globals.pool, len); - // len = WideCharToMultiByte(CP_UTF8, 0, wCORVersion, -1, - // globals.cor_version, len, NULL, NULL); - //} - - ////verify that the clr is already loaded - because this dll is a clr enabled dll it will be loaded but lets get its info anyway - //hr = CorBindToRuntimeEx(wCORVersion, - // L"wks", // Or "svr" - // STARTUP_LOADER_OPTIMIZATION_MULTI_DOMAIN_HOST | - // STARTUP_CONCURRENT_GC, - // CLSID_CorRuntimeHost, - // IID_ICorRuntimeHost, - // (void **)&globals.pCorRuntime); - //if (FAILED(hr)) { - // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - // "mod_dotnet: Could not CorBindToRuntimeEx version " - // "%s for the .NET CLR engine.", globals.cor_version); - // return SWITCH_STATUS_FALSE; - //} - - //if (FAILED(hr)) { // a value of one here means that the specified clr is already loaded and good. - // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - // "mod_dotnet: Could not start the " - // ".NET CLR engine."); - // return SWITCH_STATUS_FALSE; - //} wchar_t modpath[256]; mbstowcs(modpath, filename, 255); try { Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Thu Oct 2 14:10:48 2008 @@ -44,6 +44,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" + AdditionalUsingDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -127,6 +128,7 @@ Optimization="3" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="" + AdditionalUsingDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_MONO_EXPORTS" RuntimeLibrary="2" EnableFunctionLevelLinking="true"

1 0

[commit] r9794 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: brian Date: Thu Oct 2 14:08:52 2008 New Revision: 9794 Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Log: MODFORM-16 for config issue Modified: freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml Thu Oct 2 14:08:52 2008 @@ -4,7 +4,7 @@ <param name="shuffle" value="true"/> <param name="channels" value="1"/> <param name="interval" value="20"/> - <param name="timer_name" value="soft"/> + <param name="timer-name" value="soft"/> </directory> <directory name="moh/16000" path="$${base_dir}/sounds/music/16000"> @@ -12,7 +12,7 @@ <param name="shuffle" value="true"/> <param name="channels" value="1"/> <param name="interval" value="20"/> - <param name="timer_name" value="soft"/> + <param name="timer-name" value="soft"/> </directory>  </configuration>

1 0

[commit] r9793 - freeswitch/trunk/src
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: mikej Date: Thu Oct 2 13:40:41 2008 New Revision: 9793 Modified: freeswitch/trunk/src/switch.c Log: tweak Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Oct 2 13:40:41 2008 @@ -269,7 +269,7 @@ int known_opt; int high_prio = 0; switch_core_flag_t flags = SCF_USE_SQL; - int ret; + int ret = 0; switch_status_t destroy_status; switch_file_t *fd; switch_memory_pool_t *pool = NULL; @@ -617,8 +617,7 @@ } if (destroy_status == SWITCH_STATUS_RESTART) { - execv(argv[0], argv); - ret = 0; + ret = execv(argv[0], argv); } return ret;

1 0

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

02 Oct '08

Author: anthm Date: Thu Oct 2 13:31:35 2008 New Revision: 9792 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: update 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 Thu Oct 2 13:31:35 2008 @@ -242,6 +242,7 @@ switch_set_flag_locked(b_tech_pvt, TFLAG_OUTBOUND); switch_channel_set_flag(channel, CF_ACCEPT_CNG); + switch_ivr_transfer_variable(session, tech_pvt->other_session, "process_cdr"); if (switch_core_session_thread_launch(b_session) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");

1 0

[commit] r9791 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: anthm Date: Thu Oct 2 13:18:48 2008 New Revision: 9791 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: update 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 Thu Oct 2 13:18:48 2008 @@ -2678,6 +2678,7 @@ switch_console_set_complete("add fsctl shutdown restart"); switch_console_set_complete("add fsctl shutdown elegant"); switch_console_set_complete("add fsctl shutdown elegant restart"); + switch_console_set_complete("add fsctl shutdown restart elegant"); switch_console_set_complete("add fsctl sps"); switch_console_set_complete("add fsctl sync_clock"); switch_console_set_complete("add fsctl reclaim_mem");

1 0

[commit] r9790 - freeswitch/trunk/src
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: anthm Date: Thu Oct 2 13:11:07 2008 New Revision: 9790 Modified: freeswitch/trunk/src/switch.c Log: WTF Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Oct 2 13:11:07 2008 @@ -617,7 +617,6 @@ } if (destroy_status == SWITCH_STATUS_RESTART) { - printf("WTF\n"); execv(argv[0], argv); ret = 0; }

1 0

[commit] r9789 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_voicemail mod/dialplans/mod_dialplan_xml mod/endpoints/mod_dingaling mod/endpoints/mod_sofia mod/event_handlers/mod_cdr_csv mod/event_handlers/mod_event_socket mod/xml_int/mod_xml_rpc
by Freeswitch SVN 02 Oct '08

02 Oct '08

Author: anthm Date: Thu Oct 2 13:10:05 2008 New Revision: 9789 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_xml.c Log: add some more specific events Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Oct 2 13:10:05 2008 @@ -1128,6 +1128,10 @@ SWITCH_EVENT_NOTIFY, SWITCH_EVENT_SEND_MESSAGE, SWITCH_EVENT_RECV_MESSAGE, + SWITCH_EVENT_REQUEST_PARAMS, + SWITCH_EVENT_CHANNEL_DATA, + SWITCH_EVENT_GENERAL, + SWITCH_EVENT_COMMAND, SWITCH_EVENT_ALL } switch_event_types_t; 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 Thu Oct 2 13:10:05 2008 @@ -70,7 +70,7 @@ domain = "cluecon.com"; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "user", user); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "type", type); @@ -224,7 +224,7 @@ } - switch_event_create(&event, SWITCH_EVENT_MESSAGE); + switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA); if (*uuid) { if ((session = switch_core_session_locate(uuid))) { switch_channel_event_set_data(switch_core_session_get_channel(session), event); @@ -337,7 +337,7 @@ tag_attr_name = argv[2]; tag_attr_val = argv[3]; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "section", section); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "tag", tag); @@ -1051,7 +1051,7 @@ } else { if ((tsession = switch_core_session_locate(uuid))) { switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_body(event, "%s", text); if (switch_core_session_receive_event(tsession, &event) != SWITCH_STATUS_SUCCESS) { switch_event_destroy(&event); @@ -2462,7 +2462,7 @@ channel = switch_core_session_get_channel(psession); - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { switch_xml_t xml; switch_channel_event_set_data(channel, event); if (!strcasecmp(format, "xml")) { Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Oct 2 13:10:05 2008 @@ -3390,7 +3390,7 @@ goto done; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name); @@ -4248,7 +4248,7 @@ } #endif - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_COMMAND); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "conf_name", conf_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile_name", profile_name); @@ -5221,7 +5221,7 @@ switch_xml_t cxml, cfg, advertise, room; switch_event_t *params = NULL; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_COMMAND); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "presence", "true"); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Oct 2 13:10:05 2008 @@ -894,7 +894,7 @@ switch_event_t *event; char *buf; - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_DATA) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(switch_core_session_get_channel(session), event); switch_event_serialize(event, &buf, SWITCH_FALSE); switch_assert(buf); @@ -1111,7 +1111,7 @@ switch_xml_t cxml = NULL, cfg = NULL, xml_menus = NULL, xml_menu = NULL; /* Open the config from the xml registry */ - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_channel_event_set_data(channel, params); @@ -1998,7 +1998,7 @@ *domain++ = '\0'; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "as_channel", "true"); @@ -2062,7 +2062,7 @@ } else { switch_event_t *event = var_event; if (!event) { - switch_event_create(&event, SWITCH_EVENT_MESSAGE); + switch_event_create(&event, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(event); } 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 2 13:10:05 2008 @@ -1504,7 +1504,7 @@ header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len); - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_GENERAL) == SWITCH_STATUS_SUCCESS) { /* this isnt done? it was in the other place * switch_channel_event_set_data(channel, event); */ @@ -1927,7 +1927,7 @@ int ok = 1; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_GENERAL); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", myid); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "destination_number", caller_profile->destination_number); @@ -2097,7 +2097,7 @@ } if (params) { - switch_event_create(&local_event, SWITCH_EVENT_MESSAGE); + switch_event_create(&local_event, SWITCH_EVENT_REQUEST_PARAMS); params = local_event; } @@ -2440,7 +2440,7 @@ switch_event_t *my_params = NULL; switch_xml_t ut; - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(my_params); switch_event_add_header_string(my_params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(my_params, SWITCH_STACK_BOTTOM, "purpose", "publish-vm"); @@ -2458,7 +2458,7 @@ if (!isall && !istag) { if ((ut = switch_xml_find_child(x_domain, "user", "id", user))) { - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS); status = deliver_vm(profile, ut, domain, path, 0, "B", my_params, pool, cid_name, cid_num, SWITCH_TRUE); switch_event_destroy(&my_params); } else { @@ -2469,7 +2469,7 @@ const char *tag; if (isall || (istag && (tag=switch_xml_attr(ut, "vm-tag")) && !strcasecmp(tag, user))) { - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS); status = deliver_vm(profile, ut, domain, path, 0, "B", my_params, pool, cid_name, cid_num, SWITCH_TRUE); switch_event_destroy(&my_params); } @@ -2546,7 +2546,7 @@ switch_event_t *params = NULL; const char *email_addr = NULL; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id); 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 2 13:10:05 2008 @@ -201,7 +201,7 @@ switch_status_t status = SWITCH_STATUS_GENERR; switch_event_t *params = NULL; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_channel_event_set_data(channel, params); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Oct 2 13:10:05 2008 @@ -2267,7 +2267,7 @@ goto end; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header(params, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, to_host); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "from", from); 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 2 13:10:05 2008 @@ -999,7 +999,7 @@ switch_event_t *params = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile", profile->name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "reconfig", "true"); @@ -1346,7 +1346,7 @@ return status; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "profile", profile_name); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Oct 2 13:10:05 2008 @@ -1251,7 +1251,7 @@ free(sql); } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "action", "sip_auth"); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "sip_profile", profile->name); @@ -1420,7 +1420,7 @@ if (first && ret == AUTH_OK) { if (v_event) { - switch_event_create(v_event, SWITCH_EVENT_MESSAGE); + switch_event_create(v_event, SWITCH_EVENT_REQUEST_PARAMS); } if (v_event && *v_event) { switch_xml_t xparams[2]; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu Oct 2 13:10:05 2008 @@ -199,7 +199,7 @@ if (globals.debug) { switch_event_t *event; - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { char *buf; switch_channel_event_set_data(channel, event); switch_event_serialize(event, &buf, SWITCH_FALSE); 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 2 13:10:05 2008 @@ -467,7 +467,7 @@ } count++; if (count == 1) { - switch_event_create(event, SWITCH_EVENT_MESSAGE); + switch_event_create(event, SWITCH_EVENT_COMMAND); switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Command", "%s", mbuf); } else if (cur) { char *var, *val; @@ -1177,7 +1177,7 @@ goto done; } - if (switch_event_create(&call_event, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&call_event, SWITCH_EVENT_COMMAND) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_clear_flag_locked(listener, LFLAG_RUNNING); goto done; Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Oct 2 13:10:05 2008 @@ -202,7 +202,7 @@ goto authed; } - switch_event_create(&params, SWITCH_EVENT_MESSAGE); + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(params); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", "check"); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Oct 2 13:10:05 2008 @@ -200,7 +200,7 @@ return SWITCH_STATUS_MEMERR; } - switch_event_create(&(*channel)->variables, SWITCH_EVENT_MESSAGE); + switch_event_create(&(*channel)->variables, SWITCH_EVENT_GENERAL); switch_core_hash_init(&(*channel)->private_hash, pool); switch_queue_create(&(*channel)->dtmf_queue, 128, pool); @@ -1134,7 +1134,9 @@ event->event_id == SWITCH_EVENT_CHANNEL_ANSWER || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA || - event->event_id == SWITCH_EVENT_CHANNEL_HANGUP + event->event_id == SWITCH_EVENT_CHANNEL_HANGUP || + event->event_id == SWITCH_EVENT_REQUEST_PARAMS || + event->event_id == SWITCH_EVENT_CHANNEL_DATA ) { /* Index Caller's Profile */ Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Oct 2 13:10:05 2008 @@ -876,7 +876,7 @@ switch_xml_t x_domain, xml_root; switch_xml_t ut; - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_GENERAL); switch_assert(my_params); switch_event_add_header_string(my_params, SWITCH_STACK_BOTTOM, "domain", domain); switch_event_add_header_string(my_params, SWITCH_STACK_BOTTOM, "purpose", "network-list"); 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 2 13:10:05 2008 @@ -797,7 +797,7 @@ switch_set_flag(session, SSF_DESTROYED); if ((val = switch_channel_get_variable(session->channel, "memory_debug")) && switch_true(val)) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_GENERAL) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_serialize(event, &event_str, SWITCH_FALSE); switch_assert(event_str); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Oct 2 13:10:05 2008 @@ -161,6 +161,10 @@ "NOTIFY", "SEND_MESSAGE", "RECV_MESSAGE", + "REQUEST_PARAMS", + "CHANNEL_DATA", + "GENERAL", + "COMMAND", "ALL" }; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Oct 2 13:10:05 2008 @@ -1232,7 +1232,7 @@ cont->list[i].up = 0; if (cont->list[i].app) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", cont->list[i].app); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data); @@ -2068,7 +2068,7 @@ if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(other_uuid))) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path); @@ -2090,7 +2090,7 @@ } if ((flags & SMF_ECHO_ALEG)) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path); @@ -2109,7 +2109,7 @@ } if (nomedia) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "nomedia"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "nomedia-uuid", uuid); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); @@ -2118,7 +2118,7 @@ } if (cause) { - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", "hangup"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cause); Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu Oct 2 13:10:05 2008 @@ -274,7 +274,7 @@ status = input_callback(session_a, event, SWITCH_INPUT_TYPE_EVENT, user_data, 0); } - if (event->event_id != SWITCH_EVENT_MESSAGE || switch_core_session_receive_event(session_b, &event) != SWITCH_STATUS_SUCCESS) { + if (event->event_id != SWITCH_EVENT_COMMAND || switch_core_session_receive_event(session_b, &event) != SWITCH_STATUS_SUCCESS) { switch_event_destroy(&event); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Oct 2 13:10:05 2008 @@ -596,7 +596,7 @@ so we will normalize dialstring params and channel variables (when there is an originator) into an event that we will use as a pseudo hash to consult for params as needed. */ - if (switch_event_create(&var_event, SWITCH_EVENT_MESSAGE) != SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&var_event, SWITCH_EVENT_GENERAL) != SWITCH_STATUS_SUCCESS) { abort(); } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Oct 2 13:10:05 2008 @@ -121,7 +121,7 @@ module_name = chan_lang; - switch_event_create(&hint_data, SWITCH_EVENT_MESSAGE); + switch_event_create(&hint_data, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(hint_data); switch_event_add_header_string(hint_data, SWITCH_STACK_BOTTOM, "macro_name", macro_name); Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Oct 2 13:10:05 2008 @@ -1437,7 +1437,7 @@ *domain = NULL; if (!params) { - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(my_params); switch_event_add_header_string(my_params, SWITCH_STACK_BOTTOM, "domain", domain_name); params = my_params; @@ -1467,7 +1467,7 @@ *domain = NULL; if (!params) { - switch_event_create(&my_params, SWITCH_EVENT_MESSAGE); + switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS); switch_assert(my_params); params = my_params; }

1 0