提交 4214698e authored 作者: Giovanni Maruzzelli's avatar Giovanni Maruzzelli

skypiax: cleaning

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16848 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 a50e1204
...@@ -948,26 +948,15 @@ void *skypiax_do_tcp_cli_thread_func(void *obj) ...@@ -948,26 +948,15 @@ void *skypiax_do_tcp_cli_thread_func(void *obj)
&& (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
|| tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
|| tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) { || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
unsigned int fdselect;
int rt;
fd_set fs;
struct timeval to;
size_t bytes_to_write; size_t bytes_to_write;
if (!(running && tech_pvt->running)) if (!(running && tech_pvt->running))
break; break;
FD_ZERO(&fs);
to.tv_usec = 60000; //60msec
to.tv_sec = 0;
fdselect = fd;
FD_SET(fdselect, &fs);
if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next
&& tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) { && tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) {
switch_core_timer_next(&tech_pvt->timer_write); switch_core_timer_next(&tech_pvt->timer_write);
} }
#if 1
if (tech_pvt->begin_to_write == 0) { if (tech_pvt->begin_to_write == 0) {
memset(cli_out, 255, sizeof(cli_out)); memset(cli_out, 255, sizeof(cli_out));
...@@ -979,12 +968,7 @@ void *skypiax_do_tcp_cli_thread_func(void *obj) ...@@ -979,12 +968,7 @@ void *skypiax_do_tcp_cli_thread_func(void *obj)
} }
skypiax_sleep(10000); skypiax_sleep(10000);
continue; continue;
} } else {
#endif //0
rt = 1;
if (rt > 0) {
bytes_to_write = 0; bytes_to_write = 0;
...@@ -1014,12 +998,6 @@ void *skypiax_do_tcp_cli_thread_func(void *obj) ...@@ -1014,12 +998,6 @@ void *skypiax_do_tcp_cli_thread_func(void *obj)
DEBUGA_SKYPE("len=%d\n", SKYPIAX_P_LOG, len); DEBUGA_SKYPE("len=%d\n", SKYPIAX_P_LOG, len);
} }
} }
} else if (rt == 0) {
DEBUGA_SKYPE("CLI rt=%d\n", SKYPIAX_P_LOG, rt);
continue;
} else {
DEBUGA_SKYPE("CLI rt=%d\n", SKYPIAX_P_LOG, rt);
break;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论