<!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][17369] </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=17369">17369</a></dd>
<dt>Author</dt> <dd>dyatsin</dd>
<dt>Date</dt> <dd>2010-04-22 13:20:37 -0500 (Thu, 22 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git@git.freeswitch.org:freeswitch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
<li><a href="#freeswitchtrunkconfsip_profilesinternalxml">freeswitch/trunk/conf/sip_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunkdebianfreeswitchconffiles">freeswitch/trunk/debian/freeswitch.conffiles</a></li>
<li><a href="#freeswitchtrunkdebianfreeswitchinstall">freeswitch/trunk/debian/freeswitch.install</a></li>
<li><a href="#freeswitchtrunkdocsChangeLog">freeswitch/trunk/docs/ChangeLog</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_rtph">freeswitch/trunk/src/include/switch_rtp.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_nibblebillmod_nibblebillc">freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_gsmopenmod_gsmopen2008vcproj">freeswitch/trunk/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc">freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_sndfilemod_sndfilec">freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c</a></li>
<li><a href="#freeswitchtrunksrcmodloggersmod_logfilemod_logfilec">freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c</a></li>
<li><a href="#freeswitchtrunksrcswitchc">freeswitch/trunk/src/switch.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_dsoc">freeswitch/trunk/src/switch_dso.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_loadable_modulec">freeswitch/trunk/src/switch_loadable_module.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_timec">freeswitch/trunk/src/switch_time.c</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_nibblebillmod_nibblebillc">freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkbootstrapsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/bootstrap.sh ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/conf/sip_profiles/internal.xml
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkdebianfreeswitchconffiles"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/debian/freeswitch.conffiles ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/debian/freeswitch.install
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkdocsChangeLog"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/docs/ChangeLog ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17368 => 17369)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-22 15:22:28 UTC (rev 17368)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-22 18:20:37 UTC (rev 17369)
</span><span class="lines">@@ -1013,6 +1013,7 @@
</span><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
</span><span class="cx"> ftdm_log(FTDM_LOG_WARNING, "s%dc%d:Collision, hanging up incoming call\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</span><ins>+ ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE INVALID %s on IN CALL\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event), ftdm_channel_state2str(ftdmchan->state));
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_rtph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_rtp.h ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/include/switch_types.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_nibblebillmod_nibblebillc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_sndfilemod_sndfilec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitchc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_core.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_dsoc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_dso.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_loadable_module.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_time.c
</span><span class="cx">===================================================================
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>