From 5db3a9b0714879063909d47c57afa439361f205e Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 24 Jun 2011 10:52:18 -0500 Subject: [PATCH] move channel_create event to init state to allow more info to be gathered --- src/switch_channel.c | 9 --------- src/switch_core_state_machine.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/switch_channel.c b/src/switch_channel.c index 81c903cb4a..38f177234e 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2262,15 +2262,6 @@ SWITCH_DECLARE(void) switch_channel_set_caller_profile(switch_channel_t *channel caller_profile->context = switch_core_session_strdup(channel->session, "default"); } - if (!channel->caller_profile) { - switch_event_t *event; - - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_CREATE) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_fire(&event); - } - } - if (!caller_profile->times) { caller_profile->times = (switch_channel_timetable_t *) switch_core_session_alloc(channel->session, sizeof(*caller_profile->times)); caller_profile->times->profile_created = switch_micro_time_now(); diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c index 3c8bd28c55..2e45dde559 100644 --- a/src/switch_core_state_machine.c +++ b/src/switch_core_state_machine.c @@ -358,7 +358,16 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) break; case CS_INIT: /* Basic setup tasks */ - STATE_MACRO(init, "INIT"); + { + switch_event_t *event; + + STATE_MACRO(init, "INIT"); + + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_CREATE) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_fire(&event); + } + } break; case CS_ROUTING: /* Look for a dialplan and find something to do */ STATE_MACRO(routing, "ROUTING");