<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14852] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14852">14852</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-14 15:10:58 -0500 (Mon, 14 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>execute hangup state asap</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeprivateswitch_core_pvth">freeswitch/trunk/src/include/private/switch_core_pvt.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_cpph">freeswitch/trunk/src/include/switch_cpp.h</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_state_machinec">freeswitch/trunk/src/switch_core_state_machine.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_cppcpp">freeswitch/trunk/src/switch_cpp.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeprivateswitch_core_pvth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/private/switch_core_pvt.h 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/include/private/switch_core_pvt.h 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -87,13 +87,15 @@
</span><span class="cx"> typedef enum {
</span><span class="cx"> SSF_NONE = 0,
</span><span class="cx"> SSF_DESTROYED = (1 << 0),
</span><del>- SSF_WARN_TRANSCODE = (1 << 1)
</del><ins>+ SSF_WARN_TRANSCODE = (1 << 1),
+ SSF_HANGUP = (1 << 2)
</ins><span class="cx"> } switch_session_flag_t;
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> struct switch_core_session {
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> switch_thread_t *thread;
</span><ins>+ switch_thread_id_t thread_id;
</ins><span class="cx"> switch_endpoint_interface_t *endpoint_interface;
</span><span class="cx"> switch_size_t id;
</span><span class="cx"> switch_session_flag_t flags;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/include/switch_core.h 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -591,6 +591,7 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_destroy_state(switch_core_session_t *session);
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_reporting_state(switch_core_session_t *session);
</span><ins>+SWITCH_DECLARE(void) switch_core_session_hangup_state(switch_core_session_t *session);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Provide the total number of sessions
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_cpph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_cpp.h (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_cpp.h 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/include/switch_cpp.h 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> * \return an int status code indicating success or failure
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>- SWITCH_DECLARE(int) originate(CoreSession * a_leg_session, char *dest, int timeout = 60);
</del><ins>+ SWITCH_DECLARE(int) originate(CoreSession * a_leg_session, char *dest, int timeout = 60, switch_state_handler_table_t *handlers = NULL);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(virtual void) destroy(void);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -6048,6 +6048,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hangup_state(void * jarg1) {
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+
+ arg1 = (switch_core_session_t *)jarg1;
+ switch_core_session_hangup_state(arg1);
+}
+
+
</ins><span class="cx"> SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_count() {
</span><span class="cx"> unsigned long jresult ;
</span><span class="cx"> uint32_t result;
</span><span class="lines">@@ -28592,19 +28600,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Originate(void * jarg1, void * jarg2, char * jarg3, int jarg4) {
</del><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_Originate(void * jarg1, void * jarg2, char * jarg3, int jarg4, void * jarg5) {
</ins><span class="cx"> int jresult ;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="cx"> CoreSession *arg2 = (CoreSession *) 0 ;
</span><span class="cx"> char *arg3 = (char *) 0 ;
</span><span class="cx"> int arg4 = (int) 60 ;
</span><ins>+ switch_state_handler_table_t *arg5 = (switch_state_handler_table_t *) NULL ;
</ins><span class="cx"> int result;
</span><span class="cx">
</span><span class="cx"> arg1 = (CoreSession *)jarg1;
</span><span class="cx"> arg2 = (CoreSession *)jarg2;
</span><span class="cx"> arg3 = (char *)jarg3;
</span><span class="cx"> arg4 = (int)jarg4;
</span><del>- result = (int)(arg1)->originate(arg2,arg3,arg4);
</del><ins>+ arg5 = (switch_state_handler_table_t *)jarg5;
+ result = (int)(arg1)->originate(arg2,arg3,arg4,arg5);
</ins><span class="cx"> jresult = result;
</span><span class="cx"> return jresult;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -244,8 +244,8 @@
</span><span class="cx"> freeswitchPINVOKE.CoreSession_SetCallerData(swigCPtr, var, val);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int Originate(CoreSession a_leg_session, string dest, int timeout) {
- int ret = freeswitchPINVOKE.CoreSession_Originate(swigCPtr, CoreSession.getCPtr(a_leg_session), dest, timeout);
</del><ins>+ public int Originate(CoreSession a_leg_session, string dest, int timeout, switch_state_handler_table handlers) {
+ int ret = freeswitchPINVOKE.CoreSession_Originate(swigCPtr, CoreSession.getCPtr(a_leg_session), dest, timeout, switch_state_handler_table.getCPtr(handlers));
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1142,6 +1142,10 @@
</span><span class="cx"> freeswitchPINVOKE.switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session.getCPtr(session));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static void switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session session) {
+ freeswitchPINVOKE.switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session.getCPtr(session));
+ }
+
</ins><span class="cx"> public static uint switch_core_session_count() {
</span><span class="cx"> uint ret = freeswitchPINVOKE.switch_core_session_count();
</span><span class="cx"> return ret;
</span><span class="lines">@@ -6008,6 +6012,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_reporting_state")]
</span><span class="cx"> public static extern void switch_core_session_reporting_state(HandleRef jarg1);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hangup_state")]
+ public static extern void switch_core_session_hangup_state(HandleRef jarg1);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_count")]
</span><span class="cx"> public static extern uint switch_core_session_count();
</span><span class="cx">
</span><span class="lines">@@ -11289,7 +11296,7 @@
</span><span class="cx"> public static extern void CoreSession_SetCallerData(HandleRef jarg1, string jarg2, string jarg3);
</span><span class="cx">
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_Originate")]
</span><del>- public static extern int CoreSession_Originate(HandleRef jarg1, HandleRef jarg2, string jarg3, int jarg4);
</del><ins>+ public static extern int CoreSession_Originate(HandleRef jarg1, HandleRef jarg2, string jarg3, int jarg4, HandleRef jarg5);
</ins><span class="cx">
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_destroy")]
</span><span class="cx"> public static extern void CoreSession_destroy(HandleRef jarg1);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/switch_channel.c 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -1714,6 +1714,7 @@
</span><span class="cx">
</span><span class="cx"> switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL);
</span><span class="cx"> switch_core_session_signal_state_change(channel->session);
</span><ins>+ switch_core_session_hangup_state(channel->session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return channel->state;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/switch_core_session.c 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -1062,7 +1062,8 @@
</span><span class="cx"> const char *val;
</span><span class="cx">
</span><span class="cx"> session->thread = thread;
</span><del>-
</del><ins>+ session->thread_id = switch_thread_self();
+
</ins><span class="cx"> switch_core_session_run(session);
</span><span class="cx"> switch_core_media_bug_remove_all(session);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Locked, Waiting on external entities\n",
</span><span class="lines">@@ -1207,6 +1208,7 @@
</span><span class="cx">
</span><span class="cx"> session = switch_core_alloc(usepool, sizeof(*session));
</span><span class="cx"> session->pool = usepool;
</span><ins>+ session->thread_id = switch_thread_self();
</ins><span class="cx">
</span><span class="cx"> switch_core_memory_pool_set_data(session->pool, "__session", session);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_state_machinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_state_machine.c (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_state_machine.c 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/switch_core_state_machine.c 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -413,69 +413,7 @@
</span><span class="cx"> goto done;
</span><span class="cx"> case CS_HANGUP: /* Deactivate and end the thread */
</span><span class="cx"> {
</span><del>- const char *hook_var;
- switch_core_session_t *use_session = NULL;
- switch_call_cause_t cause = switch_channel_get_cause(session->channel);
- switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel);
- switch_event_t *event;
-
- switch_channel_set_hangup_time(session->channel);
-
- switch_core_media_bug_remove_all(session);
-
- switch_channel_stop_broadcast(session->channel);
-
- switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause));
- switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850);
- switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL);
-
- switch_channel_set_timestamps(session->channel);
-
- STATE_MACRO(hangup, "HANGUP");
-
- hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE);
- if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) {
- use_session = session;
- }
-
- if (!switch_strlen_zero(hook_var)) {
- switch_stream_handle_t stream = { 0 };
- char *cmd = switch_core_session_strdup(session, hook_var);
- char *arg = NULL;
- char *expanded = NULL;
-
- if ((arg = strchr(cmd, ':')) && *(arg+1) == ':') {
- *arg++ = '\0';
- *arg++ = '\0';
- } else {
- if ((arg = strchr(cmd, ' '))) {
- *arg++ = '\0';
- }
- }
-
- SWITCH_STANDARD_STREAM(stream);
-
- switch_channel_get_variables(session->channel, &stream.param_event);
- switch_channel_event_set_data(session->channel, stream.param_event);
- expanded = switch_channel_expand_variables(session->channel, arg);
-
- switch_api_execute(cmd, expanded, use_session, &stream);
-
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, switch_str_nil(expanded),
- switch_str_nil((char *) stream.data));
-
- if (expanded != arg) {
- switch_safe_free(expanded);
- }
- switch_safe_free(stream.data);
- }
-
- if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE) == SWITCH_STATUS_SUCCESS) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(cause));
- switch_channel_event_set_data(session->channel, event);
- switch_event_fire(&event);
- }
-
</del><ins>+ switch_core_session_hangup_state(session);
</ins><span class="cx"> switch_channel_set_state(session->channel, CS_REPORTING);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,6 +495,8 @@
</span><span class="cx">
</span><span class="cx"> switch_assert(session != NULL);
</span><span class="cx"> switch_channel_set_running_state(session->channel, CS_DESTROY);
</span><ins>+ switch_channel_clear_flag(session->channel, CF_TRANSFER);
+ switch_channel_clear_flag(session->channel, CF_REDIRECT);
</ins><span class="cx">
</span><span class="cx"> session->thread_running = 1;
</span><span class="cx"> endpoint_interface = session->endpoint_interface;
</span><span class="lines">@@ -571,6 +511,101 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void) switch_core_session_hangup_state(switch_core_session_t *session)
+{
+ const char *hook_var;
+ switch_core_session_t *use_session = NULL;
+ switch_call_cause_t cause = switch_channel_get_cause(session->channel);
+ switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel);
+ switch_event_t *event;
+ int proceed = 1;
+ int global_proceed = 1;
+ int do_extra_handlers = 1;
+ int silly = 0;
+ int index = 0;
+ switch_channel_state_t state = switch_channel_get_state(session->channel), midstate = state;
+ const switch_endpoint_interface_t *endpoint_interface;
+ const switch_state_handler_table_t *driver_state_handler = NULL;
+ const switch_state_handler_table_t *application_state_handler = NULL;
+
+
+ if (switch_thread_self() != session->thread_id) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "thread mismatch skipping state handler.\n");
+ return;
+ }
+
+ if (switch_test_flag(session, SSF_HANGUP)) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "handler already called, skipping state handler.\n");
+ return;
+ }
+
+ endpoint_interface = session->endpoint_interface;
+ switch_assert(endpoint_interface != NULL);
+
+ driver_state_handler = endpoint_interface->state_handler;
+ switch_assert(driver_state_handler != NULL);
+
+ switch_channel_set_hangup_time(session->channel);
+
+ switch_core_media_bug_remove_all(session);
+
+ switch_channel_stop_broadcast(session->channel);
+
+ switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause));
+ switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850);
+ switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL);
+
+ switch_channel_set_timestamps(session->channel);
+
+ STATE_MACRO(hangup, "HANGUP");
+
+ hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE);
+ if (switch_true(switch_channel_get_variable(session->channel, SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE))) {
+ use_session = session;
+ }
+
+ if (!switch_strlen_zero(hook_var)) {
+ switch_stream_handle_t stream = { 0 };
+ char *cmd = switch_core_session_strdup(session, hook_var);
+ char *arg = NULL;
+ char *expanded = NULL;
+
+ if ((arg = strchr(cmd, ':')) && *(arg+1) == ':') {
+ *arg++ = '\0';
+ *arg++ = '\0';
+ } else {
+ if ((arg = strchr(cmd, ' '))) {
+ *arg++ = '\0';
+ }
+ }
+
+ SWITCH_STANDARD_STREAM(stream);
+
+ switch_channel_get_variables(session->channel, &stream.param_event);
+ switch_channel_event_set_data(session->channel, stream.param_event);
+ expanded = switch_channel_expand_variables(session->channel, arg);
+
+ switch_api_execute(cmd, expanded, use_session, &stream);
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, switch_str_nil(expanded),
+ switch_str_nil((char *) stream.data));
+
+ if (expanded != arg) {
+ switch_safe_free(expanded);
+ }
+ switch_safe_free(stream.data);
+ }
+
+ if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(cause));
+ switch_channel_event_set_data(session->channel, event);
+ switch_event_fire(&event);
+ }
+
+ switch_set_flag(session, SSF_HANGUP);
+
+}
+
</ins><span class="cx"> SWITCH_DECLARE(void) switch_core_session_reporting_state(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_channel_state_t state = switch_channel_get_state(session->channel), midstate = state;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_cppcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_cpp.cpp (14851 => 14852)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_cpp.cpp 2009-09-14 19:43:15 UTC (rev 14851)
+++ freeswitch/trunk/src/switch_cpp.cpp 2009-09-14 20:10:58 UTC (rev 14852)
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_DECLARE(int) CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout)
</del><ins>+SWITCH_DECLARE(int) CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout, switch_state_handler_table_t *handlers)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> switch_core_session_t *aleg_core_session = NULL;
</span><span class="lines">@@ -957,9 +957,9 @@
</span><span class="cx"> &cause,
</span><span class="cx"> dest,
</span><span class="cx"> timeout,
</span><ins>+ handlers,
</ins><span class="cx"> NULL,
</span><span class="cx"> NULL,
</span><del>- NULL,
</del><span class="cx"> &caller_profile,
</span><span class="cx"> NULL,
</span><span class="cx"> SOF_NONE) != SWITCH_STATUS_SUCCESS) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>