<!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][17228] </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=17228">17228</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-06 11:05:15 -0500 (Tue, 06 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git@git.freeswitch.org:freeswitch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenalsadummyc">freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenmod_skypopenc">freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenskypopenh">freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenskypopen_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenalsadummyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c 2010-04-06 15:55:58 UTC (rev 17227)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c 2010-04-06 16:05:15 UTC (rev 17228)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> giovatimer.expires = 1 + jiffies;
</span><span class="cx"> add_timer(&giovatimer);
</span><span class="cx">
</span><del>- spin_lock_bh(&giovalock);
</del><ins>+ //spin_lock_bh(&giovalock);
</ins><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="cx">
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> //spin_unlock_bh(&dpcm->lock);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- spin_unlock_bh(&giovalock);
</del><ins>+ //spin_unlock_bh(&giovalock);
</ins><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="cx">
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> giovatimer.function = snd_card_dummy_pcm_timer_function;
</span><span class="cx"> giovatimer.expires = 1 + jiffies;
</span><span class="cx"> add_timer(&giovatimer);
</span><del>- printk("snd-dummy skypopen driver version: 5, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</del><ins>+ printk("snd-dummy skypopen driver version: 6, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</ins><span class="cx"> spin_unlock_bh(&giovalock);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenmod_skypopenc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.c (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.c 2010-04-06 15:55:58 UTC (rev 17227)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.c 2010-04-06 16:05:15 UTC (rev 17228)
</span><span class="lines">@@ -151,6 +151,7 @@
</span><span class="cx"> char *report_incoming_chatmessages;
</span><span class="cx"> char *silent_mode;
</span><span class="cx"> char *write_silence_when_idle;
</span><ins>+ char *setsockopt;
</ins><span class="cx"> int calls;
</span><span class="cx"> int real_interfaces;
</span><span class="cx"> int next_interface;
</span><span class="lines">@@ -171,6 +172,7 @@
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_report_incoming_chatmessages, globals.report_incoming_chatmessages);
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_silent_mode, globals.silent_mode);
</span><span class="cx"> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_write_silence_when_idle, globals.write_silence_when_idle);
</span><ins>+SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_setsockopt, globals.setsockopt);
</ins><span class="cx">
</span><span class="cx"> static switch_status_t interface_exists(char *the_interface);
</span><span class="cx"> static switch_status_t remove_interface(char *the_interface);
</span><span class="lines">@@ -1241,6 +1243,9 @@
</span><span class="cx"> } else if (!strcmp(var, "write_silence_when_idle")) {
</span><span class="cx"> set_global_write_silence_when_idle(val);
</span><span class="cx"> DEBUGA_SKYPE("globals.write_silence_when_idle=%s\n", SKYPOPEN_P_LOG, globals.write_silence_when_idle);
</span><ins>+ } else if (!strcmp(var, "setsockopt")) {
+ set_global_setsockopt(val);
+ DEBUGA_SKYPE("globals.setsockopt=%s\n", SKYPOPEN_P_LOG, globals.setsockopt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1261,6 +1266,7 @@
</span><span class="cx"> char *report_incoming_chatmessages = "true";
</span><span class="cx"> char *silent_mode = "false";
</span><span class="cx"> char *write_silence_when_idle = "true";
</span><ins>+ char *setsockopt = "false";
</ins><span class="cx"> uint32_t interface_id = 0;
</span><span class="cx">
</span><span class="cx"> if(globals.context)
</span><span class="lines">@@ -1277,6 +1283,8 @@
</span><span class="cx"> silent_mode=globals.silent_mode;
</span><span class="cx"> if(globals.write_silence_when_idle)
</span><span class="cx"> write_silence_when_idle=globals.write_silence_when_idle;
</span><ins>+ if(globals.setsockopt)
+ setsockopt=globals.setsockopt;
</ins><span class="cx">
</span><span class="cx"> tech_pvt = NULL;
</span><span class="cx">
</span><span class="lines">@@ -1298,6 +1306,8 @@
</span><span class="cx"> silent_mode = val;
</span><span class="cx"> } else if (!strcasecmp(var, "write_silence_when_idle")) {
</span><span class="cx"> write_silence_when_idle = val;
</span><ins>+ } else if (!strcasecmp(var, "setsockopt")) {
+ setsockopt = val;
</ins><span class="cx"> } else if (!strcasecmp(var, "X11-display") || !strcasecmp(var, "X11_display")) {
</span><span class="cx"> X11_display = val;
</span><span class="cx"> }
</span><span class="lines">@@ -1397,6 +1407,13 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!strcmp(setsockopt, "true") || !strcmp(setsockopt, "1")) {
+ globals.SKYPOPEN_INTERFACES[interface_id].setsockopt = 1;
+ } else {
+ globals.SKYPOPEN_INTERFACES[interface_id].setsockopt = 0; //redundant, just in case
+
+ }
+
</ins><span class="cx"> DEBUGA_SKYPE("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].name=%s\n",
</span><span class="cx"> SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].name);
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="lines">@@ -1423,6 +1440,9 @@
</span><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle=%d\n",
</span><span class="cx"> SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].write_silence_when_idle);
</span><ins>+ DEBUGA_SKYPE
+ ("interface_id=%d globals.SKYPOPEN_INTERFACES[interface_id].setsockopt=%d\n",
+ SKYPOPEN_P_LOG, interface_id, globals.SKYPOPEN_INTERFACES[interface_id].setsockopt);
</ins><span class="cx">
</span><span class="cx"> WARNINGA("STARTING interface_id=%d\n", SKYPOPEN_P_LOG, interface_id);
</span><span class="cx">
</span><span class="lines">@@ -1532,6 +1552,7 @@
</span><span class="cx"> globals.SKYPOPEN_INTERFACES[i].report_incoming_chatmessages);
</span><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].silent_mode=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].silent_mode);
</span><span class="cx"> DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].write_silence_when_idle=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].write_silence_when_idle);
</span><ins>+ DEBUGA_SKYPE("i=%d globals.SKYPOPEN_INTERFACES[%d].setsockopt=%d\n", SKYPOPEN_P_LOG, i, i, globals.SKYPOPEN_INTERFACES[i].setsockopt);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1775,6 +1796,7 @@
</span><span class="cx"> switch_safe_free(globals.report_incoming_chatmessages);
</span><span class="cx"> switch_safe_free(globals.silent_mode);
</span><span class="cx"> switch_safe_free(globals.write_silence_when_idle);
</span><ins>+ switch_safe_free(globals.setsockopt);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenskypopenh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen.h (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen.h 2010-04-06 15:55:58 UTC (rev 17227)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen.h 2010-04-06 16:05:15 UTC (rev 17228)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx"> switch_buffer_t *read_buffer;
</span><span class="cx"> int silent_mode;
</span><span class="cx"> int write_silence_when_idle;
</span><ins>+ int setsockopt;
</ins><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenskypopen_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen_protocol.c (17227 => 17228)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen_protocol.c 2010-04-06 15:55:58 UTC (rev 17227)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen_protocol.c 2010-04-06 16:05:15 UTC (rev 17228)
</span><span class="lines">@@ -103,7 +103,9 @@
</span><span class="cx"> sockbufsize = SAMPLES_PER_FRAME * 8;
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> size = sizeof(int);
</span><del>- setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
</del><ins>+ if(tech_pvt->setsockopt){
+ setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
+ }
</ins><span class="cx">
</span><span class="cx"> sockbufsize = 0;
</span><span class="cx"> size = sizeof(int);
</span><span class="lines">@@ -120,7 +122,9 @@
</span><span class="cx"> sockbufsize = SAMPLES_PER_FRAME * 8;
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> size = sizeof(int);
</span><del>- setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
</del><ins>+ if(tech_pvt->setsockopt){
+ setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
+ }
</ins><span class="cx">
</span><span class="cx"> sockbufsize = 0;
</span><span class="cx"> size = sizeof(int);
</span><span class="lines">@@ -131,7 +135,9 @@
</span><span class="cx"> getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
</span><span class="cx"> DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
</span><span class="cx"> flag = 1;
</span><del>- setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, size);
</del><ins>+ if(tech_pvt->setsockopt){
+ setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, size);
+ }
</ins><span class="cx"> flag = 0;
</span><span class="cx"> getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &flag, &size);
</span><span class="cx"> DEBUGA_SKYPE("TCP_NODELAY is %d\n", SKYPOPEN_P_LOG, flag);
</span><span class="lines">@@ -1563,6 +1569,7 @@
</span><span class="cx"> Window root = -1;
</span><span class="cx"> Window win = -1;
</span><span class="cx"> int xfd;
</span><ins>+ fd_set xfds;
</ins><span class="cx">
</span><span class="cx"> if (!strlen(tech_pvt->X11_display))
</span><span class="cx"> strcpy(tech_pvt->X11_display, getenv("DISPLAY"));
</span><span class="lines">@@ -1623,6 +1630,7 @@
</span><span class="cx"> int i;
</span><span class="cx"> int continue_is_broken = 0;
</span><span class="cx"> int there_were_continues = 0;
</span><ins>+ struct timeval tv;
</ins><span class="cx"> Atom atom_begin = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
</span><span class="cx"> Atom atom_continue = XInternAtom(disp, "SKYPECONTROLAPI_MESSAGE", False);
</span><span class="cx">
</span><span class="lines">@@ -1631,6 +1639,22 @@
</span><span class="cx"> b = buffer;
</span><span class="cx">
</span><span class="cx"> while (running && tech_pvt->running) {
</span><ins>+
+
+ FD_ZERO(&xfds);
+ FD_SET(xfd, &xfds);
+
+ tv.tv_usec = 100000;
+ tv.tv_sec = 0;
+
+
+
+if (select(xfd+1, &xfds, 0, 0, &tv)){
+
+while(XPending(disp)){
+
+
+
</ins><span class="cx"> XNextEvent(disp, &an_event);
</span><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="cx"> break;
</span><span class="lines">@@ -1664,7 +1688,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (an_event.xclient.message_type == atom_continue) {
</span><span class="cx"> if (!strlen(buffer)) {
</span><del>- DEBUGA_SKYPE
</del><ins>+ WARNINGA
</ins><span class="cx"> ("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||, let's store it and hope next 'begin' will be the good one\n",
</span><span class="cx"> SKYPOPEN_P_LOG, buf);
</span><span class="cx"> strcat(continuebuffer, buf);
</span><span class="lines">@@ -1703,8 +1727,16 @@
</span><span class="cx"> default:
</span><span class="cx"> skypopen_sleep(1000); //0.1 msec
</span><span class="cx"> break;
</span><del>- }
- }
</del><ins>+ } //switch event.type
+ } //while XPending
+
+} // if select
+} //while running
+
+
+
+
+
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> ERRORA("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypopen\n", SKYPOPEN_P_LOG);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>