Revision

14456

Author

mikej

Date

2009-08-01 15:00:18 -0500 (Sat, 01 Aug 2009)

Log Message

merge 14453-14455, last minute build and skypiax fixes from trunk

Modified Paths

• freeswitch/tags/1.0.4/src/mod/endpoints/mod_skypiax/mod_skypiax.c
• freeswitch/tags/1.0.4/src/switch_ivr_async.c

Diff

--- freeswitch/tags/1.0.4/src/mod/endpoints/mod_skypiax/mod_skypiax.c	2009-08-01 17:33:25 UTC (rev 14455)
+++ freeswitch/tags/1.0.4/src/mod/endpoints/mod_skypiax/mod_skypiax.c	2009-08-01 20:00:18 UTC (rev 14456)
@@ -1782,7 +1782,14 @@
 					("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;
 			}
 		}
 	}

--- freeswitch/tags/1.0.4/src/switch_ivr_async.c	2009-08-01 17:33:25 UTC (rev 14455)
+++ freeswitch/tags/1.0.4/src/switch_ivr_async.c	2009-08-01 20:00:18 UTC (rev 14456)
@@ -2074,8 +2074,8 @@
 	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};
+	const char *p;
 	switch_core_session_get_read_impl(session, &read_impl);
-	const char *p;
 	
 	if (!ah) {
 		if (!(ah = switch_core_session_alloc(session, sizeof(*ah)))) {