<!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][14627] </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=14627">14627</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-24 17:02:22 -0500 (Mon, 24 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: react to RING and CLIP, almost take the incoming call</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc">freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc">freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14626 => 14627)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-24 21:00:10 UTC (rev 14626)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-24 22:02:22 UTC (rev 14627)
</span><span class="lines">@@ -1398,9 +1398,24 @@
</span><span class="cx"> //if (celliax_present(SkypiaxHandles))
</span><span class="cx"> if (1) {
</span><span class="cx"> while (running) {
</span><ins>+ int res;
</ins><span class="cx"> //celliax_sleep(1000000); //1 sec
</span><span class="cx"> //DEBUGA_SKYPE("ciao!\n", SKYPIAX_P_LOG);
</span><del>- celliax_serial_read(tech_pvt);
</del><ins>+ res=celliax_serial_read(tech_pvt);
+ if (res == -1) { //manage the graceful interface shutdown
+ tech_pvt->controldev_dead = 1;
+ close(tech_pvt->controldevfd);
+ ERRORA("celliax_serial_monitor failed, declaring %s dead\n", SKYPIAX_P_LOG,
+ tech_pvt->controldevice_name);
+ } else if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL
+ && tech_pvt->interface_state == SKYPIAX_STATE_RING) {
+ if (option_debug)
+ WARNINGA("INCOMING RING, let's take the incoming call\n", SKYPIAX_P_LOG);
+ //FIXME if (!celliax_new(p, AST_STATE_RING, tech_pvt->context)) {
+ //FIXME ERRORA("celliax_new failed! BAD BAD BAD\n", CELLIAX_P_LOG);
+ //FIXME }
+ }
+
</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 Skypiax\n", SKYPIAX_P_LOG);
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14626 => 14627)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-24 21:00:10 UTC (rev 14626)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-24 22:02:22 UTC (rev 14627)
</span><span class="lines">@@ -1248,7 +1248,116 @@
</span><span class="cx"> switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].controldevice_name, controldevice_name);
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].controldevice_speed = controldevice_speed;
</span><span class="cx"> globals.SKYPIAX_INTERFACES[interface_id].controldevprotocol = controldevprotocol;
</span><ins>+/*********************/
+#ifdef NOTDEF
+ .interface_state = SKYPIAX_STATE_DOWN;
+ .phone_callflow = CALLFLOW_CALL_IDLE;
+ .dsp_silence_threshold = 512;
+ .context = "default";
+ .language = "en";
+ .exten = "s";
+ .controldevice_name = "none";
+ .controldevfd = 0;
+ .next = NULL;
+ .owner = NULL;
+ .dsp = NULL;
+ .fbus2_outgoing_list = NULL;
+ .seqnumfbus = FBUS2_SEQNUM_MAX;
+ .controldev_thread = AST_PTHREADT_NULL;
+ .arraycounter = 0;
+#ifndef GIOVA48
+ .celliax_sound_rate = 8000;
+#else // GIOVA48
+ .celliax_sound_rate = 48000;
+#endif // GIOVA48
+ .celliax_sound_capt_fd = -1;
+ .need_acoustic_ring = 0;
+ .celliax_serial_synced_timestamp = 0;
+ .celliax_serial_sync_period = 300;
+ .audio_play_reset_timestamp = 0;
+ .audio_capture_reset_timestamp = 0;
+ .controldevice_speed = B38400;
+ .capture_boost = 0;
+ .playback_boost = 0;
+ .stripmsd = 0;
+ .controldev_dead = 0;
+ .dtmf_inited = 0;
+#endif// NOTDEF
+ //at_dial_pre_number = "AT+CKPD=\"";
+switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_dial_pre_number, "ATD");
+ //.at_dial_post_number = "S\"";
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_dial_post_number , ";");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_dial_expect , "OK");
+ globals.SKYPIAX_INTERFACES[interface_id].at_early_audio = 0;
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_hangup , "ATH");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_hangup_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_answer , "ATA");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_answer_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_send_dtmf , "AT+VTS");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_1 , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_1_expect , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_2 , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_2_expect , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_3 , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_3_expect , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_4 , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_4_expect , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_5 , "");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_preinit_5_expect , "");
+ globals.SKYPIAX_INTERFACES[interface_id].at_after_preinit_pause = 500000;
+ globals.SKYPIAX_INTERFACES[interface_id].at_initial_pause = 500000;
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_1 , "at+cmic=0,9");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_1_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_2 , "AT+CKPD=\"EEE\"");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_2_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_3 , "AT+CSSN=1,0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_3_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_4 , "at+sidet=0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_4_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_5 , "at+clvl=99");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_postinit_5_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_query_battchg , "AT+CBC");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_query_battchg_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_query_signal , "AT+CSQ");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_query_signal_expect , "OK");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_call_idle , "+MCST: 1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_call_incoming , "+MCST: 2");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_call_active , "+CSSI: 7");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_call_failed , "+MCST: 65");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_call_calling , "+CSSI: 1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_noservice_string , "CIEV: 2;0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_nosignal_string , "CIEV: 5;0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_lowsignal_string , "CIEV: 5;1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_lowbattchg_string , "CIEV: 0;1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_nobattchg_string , "CIEV: 0;0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_callactive_string , "CIEV: 3;1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_nocallactive_string , "CIEV: 3;0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_nocallsetup_string , "CIEV: 6;0");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_callsetupincoming_string , "CIEV: 6;1");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_callsetupoutgoing_string , "CIEV: 6;2");
+ switch_set_string(globals.SKYPIAX_INTERFACES[interface_id].at_indicator_callsetupremoteringing_string , "CIEV: 6;3");
+ globals.SKYPIAX_INTERFACES[interface_id].at_has_clcc = 0;
+ globals.SKYPIAX_INTERFACES[interface_id].at_has_ecam = 0;
</ins><span class="cx">
</span><ins>+#ifdef NOTDEF
+ .celliax_dir_entry_extension_prefix = 5;
+
+#ifdef CELLIAX_ALSA
+ .alsa_period_size = 160,
+ .alsa_periods_in_buffer = 4,
+ .alsac = NULL,
+ .alsap = NULL,
+ .alsawrite_filled = 0,
+#endif /* CELLIAX_ALSA */
+
+#endif// NOTDEF
+
+
+
+
+
+
+/*********************/
</ins><span class="cx"> DEBUGA_SKYPE
</span><span class="cx"> ("interface_id=%d globals.SKYPIAX_INTERFACES[interface_id].X11_display=%s\n",
</span><span class="cx"> SKYPIAX_P_LOG, interface_id, globals.SKYPIAX_INTERFACES[interface_id].X11_display);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>