Revision
16848
Author
gmaruzz
Date
2010-02-28 14:48:13 -0600 (Sun, 28 Feb 2010)

Log Message

skypiax: cleaning

Modified Paths

Diff

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16847 => 16848)


--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	2010-02-28 20:08:45 UTC (rev 16847)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c	2010-02-28 20:48:13 UTC (rev 16848)
@@ -948,26 +948,15 @@
 					   && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
 						   || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
 						   || 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;
 
 					if (!(running && tech_pvt->running))
 						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
 						&& tech_pvt->interface_state != SKYPIAX_STATE_HANGUP_REQUESTED) {
 						switch_core_timer_next(&tech_pvt->timer_write);
 					}
-#if 1
 
 					if (tech_pvt->begin_to_write == 0) {
 						memset(cli_out, 255, sizeof(cli_out));
@@ -979,13 +968,8 @@
 						}
 						skypiax_sleep(10000);
 						continue;
-					}
-#endif //0
+					} else {
 
-					rt = 1;
-
-					if (rt > 0) {
-
 						bytes_to_write = 0;
 
 						if (tech_pvt->skype_callflow == CALLFLOW_INCOMING_HANGUP) {
@@ -1014,12 +998,6 @@
 								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;
 					}
 
 				}