<!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][16511] </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=16511">16511</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-25 08:48:11 -0600 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: asterisk, trying to fix a 'no carrier' after 'ath'</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenasteriskMakefile">freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/Makefile</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenasteriskcelliaxh">freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenasteriskcelliax_additionalc">freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax_additional.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenasteriskchan_celliaxc">freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/chan_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopenasteriskMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/Makefile (16510 => 16511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/Makefile 2010-01-25 14:19:23 UTC (rev 16510)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/Makefile 2010-01-25 14:48:11 UTC (rev 16511)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> #ASTERISK INCLUDE FILES
</span><span class="cx"> #The directory that contains the Asterisk include files (eg: /usr/include or /usr/include/asterisk or /usr/src/asterisk/include or ...)
</span><span class="cx"> #AST_INCLUDE_DIR=/usr/src/off_dev/asterisk-1.2.rev137401/include
</span><del>-AST_INCLUDE_DIR=/usr/src/asterisk-1.4.26.2/include
</del><ins>+AST_INCLUDE_DIR=/usr/src/asterisk-1.4.27.1/include
</ins><span class="cx"> #AST_INCLUDE_DIR=/usr/src/asterisk-1.6.0.10/include
</span><span class="cx">
</span><span class="cx"> #ASTERISK VERSION
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenasteriskcelliaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax.h (16510 => 16511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax.h 2010-01-25 14:19:23 UTC (rev 16510)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax.h 2010-01-25 14:48:11 UTC (rev 16511)
</span><span class="lines">@@ -151,6 +151,7 @@
</span><span class="cx"> #define CALLFLOW_CALL_OUTGOINGRESTRICTED 107
</span><span class="cx"> #define CALLFLOW_CALL_SECURITYFAIL 108
</span><span class="cx"> #define CALLFLOW_CALL_NOANSWER 109
</span><ins>+#define CALLFLOW_CALL_HANGUP_REQUESTED 110
</ins><span class="cx"> //fixme CALLFLOW_GOT_IMEI to be removed
</span><span class="cx"> #define CALLFLOW_GOT_IMEI 1009
</span><span class="cx"> //fixme CALLFLOW_INCOMING_CALLID to be removed
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenasteriskcelliax_additionalc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax_additional.c (16510 => 16511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax_additional.c 2010-01-25 14:19:23 UTC (rev 16510)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/celliax_additional.c 2010-01-25 14:48:11 UTC (rev 16511)
</span><span class="lines">@@ -1483,18 +1483,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ((strcmp(p->line_array.result[i], "NO CARRIER") == 0)) {
</span><del>- p->phone_callflow = CALLFLOW_CALL_NOCARRIER;
- if (option_debug > 1)
- DEBUGA_AT("|%s| CALLFLOW_CALL_NOCARRIER\n", CELLIAX_P_LOG,
- p->line_array.result[i]);
- p->control_to_send = 0;
- usleep(20000);
- if (p->interface_state != AST_STATE_DOWN && p->owner) {
- p->owner->hangupcause = AST_CAUSE_FAILURE;
- celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
- } else {
- ERRORA("Why NO CARRIER now?\n", CELLIAX_P_LOG);
- }
</del><ins>+ if (p->phone_callflow != CALLFLOW_CALL_HANGUP_REQUESTED) {
+ p->phone_callflow = CALLFLOW_CALL_NOCARRIER;
+ if (option_debug > 1)
+ DEBUGA_AT("|%s| CALLFLOW_CALL_NOCARRIER\n", CELLIAX_P_LOG,
+ p->line_array.result[i]);
+ p->control_to_send = 0;
+ usleep(20000);
+ if (p->interface_state != AST_STATE_DOWN && p->owner) {
+ p->owner->hangupcause = AST_CAUSE_FAILURE;
+ celliax_queue_control(p->owner, AST_CONTROL_HANGUP);
+ } else {
+ ERRORA("Why NO CARRIER now?\n", CELLIAX_P_LOG);
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((strncmp(p->line_array.result[i], "+CBC:", 5) == 0)) {
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenasteriskchan_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/chan_celliax.c (16510 => 16511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/chan_celliax.c 2010-01-25 14:19:23 UTC (rev 16510)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/asterisk/chan_celliax.c 2010-01-25 14:48:11 UTC (rev 16511)
</span><span class="lines">@@ -656,6 +656,7 @@
</span><span class="cx"> DEBUGA_PBX("ENTERING FUNC\n", CELLIAX_P_LOG);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ p->phone_callflow = CALLFLOW_CALL_HANGUP_REQUESTED;
</ins><span class="cx"> /* shutdown the serial monitoring thread */
</span><span class="cx"> if (p->controldev_thread && (p->controldev_thread != AST_PTHREADT_NULL)
</span><span class="cx"> && (p->controldev_thread != AST_PTHREADT_STOP)) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>