Author: anthm Date: Wed Oct 8 16:59:16 2008 New Revision: 9899 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Log: add switch_core_session_get_id function Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Oct 8 16:59:16 2008 @@ -522,6 +522,8 @@ */ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session); + /*! \brief Provide the current session_id \return the total number of allocated sessions since core startup Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Oct 8 16:59:16 2008 @@ -964,6 +964,11 @@ return session_manager.session_count; } +SWITCH_DECLARE(uint32_t) switch_core_session_get_id(switch_core_session_t *session) +{ + return session->id; +} + SWITCH_DECLARE(switch_size_t) switch_core_session_id(void) { return session_manager.session_id; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Oct 8 16:59:16 2008 @@ -1199,6 +1199,7 @@ sent_ring = 1; } /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ + if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { idx = IDX_TIMEOUT; @@ -1282,9 +1283,9 @@ } } else { - switch_yield(1000); + switch_yield(10000); } - + } notready: