kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-05 23:50:06 +00:00
Code Issues Projects Releases Wiki Activity

revert some accidential changes in the last commit

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7856 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-03-11 14:08:33 +00:00
parent aa72e64ed5
commit da754b5098
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/switch_core_state_machine.c
View File

@ -114,13 +114,11 @@ static void switch_core_standard_on_ring(switch_core_session_t *session)
switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION); switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
} }
end: end:
if (expanded && dpstr && expanded != dpstr) { if (expanded && dpstr && expanded != dpstr) {
free(expanded); free(expanded);
} }
} }
static void switch_core_standard_on_execute(switch_core_session_t *session) static void switch_core_standard_on_execute(switch_core_session_t *session)
@ -328,7 +326,7 @@ void switch_core_state_machine_init(switch_memory_pool_t *pool)
switch_core_standard_on_##__STATE(session); \ switch_core_standard_on_##__STATE(session); \
} \ } \
} \ } \
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State end %s %s %s\n", switch_channel_get_name(session->channel), __STATE_STR, switch_channel_state_name(midstate), switch_channel_state_name(switch_channel_get_state(session->channel))); \ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s going to sleep\n", switch_channel_get_name(session->channel), __STATE_STR); \
} while (silly) } while (silly)
SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session) SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
@ -434,14 +432,9 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
} }
goto done; goto done;
case CS_INIT: /* Basic setup tasks */ case CS_INIT: /* Basic setup tasks */
assert(driver_state_handler->on_init); switch_core_session_signal_lock(session);
//switch_core_session_signal_lock(session); STATE_MACRO(init, "INIT");
if (0) STATE_MACRO(init, "INIT"); switch_core_session_signal_unlock(session);
//switch_core_session_signal_unlock(session);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT\n", switch_channel_get_name(session->channel));
driver_state_handler->on_init(session);
assert( switch_channel_get_state(session->channel) != CS_INIT);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT-END\n", switch_channel_get_name(session->channel));
break; break;
case CS_RING: /* Look for a dialplan and find something to do */ case CS_RING: /* Look for a dialplan and find something to do */
switch_core_session_signal_lock(session); switch_core_session_signal_lock(session);
@ -489,8 +482,6 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
if (endstate == CS_NEW) { if (endstate == CS_NEW) {
switch_yield(1000); switch_yield(1000);
} else { } else {
assert( switch_channel_get_state(session->channel) != CS_INIT);
assert( switch_channel_get_running_state(session->channel) != CS_INIT);
switch_thread_cond_wait(session->cond, session->mutex); switch_thread_cond_wait(session->cond, session->mutex);
} }
} }