<!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][17435] </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=17435">17435</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-28 17:17:50 -0500 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>freetdm: fix dchan libpri</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipec">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludeprivateftdm_coreh">freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_libpriftmod_libpric"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c (17434 => 17435)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-28 22:17:49 UTC (rev 17434)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c 2010-04-28 22:17:50 UTC (rev 17435)
</span><span class="lines">@@ -950,7 +950,8 @@
</span><span class="cx"> ftdm_channel_t *ftdmchan;
</span><span class="cx">
</span><span class="cx"> ftdm_log(FTDM_LOG_NOTICE, "-- Restarting %d:%d\n", spri->span->span_id, pevent->restart.channel);
</span><del>-
</del><ins>+
+ spri->dchan->state = FTDM_CHANNEL_STATE_UP;
</ins><span class="cx"> ftdmchan = span->channels[pevent->restart.channel];
</span><span class="cx">
</span><span class="cx"> if (!ftdmchan) {
</span><span class="lines">@@ -1132,6 +1133,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "PRI down on span %d\n", isdn_data->spri.span->span_id);
</span><ins>+ isdn_data->spri.dchan->state = FTDM_CHANNEL_STATE_DOWN;
</ins><span class="cx">
</span><span class="cx"> if (!down) {
</span><span class="cx"> ftdm_set_state_all(span, FTDM_CHANNEL_STATE_RESTART);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c (17434 => 17435)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c 2010-04-28 22:17:49 UTC (rev 17434)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c 2010-04-28 22:17:50 UTC (rev 17435)
</span><span class="lines">@@ -950,23 +950,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (alarms & WAN_TE_BIT_ALARM_AIS) {
</span><del>- ftdmchan->alarm_flags |= FTDM_ALARM_AIS;
</del><span class="cx"> ftdmchan->alarm_flags |= FTDM_ALARM_BLUE;
</span><span class="cx"> alarms &= ~WAN_TE_BIT_ALARM_AIS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (alarms & WAN_TE_BIT_ALARM_RAI) {
</span><del>- ftdmchan->alarm_flags |= FTDM_ALARM_RAI;
</del><span class="cx"> ftdmchan->alarm_flags |= FTDM_ALARM_YELLOW;
</span><span class="cx"> alarms &= ~WAN_TE_BIT_ALARM_RAI;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /* still missing to map:
- * FTDM_ALARM_RECOVER
- * FTDM_ALARM_LOOPBACK
- * FTDM_ALARM_NOTOPEN
- * */
-
</del><span class="cx"> /* if we still have alarms that we did not map, set the general alarm */
</span><span class="cx"> if (alarms) {
</span><span class="cx"> ftdm_log(FTDM_LOG_DEBUG, "Unmapped wanpipe alarms: %d\n", alarms);
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17434 => 17435)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:49 UTC (rev 17434)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-28 22:17:50 UTC (rev 17435)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx"> FTDM_STR2ENUM_P(ftdm_str2ftdm_chan_type, ftdm_chan_type2str, ftdm_chan_type_t)
</span><span class="cx">
</span><span class="cx"> #define FTDM_IS_VOICE_CHANNEL(ftdm_chan) ((ftdm_chan)->type != FTDM_CHAN_TYPE_DQ921 && (ftdm_chan)->type != FTDM_CHAN_TYPE_DQ931)
</span><ins>+#define FTDM_IS_DCHAN(ftdm_chan) ((ftdm_chan)->type == FTDM_CHAN_TYPE_DQ921 || (ftdm_chan)->type == FTDM_CHAN_TYPE_DQ931)
</ins><span class="cx">
</span><span class="cx"> typedef void (*ftdm_logger_t)(const char *file, const char *func, int line, int level, const char *fmt, ...);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeprivateftdm_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h (17434 => 17435)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h 2010-04-28 22:17:49 UTC (rev 17434)
+++ freeswitch/trunk/libs/freetdm/src/include/private/ftdm_core.h 2010-04-28 22:17:50 UTC (rev 17435)
</span><span class="lines">@@ -647,7 +647,9 @@
</span><span class="cx"> uint32_t j;
</span><span class="cx"> ftdm_mutex_lock(span->mutex);
</span><span class="cx"> for(j = 1; j <= span->chan_count; j++) {
</span><del>- ftdm_set_state_locked((span->channels[j]), state);
</del><ins>+ if (!FTDM_IS_DCHAN(span->channels[j])) {
+ ftdm_set_state_locked((span->channels[j]), state);
+ }
</ins><span class="cx"> }
</span><span class="cx"> ftdm_mutex_unlock(span->mutex);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>