From f96e26877a8663c7ac87ff122f14ddb6b9aeed45 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 1 Aug 2009 20:00:18 +0000 Subject: [PATCH] merge 14453-14455, last minute build and skypiax fixes from trunk git-svn-id: http://svn.freeswitch.org/svn/freeswitch/tags/1.0.4@14456 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_skypiax/mod_skypiax.c | 9 ++++++++- src/switch_ivr_async.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mod/endpoints/mod_skypiax/mod_skypiax.c b/src/mod/endpoints/mod_skypiax/mod_skypiax.c index 57dc327155..c72c3ce732 100644 --- a/src/mod/endpoints/mod_skypiax/mod_skypiax.c +++ b/src/mod/endpoints/mod_skypiax/mod_skypiax.c @@ -1782,7 +1782,14 @@ int skypiax_answer(private_t * tech_pvt, char *id, char *value) ("FOUND (name=%s, giovatech->interface_state=%d != SKYPIAX_STATE_DOWN) && (giovatech->skype_user=%s == tech_pvt->skype_user=%s) && (giovatech->callid_number=%s == value=%s)\n", SKYPIAX_P_LOG, giovatech->name, giovatech->interface_state, giovatech->skype_user, tech_pvt->skype_user, giovatech->callid_number, value) - break; + if(tech_pvt->interface_state == SKYPIAX_STATE_PRERING){ + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + }else if (tech_pvt->interface_state != 0 && tech_pvt->interface_state != SKYPIAX_STATE_DOWN) { + WARNINGA("Why an interface_state %d HERE?\n", SKYPIAX_P_LOG, tech_pvt->interface_state); + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + } + + break; } } } diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c index 969fbfd175..726cece61f 100644 --- a/src/switch_ivr_async.c +++ b/src/switch_ivr_async.c @@ -2074,8 +2074,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_detect_speech(switch_core_session_t * switch_asr_flag_t flags = SWITCH_ASR_FLAG_NONE; struct speech_thread_handle *sth = switch_channel_get_private(channel, SWITCH_SPEECH_KEY); switch_codec_implementation_t read_impl = {0}; - switch_core_session_get_read_impl(session, &read_impl); const char *p; + switch_core_session_get_read_impl(session, &read_impl); if (!ah) { if (!(ah = switch_core_session_alloc(session, sizeof(*ah)))) {