提交 15822001 authored 作者: Giovanni Maruzzelli's avatar Giovanni Maruzzelli

skypiax: indent

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14534 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 e3095522
......@@ -111,33 +111,33 @@ char *interface_status[] = { /* should match SKYPIAX_STATE_xxx in skypiax.h */
"PREANSW"
};
char *skype_callflow[] = { /* should match CALLFLOW_XXX in skypiax.h */
"CALL_IDLE",
"CALL_DOWN",
"INCOMING_RNG",
"CALL_DIALING",
"CALL_LINEBUSY",
"CALL_ACTIVE",
"INCOMING_HNG",
"CALL_RLEASD",
"CALL_NOCARR",
"CALL_INFLUX",
"CALL_INCOMING",
"CALL_FAILED",
"CALL_NOSRVC",
"CALL_OUTRESTR",
"CALL_SECFAIL",
"CALL_NOANSWER",
"STATUS_FNSHED",
"STATUS_CANCLED",
"STATUS_FAILED",
"STATUS_REFUSED",
"STATUS_RINGING",
"STATUS_INPROGRS",
"STATUS_UNPLACD",
"STATUS_ROUTING",
"STATUS_EARLYMD",
"INCOMING_CLID",
"STATUS_RMTEHOLD"
"CALL_IDLE",
"CALL_DOWN",
"INCOMING_RNG",
"CALL_DIALING",
"CALL_LINEBUSY",
"CALL_ACTIVE",
"INCOMING_HNG",
"CALL_RLEASD",
"CALL_NOCARR",
"CALL_INFLUX",
"CALL_INCOMING",
"CALL_FAILED",
"CALL_NOSRVC",
"CALL_OUTRESTR",
"CALL_SECFAIL",
"CALL_NOANSWER",
"STATUS_FNSHED",
"STATUS_CANCLED",
"STATUS_FAILED",
"STATUS_REFUSED",
"STATUS_RINGING",
"STATUS_INPROGRS",
"STATUS_UNPLACD",
"STATUS_ROUTING",
"STATUS_EARLYMD",
"INCOMING_CLID",
"STATUS_RMTEHOLD"
};
......@@ -457,7 +457,7 @@ static switch_status_t channel_on_destroy(switch_core_session_t *session)
}
*tech_pvt->session_uuid_str = '\0';
tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
if(tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED){
if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
}
switch_core_session_set_private(session, NULL);
......@@ -509,7 +509,7 @@ static switch_status_t channel_on_hangup(switch_core_session_t *session)
}
tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
if(tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED){
if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
tech_pvt->skype_callflow = CALLFLOW_CALL_IDLE;
}
switch_mutex_unlock(globals.mutex);
......@@ -1780,9 +1780,8 @@ SWITCH_STANDARD_API(sk_function)
globals.SKYPIAX_INTERFACES[i].ob_failed_calls,
globals.SKYPIAX_INTERFACES[i].ob_calls,
interface_status[globals.SKYPIAX_INTERFACES[i].interface_state],
skype_callflow[globals.SKYPIAX_INTERFACES[i].skype_callflow],
globals.SKYPIAX_INTERFACES[i].session_uuid_str);
} else if(argc > 1 && !strcasecmp(argv[1], "full")) {
skype_callflow[globals.SKYPIAX_INTERFACES[i].skype_callflow], globals.SKYPIAX_INTERFACES[i].session_uuid_str);
} else if (argc > 1 && !strcasecmp(argv[1], "full")) {
stream->write_function(stream, "%c\t%d\n", next_flag_char, i);
}
......@@ -2078,7 +2077,7 @@ int skypiax_transfer(private_t * tech_pvt, char *id, char *value)
sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id, available_skypiax_interface->skype_user);
skypiax_signaling_write(tech_pvt, msg_to_skype);
if(tech_pvt->interface_state == SKYPIAX_STATE_SELECTED) {
if (tech_pvt->interface_state == SKYPIAX_STATE_SELECTED) {
tech_pvt->interface_state = SKYPIAX_STATE_IDLE; //we marked it SKYPIAX_STATE_SELECTED just in case it has to make an outbound call
}
} else {
......
......@@ -230,7 +230,7 @@ int skypiax_signaling_read(private_t * tech_pvt)
//SKYPIAX_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
if (!strcasecmp(prop, "PARTNER_HANDLE")) {
if (tech_pvt->interface_state != SKYPIAX_STATE_SELECTED && (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str)) ) {
if (tech_pvt->interface_state != SKYPIAX_STATE_SELECTED && (!strlen(tech_pvt->skype_call_id) || !strlen(tech_pvt->session_uuid_str))) {
//if (!strlen(tech_pvt->skype_call_id)) {
/* we are NOT inside an active call */
DEBUGA_SKYPE("Call %s TRY ANSWER\n", SKYPIAX_P_LOG, id);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论