<!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][14632] </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=14632">14632</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-25 05:07:07 -0500 (Tue, 25 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: hangs up. Race between read and write on serial, heh. That's why took so much effort implement locking. OK, we'll reinstate it... :-) </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliaxh">freeswitch/branches/gmaruzz/mod_celliax/celliax.h</a></li>
<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_celliaxcelliaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax.h (14631 => 14632)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-25 08:46:59 UTC (rev 14631)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-25 10:07:07 UTC (rev 14632)
</span><span class="lines">@@ -494,3 +494,6 @@
</span><span class="cx"> int celliax_answer(private_t * tech_pvt);
</span><span class="cx"> int celliax_serial_answer(private_t * tech_pvt);
</span><span class="cx"> int celliax_serial_answer_AT(private_t * tech_pvt);
</span><ins>+int celliax_serial_hangup(private_t * tech_pvt);
+int celliax_serial_hangup_AT(private_t * tech_pvt);
+int celliax_hangup(private_t * tech_pvt);
</ins></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14631 => 14632)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-25 08:46:59 UTC (rev 14631)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-25 10:07:07 UTC (rev 14632)
</span><span class="lines">@@ -2095,9 +2095,11 @@
</span><span class="cx"> if (option_debug > 1)
</span><span class="cx"> DEBUGA_SKYPE("|%s| CALLFLOW_CALL_NOCARRIER\n", SKYPIAX_P_LOG,
</span><span class="cx"> tech_pvt->line_array.result[i]);
</span><del>- if (tech_pvt->interface_state != SKYPIAX_STATE_DOWN && tech_pvt->owner) {
- tech_pvt->owner->hangupcause = SKYPIAX_CAUSE_FAILURE;
- celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_HANGUP);
</del><ins>+ if (tech_pvt->interface_state != SKYPIAX_STATE_DOWN) {
+ //cicopet
+ celliax_hangup(tech_pvt);
+ //tech_pvt->owner->hangupcause = SKYPIAX_CAUSE_FAILURE;
+ //celliax_queue_control(tech_pvt->owner, SKYPIAX_CONTROL_HANGUP);
</ins><span class="cx"> } else {
</span><span class="cx"> ERRORA("Why NO CARRIER now?\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><span class="lines">@@ -3224,6 +3226,22 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+int celliax_serial_hangup(private_t * tech_pvt)
+{
+ if (tech_pvt->controldevprotocol == PROTOCOL_AT)
+ return celliax_serial_hangup_AT(tech_pvt);
+#ifdef CELLIAX_FBUS2
+ if (tech_pvt->controldevprotocol == PROTOCOL_FBUS2)
+ return celliax_serial_hangup_FBUS2(tech_pvt);
+#endif /* CELLIAX_FBUS2 */
+#ifdef CELLIAX_CVM
+ if (tech_pvt->controldevprotocol == PROTOCOL_CVM_BUSMAIL)
+ return celliax_serial_hangup_CVM_BUSMAIL(tech_pvt);
+#endif /* CELLIAX_CVM */
+ return -1;
+}
+
+
</ins><span class="cx"> int celliax_serial_hangup_AT(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx"> int res;
</span><span class="lines">@@ -3404,8 +3422,156 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/*! \brief Hangup celliax call
+ * Part of PBX interface, called from ast_hangup */
</ins><span class="cx">
</span><ins>+int celliax_hangup(private_t * tech_pvt)
+{
+
+ /* if there is not celliax pvt why we are here ? */
+ if (!tech_pvt) {
+ ERRORA("Asked to hangup channel not connected\n", SKYPIAX_P_LOG);
+ return 0;
+ }
+
+ if (option_debug) {
+ DEBUGA_PBX("ENTERING FUNC\n", SKYPIAX_P_LOG);
+ }
+
</ins><span class="cx"> #ifdef NOTDEF
</span><ins>+ /* shutdown the serial monitoring thread */
+ if (tech_pvt->controldev_thread && (tech_pvt->controldev_thread != SKYPIAX_PTHREADT_NULL)
+ && (tech_pvt->controldev_thread != SKYPIAX_PTHREADT_STOP)) {
+ if (pthread_cancel(tech_pvt->controldev_thread)) {
+ ERRORA("controldev_thread pthread_cancel failed, maybe he killed himself?\n",
+ SKYPIAX_P_LOG);
+ }
+ /* push it, maybe is stuck in a select or so */
+ if (pthread_kill(tech_pvt->controldev_thread, SIGURG)) {
+ DEBUGA_SKYPE("controldev_thread pthread_kill failed, no problem\n", SKYPIAX_P_LOG);
+ }
+#ifndef __CYGWIN__ /* under cygwin, this seems to be not reliable, get stuck at times */
+ /* wait for it to die */
+ if (pthread_join(tech_pvt->controldev_thread, NULL)) {
+ ERRORA("controldev_thread pthread_join failed, BAD\n", SKYPIAX_P_LOG);
+ }
+#else /* __CYGWIN__ */
+/* allow the serial thread to die */
+ usleep(300000); //300msecs
+#endif /* __CYGWIN__ */
+ }
+ tech_pvt->controldev_thread = SKYPIAX_PTHREADT_NULL;
+#endif// NOTDEF
+
+
+ if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
+ if (tech_pvt->interface_state != SKYPIAX_STATE_DOWN) {
+ /* actually hangup through the serial port */
+ if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
+ int res;
+ res = celliax_serial_hangup(tech_pvt);
+ if (res) {
+ ERRORA("celliax_serial_hangup error: %d\n", SKYPIAX_P_LOG, res);
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return -1;
+ }
+ }
+
+ while (tech_pvt->interface_state != SKYPIAX_STATE_DOWN) {
+ usleep(10000); //10msec
+ }
+ if (tech_pvt->interface_state != SKYPIAX_STATE_DOWN) {
+ ERRORA("call hangup failed\n", SKYPIAX_P_LOG);
+ return -1;
+ } else {
+ DEBUGA_SKYPE("call hungup\n", SKYPIAX_P_LOG);
+ }
+ }
+ } else {
+ tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
+ tech_pvt->phone_callflow = CALLFLOW_CALL_IDLE;
+ }
+
+ switch_set_flag(tech_pvt, TFLAG_HANGUP);
+#ifdef NOTDEF
+ /* if there is a dsp struct alloced, free it */
+ if (tech_pvt->dsp) {
+ ast_dsp_free(tech_pvt->dsp);
+ tech_pvt->dsp = NULL;
+ }
+#ifndef __CYGWIN__
+#ifdef CELLIAX_ALSA
+/* restart alsa */
+ snd_pcm_drop(tech_pvt->alsap);
+ snd_pcm_prepare(tech_pvt->alsap);
+
+ snd_pcm_prepare(tech_pvt->alsac);
+ snd_pcm_start(tech_pvt->alsac);
+#endif /* CELLIAX_ALSA */
+
+#endif /* __CYGWIN__ */
+#ifdef CELLIAX_PORTAUDIO
+ speex_echo_state_reset(tech_pvt->stream->echo_state);
+#endif // CELLIAX_PORTAUDIO
+
+ /* re-init the serial port, be paranoid */
+ if (tech_pvt->controldevprotocol != PROTOCOL_NO_SERIAL) {
+ tech_pvt->controldevfd = celliax_serial_init(p, tech_pvt->controldevice_speed);
+ if (tech_pvt->controldevfd < 1) {
+ ERRORA("bad, bad, bad\n", SKYPIAX_P_LOG);
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return -1;
+ }
+ }
+#ifndef ASTERISK_VERSION_1_4
+ /* subtract one to the usage count of Celliax-type channels */
+ LOKKA(&celliax_usecnt_lock);
+ celliax_usecnt--;
+ if (celliax_usecnt < 0)
+ ERRORA("Usecnt < 0???\n", SKYPIAX_P_LOG);
+ UNLOCKA(&celliax_usecnt_lock);
+ ast_update_use_count();
+#else /* ASTERISK_VERSION_1_4 */
+ ast_module_unref(ast_module_info->self);
+#endif /* ASTERISK_VERSION_1_4 */
+
+ /* our celliax pvt interface is no more part of a channel */
+ tech_pvt->owner = NULL;
+ /* our channel has no more this celliax pvt interface to manage */
+ c->tech_pvt = NULL;
+ /* set the channel state to DOWN, eg. available, not in active use */
+ if (ast_setstate(c, SKYPIAX_STATE_DOWN)) {
+ ERRORA("ast_setstate failed, BAD\n", SKYPIAX_P_LOG);
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return -1;
+ }
+
+ if (option_debug)
+ DEBUGA_PBX("Hanged Up\n", SKYPIAX_P_LOG);
+ /* restart the monitor thread, so it can recheck which interfaces it have to watch during its loop (the interfaces that are not owned by channels) */
+ if (celliax_restart_monitor()) {
+ ERRORA("celliax_restart_monitor failed, BAD\n", SKYPIAX_P_LOG);
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return -1;
+ }
+
+#endif// NOTDEF
+ if (option_debug) {
+ DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG);
+ }
+ return 0;
+}
+
+
+#ifdef NOTDEF
</ins><span class="cx"> int celliax_serial_call_AT(private_t * tech_pvt, char *dstr)
</span><span class="cx"> {
</span><span class="cx"> int res;
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14631 => 14632)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-25 08:46:59 UTC (rev 14631)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-25 10:07:07 UTC (rev 14632)
</span><span class="lines">@@ -252,6 +252,7 @@
</span><span class="cx"> ERRORA("celliax_codec FAILED\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+switch_clear_flag(tech_pvt, TFLAG_HANGUP);
</ins><span class="cx"> DEBUGA_SKYPE("celliax_codec SUCCESS\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -472,7 +473,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><del>- char msg_to_skype[256];
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -491,14 +491,10 @@
</span><span class="cx">
</span><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_IO);
</span><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_VOICE);
</span><del>- //switch_set_flag(tech_pvt, TFLAG_HANGUP);
</del><ins>+ switch_set_flag(tech_pvt, TFLAG_HANGUP);
</ins><span class="cx">
</span><del>- if (strlen(tech_pvt->skype_call_id)) {
- //switch_thread_cond_signal(tech_pvt->cond);
- DEBUGA_SKYPE("hanging up skype call: %s\n", SKYPIAX_P_LOG, tech_pvt->skype_call_id);
- sprintf(msg_to_skype, "ALTER CALL %s HANGUP", tech_pvt->skype_call_id);
- celliax_signaling_write(tech_pvt, msg_to_skype);
- }
</del><ins>+ celliax_hangup(tech_pvt);
+
</ins><span class="cx"> //memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
</span><span class="cx"> //*tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> DEBUGA_SKYPE("%s CHANNEL HANGUP\n", SKYPIAX_P_LOG, tech_pvt->name);
</span><span class="lines">@@ -646,6 +642,10 @@
</span><span class="cx"> tech_pvt->read_frame.flags = SFF_NONE;
</span><span class="cx"> *frame = NULL;
</span><span class="cx">
</span><ins>+ if (switch_test_flag(tech_pvt, TFLAG_HANGUP)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
</ins><span class="cx"> goto cng; //FIXME FIXME FIXME
</span><span class="cx"> if (!celliax_audio_read(tech_pvt)) {
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>