<!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][14843] </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=14843">14843</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-09-14 07:40:09 -0500 (Mon, 14 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: Linux (XWin signaling actually) now manages the case when a 'continue' atom(s) is received before the 'begin' atom. That's in preparation for managing IM chatting</pre>
<h3>Modified Paths</h3>
<ul>
<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_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (14842 => 14843)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-09-13 22:03:06 UTC (rev 14842)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-09-14 12:40:09 UTC (rev 14843)
</span><span class="lines">@@ -1487,13 +1487,16 @@
</span><span class="cx"> XEvent an_event;
</span><span class="cx"> char buf[21]; /* can't be longer */
</span><span class="cx"> char buffer[17000];
</span><ins>+ char continuebuffer[17000];
</ins><span class="cx"> char *b;
</span><span class="cx"> int i;
</span><span class="cx"> int continue_is_broken = 0;
</span><ins>+ int there_were_continues = 0;
</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="cx"> memset(buffer, '\0', 17000);
</span><ins>+ memset(continuebuffer, '\0', 17000);
</ins><span class="cx"> b = buffer;
</span><span class="cx">
</span><span class="cx"> while (running && tech_pvt->running) {
</span><span class="lines">@@ -1514,20 +1517,27 @@
</span><span class="cx"> //DEBUGA_SKYPE ("BUF=|||%s|||\n", SKYPIAX_P_LOG, buf);
</span><span class="cx">
</span><span class="cx"> if (an_event.xclient.message_type == atom_begin) {
</span><ins>+ //DEBUGA_SKYPE ("BEGIN BUF=|||%s|||\n", SKYPIAX_P_LOG, buf);
</ins><span class="cx">
</span><span class="cx"> if (strlen(buffer)) {
</span><span class="cx"> unsigned int howmany;
</span><span class="cx"> howmany = strlen(b) + 1;
</span><span class="cx"> howmany = write(SkypiaxHandles->fdesc[1], b, howmany);
</span><del>- DEBUGA_SKYPE("RECEIVED2=|||%s|||\n", SKYPIAX_P_LOG, buffer);
</del><ins>+ WARNINGA("A begin atom while the previous message is not closed???? value of previous message (between vertical bars) is=|||%s|||, will be lost\n", SKYPIAX_P_LOG, buffer);
</ins><span class="cx"> memset(buffer, '\0', 17000);
</span><span class="cx"> }
</span><ins>+ if(continue_is_broken){
+ continue_is_broken=0;
+ there_were_continues = 1;
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (an_event.xclient.message_type == atom_continue) {
</span><ins>+ //DEBUGA_SKYPE ("CONTINUE BUF=|||%s|||\n", SKYPIAX_P_LOG, buf);
</ins><span class="cx">
</span><span class="cx"> if (!strlen(buffer)) {
</span><span class="cx"> DEBUGA_SKYPE
</span><del>- ("Got a 'continue' XAtom without a previous 'begin'. It's value (between vertical bars) is=|||%s|||\n", SKYPIAX_P_LOG, buf);
</del><ins>+ ("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", SKYPIAX_P_LOG, buf);
+ strcat(continuebuffer, buf);
</ins><span class="cx"> continue_is_broken = 1;
</span><span class="cx"> if (!strncmp(buf, "ognised identity", 15)) {
</span><span class="cx"> WARNINGA
</span><span class="lines">@@ -1538,10 +1548,18 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ if(continue_is_broken){
+ continue;
+ }
</ins><span class="cx">
</span><ins>+ //DEBUGA_SKYPE ("i=%d, buffer=|||%s|||\n", SKYPIAX_P_LOG, i, buffer);
</ins><span class="cx"> strcat(buffer, buf);
</span><ins>+ //DEBUGA_SKYPE ("i=%d, buffer=|||%s|||\n", SKYPIAX_P_LOG, i, buffer);
+ strcat(buffer, continuebuffer);
+ //DEBUGA_SKYPE ("i=%d, buffer=|||%s|||\n", SKYPIAX_P_LOG, i, buffer);
+ memset(continuebuffer, '\0', 17000);
</ins><span class="cx">
</span><del>- if (i < 20 || continue_is_broken) { /* last fragment */
</del><ins>+ if (i < 20 || there_were_continues) { /* last fragment */
</ins><span class="cx"> unsigned int howmany;
</span><span class="cx">
</span><span class="cx"> howmany = strlen(b) + 1;
</span><span class="lines">@@ -1550,7 +1568,7 @@
</span><span class="cx"> //DEBUGA_SKYPE ("RECEIVED=|||%s|||\n", SKYPIAX_P_LOG, buffer);
</span><span class="cx"> memset(buffer, '\0', 17000);
</span><span class="cx"> XFlush(disp);
</span><del>- continue_is_broken = 0;
</del><ins>+ there_were_continues = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>