add CHANNEL_HANGUP_COMPLETE event to take the place of CHANNEL_HANGUP, CHANNEL_HANGUP...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13505 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index d963f93f1c9f404f278a18a198062b8704ba7a9b..6993962affd47f645d1bb8b2acaa4866ff299284 100644 (file)
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -65,6 +65,7 @@ static const char *EVENT_NAMES[] = {
        "CHANNEL_STATE",
        "CHANNEL_ANSWER",
        "CHANNEL_HANGUP",
+       "CHANNEL_HANGUP_COMPLETE",
        "CHANNEL_EXECUTE",
        "CHANNEL_EXECUTE_COMPLETE",
        "CHANNEL_BRIDGE",

diff --git a/libs/esl/src/include/esl_event.h b/libs/esl/src/include/esl_event.h
index f0fd00372fb988bf172cfd34b6c4cc8e7fa11970..254a78747d1e0255f2091b41ff94df0e29ff7c5b 100644 (file)
--- a/libs/esl/src/include/esl_event.h
+++ b/libs/esl/src/include/esl_event.h
@@ -53,6 +53,7 @@ typedef enum {
        ESL_EVENT_CHANNEL_STATE,
        ESL_EVENT_CHANNEL_ANSWER,
        ESL_EVENT_CHANNEL_HANGUP,
+       ESL_EVENT_CHANNEL_HANGUP_COMPLETE,
        ESL_EVENT_CHANNEL_EXECUTE,
        ESL_EVENT_CHANNEL_EXECUTE_COMPLETE,
        ESL_EVENT_CHANNEL_BRIDGE,

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 0fc90fb6f194a89b4d0f35041d0fd3348f14e0ea..90edf4b17296d6df42ff75bb6565712e0f06ef4c 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -1210,6 +1210,7 @@ typedef enum {
        SWITCH_EVENT_CHANNEL_STATE,
        SWITCH_EVENT_CHANNEL_ANSWER,
        SWITCH_EVENT_CHANNEL_HANGUP,
+       SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE,
        SWITCH_EVENT_CHANNEL_EXECUTE,
        SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE,
        SWITCH_EVENT_CHANNEL_BRIDGE,

diff --git a/src/switch_channel.c b/src/switch_channel.c
index b865cdedf02eff6c26c39295a6d1c00a9311fbfa..03d8509b994987af989ce85ad57e57e3bbb49a19 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1648,6 +1648,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
        
        if (channel->state < CS_HANGUP) {
                switch_channel_state_t last_state = channel->state;
+               switch_event_t *event;
 
                switch_mutex_lock(channel->state_mutex);
                channel->state = CS_HANGUP;
@@ -1657,6 +1658,12 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
                switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n",
                                                  channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause));
 
+               if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) {
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Hangup-Cause", switch_channel_cause2str(hangup_cause));
+                       switch_channel_event_set_data(channel, event);
+                       switch_event_fire(&event);
+               }
+
                switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL);
                switch_core_session_signal_state_change(channel->session);
        }

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 26036ff706b4bf311a4a7e9009d55f7dab60351b..fc57f9053f1f5ae9aa1e1c87fdd101ca9b2e189d 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -466,7 +466,7 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                                                switch_safe_free(stream.data);
                                        }
 
-                                       if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) {
+                                       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);

diff --git a/src/switch_event.c b/src/switch_event.c
index 688f554c95cb77f02d232ffa6c127582a0702749..3f8ae1afcd31fca7ef0c499a04e1e1a69aaecc2d 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -119,6 +119,7 @@ static char *EVENT_NAMES[] = {
        "CHANNEL_STATE",
        "CHANNEL_ANSWER",
        "CHANNEL_HANGUP",
+       "CHANNEL_HANGUP_COMPLETE",
        "CHANNEL_EXECUTE",
        "CHANNEL_EXECUTE_COMPLETE",
        "CHANNEL_BRIDGE",