<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16724] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16724">16724</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-22 16:13:59 -0600 (Mon, 22 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: no more tcp ports in config, timing tweakings</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (16723 => 16724)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-22 19:46:34 UTC (rev 16723)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-22 22:13:59 UTC (rev 16724)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> private_t SKYPIAX_INTERFACES[SKYPIAX_MAX_INTERFACES];
</span><span class="cx"> switch_mutex_t *mutex;
</span><span class="cx"> private_t *sk_console;
</span><ins>+ int start_port;
</ins><span class="cx"> } globals;
</span><span class="cx">
</span><span class="cx"> switch_endpoint_interface_t *skypiax_endpoint_interface;
</span><span class="lines">@@ -1448,6 +1449,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ globals.start_port=32769;
</ins><span class="cx"> if ((interfaces = switch_xml_child(cfg, "per_interface_settings"))) {
</span><span class="cx"> int i = 0;
</span><span class="cx">
</span><span class="lines">@@ -1716,6 +1718,8 @@
</span><span class="cx"> switch_sleep(10000);
</span><span class="cx"> skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET WINDOWSTATE HIDDEN");
</span><span class="cx"> switch_sleep(10000);
</span><ins>+ skypiax_signaling_write(&globals.SKYPIAX_INTERFACES[interface_id], "SET USERSTATUS ONLINE");
+ switch_sleep(10000);
</ins><span class="cx"> } else {
</span><span class="cx"> ERRORA
</span><span class="cx"> ("The Skype client to which we are connected FAILED to gave us CURRENTUSERHANDLE=%s, interface_id=%d FAILED to start. No Skype client logged in as '%s' has been found. Please (re)launch a Skype client logged in as '%s'. Skypiax exiting now\n",
</span><span class="lines">@@ -2831,6 +2835,14 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int next_port(void){
+ switch_mutex_lock(globals.mutex);
+ globals.start_port++;
+ if(globals.start_port == 65000)
+ globals.start_port=32769;
+ switch_mutex_unlock(globals.mutex);
+ return (globals.start_port - 1);
+}
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /* For Emacs:
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (16723 => 16724)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2010-02-22 19:46:34 UTC (rev 16723)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2010-02-22 22:13:59 UTC (rev 16724)
</span><span class="lines">@@ -339,3 +339,4 @@
</span><span class="cx"> int skypiax_socket_create_and_bind(private_t * tech_pvt, unsigned short *which_port);
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> int incoming_chatmessage(private_t * tech_pvt, int which);
</span><ins>+int next_port(void);
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16723 => 16724)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-22 19:46:34 UTC (rev 16723)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-22 22:13:59 UTC (rev 16724)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> if (*which_port != 0)
</span><span class="cx"> start_port = *which_port;
</span><span class="cx">
</span><ins>+ start_port=next_port();
</ins><span class="cx"> my_addr.sin_port = htons(start_port);
</span><span class="cx"> //fcntl(s, F_SETFL, O_NONBLOCK);
</span><span class="cx"> //tech_pvt->tcp_cli_port = start_port;
</span><span class="lines">@@ -501,8 +502,11 @@
</span><span class="cx"> DEBUGA_SKYPE("Skype FAILED on skype_call %s. Let's wait for the FAILED message.\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "DURATION")) { /* each second, we sync ithe timers */
</span><ins>+ if(!((atoi(value) % 5))){
</ins><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_read);
</span><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_write);
</span><ins>+ DEBUGA_SKYPE("Synching on skype_call: %s.\n", SKYPIAX_P_LOG, id);
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
</span><span class="cx"> if (strcasecmp(id, tech_pvt->skype_call_id)) {
</span><span class="lines">@@ -1134,10 +1138,12 @@
</span><span class="cx"> #endif //0
</span><span class="cx">
</span><span class="cx">
</span><ins>+#if 0
</ins><span class="cx"> if(tech_pvt->begin_to_write==0){
</span><span class="cx"> skypiax_sleep(1000);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+#endif//0
</ins><span class="cx"> if (tech_pvt->timer_write.timer_interface && tech_pvt->timer_write.timer_interface->timer_next) {
</span><span class="cx"> switch_core_timer_next(&tech_pvt->timer_write);
</span><span class="cx"> }
</span><span class="lines">@@ -1364,6 +1370,7 @@
</span><span class="cx">
</span><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="cx"> break;
</span><ins>+ skypiax_sleep(2000);
</ins><span class="cx"> while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN
</span><span class="cx"> && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
</span><span class="cx"> || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
</span><span class="lines">@@ -1382,10 +1389,6 @@
</span><span class="cx"> to.tv_usec = 60000; //60 msec
</span><span class="cx"> to.tv_sec = 0;
</span><span class="cx">
</span><del>- if(tech_pvt->begin_to_read==0){
- skypiax_sleep(1000);
- continue;
- }
</del><span class="cx"> rt = select(fdselect + 1, &fs, NULL, NULL, &to);
</span><span class="cx"> if (rt > 0) {
</span><span class="cx">
</span><span class="lines">@@ -1394,6 +1397,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+#if 1
+ if(tech_pvt->begin_to_read==0){
+ DEBUGA_SKYPE("len=%d, expected 640\n", SKYPIAX_P_LOG, len);
+ continue;
+ }
+#endif //0
</ins><span class="cx">
</span><span class="cx"> if (len == -1) {
</span><span class="cx"> DEBUGA_SKYPE("len=%d, error: %s\n", SKYPIAX_P_LOG, len, strerror(errno));
</span><span class="lines">@@ -1404,13 +1413,14 @@
</span><span class="cx"> switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
</span><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> } else if (len == 0) {
</span><del>- DEBUGA_SKYPE("CLOSING, len=%d, expected 640\n", SKYPIAX_P_LOG, len);
</del><ins>+ DEBUGA_SKYPE("CLOSED, len=%d, expected 640\n", SKYPIAX_P_LOG, len);
</ins><span class="cx"> break;
</span><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("len=%d, expected 640\n", SKYPIAX_P_LOG, len);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if(rt==0){
</span><ins>+ DEBUGA_SKYPE("SRV rt=%d\n", SKYPIAX_P_LOG, rt);
</ins><span class="cx"> continue;
</span><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("SRV rt=%d\n", SKYPIAX_P_LOG, rt);
</span><span class="lines">@@ -1534,11 +1544,22 @@
</span><span class="cx"> fdselect = fd;
</span><span class="cx"> FD_SET(fdselect, &fs);
</span><span class="cx">
</span><ins>+ 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
</ins><span class="cx">
</span><span class="cx"> if(tech_pvt->begin_to_write==0){
</span><del>- skypiax_sleep(1000);
- continue;
</del><ins>+ memset(cli_out, 255, sizeof(cli_out));
+ bytes_to_write = 320;
+ len = send(fd, (char *)cli_out, bytes_to_write, 0);
+ if (len == -1) {
+ DEBUGA_SKYPE("len=%d, error: %s\n", SKYPIAX_P_LOG, len, strerror(errno));
+ break;
+ }
+ continue;
</ins><span class="cx"> }
</span><ins>+#endif//0
</ins><span class="cx">
</span><span class="cx"> //rt = select(fdselect + 1, NULL, &fs, NULL, &to);
</span><span class="cx"> //if(rt==-1)
</span><span class="lines">@@ -1548,9 +1569,9 @@
</span><span class="cx"> if (rt > 0) {
</span><span class="cx">
</span><span class="cx"> //DEBUGA_SKYPE("before!\n", SKYPIAX_P_LOG);
</span><del>- 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);
- }
</del><ins>+ //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);
+ //}
</ins><span class="cx"> //DEBUGA_SKYPE("after!\n", SKYPIAX_P_LOG);
</span><span class="cx"> bytes_to_write=0;
</span><span class="cx"> waitin=0;
</span><span class="lines">@@ -1581,6 +1602,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else if(rt==0){
</span><ins>+ DEBUGA_SKYPE("CLI rt=%d\n", SKYPIAX_P_LOG, rt);
</ins><span class="cx"> continue;
</span><span class="cx"> } else {
</span><span class="cx"> DEBUGA_SKYPE("CLI rt=%d\n", SKYPIAX_P_LOG, rt);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>