<!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][14610] </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=14610">14610</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-23 19:41:24 -0500 (Sun, 23 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: beginning to avoid crashes when Skype clients die, XWindows related</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_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 (14609 => 14610)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-24 00:22:16 UTC (rev 14609)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2009-08-24 00:41:24 UTC (rev 14610)
</span><span class="lines">@@ -359,17 +359,19 @@
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
</span><span class="cx"> }
</span><span class="cx"> #else
</span><del>- XEvent e;
- Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
- memset(&e, 0, sizeof(e));
- e.xclient.type = ClientMessage;
- e.xclient.message_type = atom1; /* leading message */
- e.xclient.display = tech_pvt->SkypiaxHandles.disp;
- e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
- e.xclient.format = 8;
</del><ins>+ if(tech_pvt->running && tech_pvt->SkypiaxHandles.disp){
+ XEvent e;
+ Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN", False);
+ memset(&e, 0, sizeof(e));
+ e.xclient.type = ClientMessage;
+ e.xclient.message_type = atom1; /* leading message */
+ e.xclient.display = tech_pvt->SkypiaxHandles.disp;
+ e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
+ e.xclient.format = 8;
</ins><span class="cx">
</span><del>- XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
- XSync(tech_pvt->SkypiaxHandles.disp, False);
</del><ins>+ XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
+ XSync(tech_pvt->SkypiaxHandles.disp, False);
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1441,18 +1443,20 @@
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].skypiax_api_thread = NULL;
</span><span class="cx"> }
</span><span class="cx"> #else
</span><del>- XEvent e;
- Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
- False);
- memset(&e, 0, sizeof(e));
- e.xclient.type = ClientMessage;
- e.xclient.message_type = atom1; /* leading message */
- e.xclient.display = tech_pvt->SkypiaxHandles.disp;
- e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
- e.xclient.format = 8;
</del><ins>+ if(tech_pvt->SkypiaxHandles.disp){
+ XEvent e;
+ Atom atom1 = XInternAtom(tech_pvt->SkypiaxHandles.disp, "SKYPECONTROLAPI_MESSAGE_BEGIN",
+ False);
+ memset(&e, 0, sizeof(e));
+ e.xclient.type = ClientMessage;
+ e.xclient.message_type = atom1; /* leading message */
+ e.xclient.display = tech_pvt->SkypiaxHandles.disp;
+ e.xclient.window = tech_pvt->SkypiaxHandles.skype_win;
+ e.xclient.format = 8;
</ins><span class="cx">
</span><del>- XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
- XSync(tech_pvt->SkypiaxHandles.disp, False);
</del><ins>+ XSendEvent(tech_pvt->SkypiaxHandles.disp, tech_pvt->SkypiaxHandles.win, False, 0, &e);
+ XSync(tech_pvt->SkypiaxHandles.disp, False);
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> x = 10;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (14609 => 14610)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-08-24 00:22:16 UTC (rev 14609)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2009-08-24 00:41:24 UTC (rev 14610)
</span><span class="lines">@@ -1271,7 +1271,7 @@
</span><span class="cx">
</span><span class="cx"> xerror = err->error_code;
</span><span class="cx"> ERRORA("Received error code %d from X Server\n\n", SKYPIAX_P_LOG, xerror); ///FIXME why crash the entire skypiax? just crash the interface, instead
</span><del>- running = 0;
</del><ins>+ //running = 0;
</ins><span class="cx"> return 0; /* ignore the error */
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1287,15 +1287,16 @@
</span><span class="cx"> return (xerror != BadValue) && (xerror != BadWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
</del><ins>+int skypiax_send_message(private_t * tech_pvt, const char *message_P)
</ins><span class="cx"> {
</span><del>-
</del><ins>+ struct SkypiaxHandles *SkypiaxHandles;
</ins><span class="cx"> Window w_P;
</span><span class="cx"> Display *disp;
</span><span class="cx"> Window handle_P;
</span><span class="cx"> int ok;
</span><del>- private_t *tech_pvt = NULL;
</del><ins>+ //private_t *tech_pvt = NULL;
</ins><span class="cx">
</span><ins>+ SkypiaxHandles = &tech_pvt->SkypiaxHandles;
</ins><span class="cx"> w_P = SkypiaxHandles->skype_win;
</span><span class="cx"> disp = SkypiaxHandles->disp;
</span><span class="cx"> handle_P = SkypiaxHandles->win;
</span><span class="lines">@@ -1328,8 +1329,11 @@
</span><span class="cx"> XSync(disp, False);
</span><span class="cx"> ok = X11_errors_untrap();
</span><span class="cx">
</span><del>- if (!ok)
</del><ins>+ if (!ok){
</ins><span class="cx"> ERRORA("Sending message failed with status %d\n", SKYPIAX_P_LOG, xerror);
</span><ins>+ tech_pvt->running = 0;
+ return 0;
+ }
</ins><span class="cx"> //XUnlockDisplay(disp);
</span><span class="cx">
</span><span class="cx"> return 1;
</span><span class="lines">@@ -1337,13 +1341,11 @@
</span><span class="cx">
</span><span class="cx"> int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
</span><span class="cx"> {
</span><del>- struct SkypiaxHandles *SkypiaxHandles;
</del><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("SENDING: |||%s||||\n", SKYPIAX_P_LOG, msg_to_skype);
</span><span class="cx">
</span><del>- SkypiaxHandles = &tech_pvt->SkypiaxHandles;
</del><span class="cx">
</span><del>- if (!skypiax_send_message(SkypiaxHandles, msg_to_skype)) {
</del><ins>+ if (!skypiax_send_message(tech_pvt, msg_to_skype)) {
</ins><span class="cx"> ERRORA
</span><span class="cx"> ("Sending message failed - probably Skype crashed.\n\nPlease shutdown Skypiax, then restart Skype, then launch Skypiax and try again.\n",
</span><span class="cx"> SKYPIAX_P_LOG);
</span><span class="lines">@@ -1457,7 +1459,7 @@
</span><span class="cx">
</span><span class="cx"> snprintf(buf, 512, "NAME skypiax");
</span><span class="cx">
</span><del>- if (!skypiax_send_message(SkypiaxHandles, buf)) {
</del><ins>+ if (!skypiax_send_message(tech_pvt, buf)) {
</ins><span class="cx"> ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
</span><span class="cx"> running = 0;
</span><span class="cx"> if(disp)
</span><span class="lines">@@ -1466,7 +1468,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> snprintf(buf, 512, "PROTOCOL 7");
</span><del>- if (!skypiax_send_message(SkypiaxHandles, buf)) {
</del><ins>+ if (!skypiax_send_message(tech_pvt, buf)) {
</ins><span class="cx"> ERRORA("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG);
</span><span class="cx"> running = 0;
</span><span class="cx"> if(disp)
</span><span class="lines">@@ -1487,7 +1489,7 @@
</span><span class="cx"> memset(buffer, '\0', 17000);
</span><span class="cx"> b = buffer;
</span><span class="cx">
</span><del>- while (1) {
</del><ins>+ while (running && tech_pvt->running) {
</ins><span class="cx"> XNextEvent(disp, &an_event);
</span><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>