<!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][17381] </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=17381">17381</a></dd>
<dt>Author</dt> <dd>ncorbic</dd>
<dt>Date</dt> <dd>2010-04-23 13:02:50 -0500 (Fri, 23 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git://git.freeswitch.org/freeswitch
Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkgitignore">freeswitch/trunk/.gitignore</a></li>
<li><a href="#freeswitchtrunkFreeswitch2008expresssln">freeswitch/trunk/Freeswitch.2008.express.sln</a></li>
<li><a href="#freeswitchtrunkbootstrapsh">freeswitch/trunk/bootstrap.sh</a></li>
<li><a href="#freeswitchtrunkconfdialplanskinnypatterns20Demoxml">freeswitch/trunk/conf/dialplan/skinny-patterns/20-Demo.xml</a></li>
<li><a href="#freeswitchtrunkconfdialplanskinnypatterns20Local_extensionxml">freeswitch/trunk/conf/dialplan/skinny-patterns/20-Local_extension.xml</a></li>
<li><a href="#freeswitchtrunkconfdialplanskinnypatterns90Externalxml">freeswitch/trunk/conf/dialplan/skinny-patterns/90-External.xml</a></li>
<li><a href="#freeswitchtrunkconfdialplanskinnypatterns99Default_Dropxml">freeswitch/trunk/conf/dialplan/skinny-patterns/99-Default_Drop.xml</a></li>
<li><a href="#freeswitchtrunkconfdialplanskinnypatternsxml">freeswitch/trunk/conf/dialplan/skinny-patterns.xml</a></li>
<li><a href="#freeswitchtrunkconfsip_profilesinternalxml">freeswitch/trunk/conf/sip_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunkconfskinny_profilesinternalxml">freeswitch/trunk/conf/skinny_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</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="#freeswitchtrunkdebianrules">freeswitch/trunk/debian/rules</a></li>
<li><a href="#freeswitchtrunkdocsChangeLog">freeswitch/trunk/docs/ChangeLog</a></li>
<li><a href="#freeswitchtrunkfreeswitchspec">freeswitch/trunk/freeswitch.spec</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="#freeswitchtrunklibsfreetdmsrcincludeftdm_typesh">freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h</a></li>
<li><a href="#freeswitchtrunklibsopenzapsrcozmodozmod_ztozmod_ztc">freeswitch/trunk/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasdpsdpc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsaprtoolkitaprtoolkit2008vcproj">freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmpfmpf2008vcproj">freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmrcpmrcp2008vcproj">freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmrcpclientmrcpclient2008vcproj">freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmrcpsignalingmrcpsignaling2008vcproj">freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmrcpv2transportmrcpv2transport2008vcproj">freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsunirtspunirtsp2008vcproj">freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcpmodulesmrcpsofiasipmrcpsofiasip2008vcproj">freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcpmodulesmrcpunirtspmrcpunirtsp2008vcproj">freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibswin32utilvbs">freeswitch/trunk/libs/win32/util.vbs</a></li>
<li><a href="#freeswitchtrunksrcincludeswitchh">freeswitch/trunk/src/include/switch.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_rtcp_frameh">freeswitch/trunk/src/include/switch_rtcp_frame.h</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_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_nibblebillmod_nibblebillc">freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc">freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_mp4vMakefile">freeswitch/trunk/src/mod/codecs/mod_mp4v/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_mp4vmod_mp4vc">freeswitch/trunk/src/mod/codecs/mod_mp4v/mod_mp4v.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_portaudiomod_portaudioc">freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl">freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenmod_skypopen2008vcproj">freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.2008.vcproj</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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="#freeswitchtrunksrcmodevent_handlersmod_json_cdrmod_json_cdr2008vcproj">freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_json_cdrmod_json_cdrc">freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_sndfilemod_sndfilec">freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</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_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_dsoc">freeswitch/trunk/src/switch_dso.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_eventc">freeswitch/trunk/src/switch_event.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.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="#freeswitchtrunkdebianrules">freeswitch/trunk/debian/rules</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c</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="freeswitchtrunkgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/.gitignore ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/Freeswitch.2008.express.sln
</span><span class="cx">===================================================================
</span></span></pre></div>
<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/dialplan/skinny-patterns/20-Demo.xml
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkconfdialplanskinnypatterns20Local_extensionxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/20-Local_extension.xml ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/90-External.xml
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkconfdialplanskinnypatterns99Default_Dropxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/99-Default_Drop.xml ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/conf/dialplan/skinny-patterns.xml
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkconfsip_profilesinternalxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/conf/skinny_profiles/internal.xml
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/debian/freeswitch.conffiles
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunkdebianfreeswitchinstall"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/debian/freeswitch.install ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/debian/rules
</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/freeswitch.spec
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-23 17:14:37 UTC (rev 17380)
</del><ins>+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-23 18:02:50 UTC (rev 17381)
</ins><span class="lines">@@ -617,9 +617,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
- SETUP_GRID[event->span][event->chan] = event->call_setup_id;
-
</del><span class="cx"> if (mcon->sigmod) {
</span><span class="cx"> ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1011,8 +1008,8 @@
</span><span class="cx"> } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP || ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
</span><span class="cx"> ftdm_log(FTDM_LOG_CRIT, "s%dc%d:FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
</span><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
</span><del>- } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
- 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));
</del><ins>+ } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
+ 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));
</ins><span class="cx"> ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
</span><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="lines">@@ -1923,7 +1920,7 @@
</span><span class="cx">
</span><span class="cx"> static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
</span><span class="cx"> {
</span><del>- unsigned j;
</del><ins>+ unsigned int j;
</ins><span class="cx"> int cnt=0;
</span><span class="cx"> ftdm_channel_state_t state_e = ftdm_str2ftdm_channel_state(state);
</span><span class="cx"> if (state_e == FTDM_CHANNEL_STATE_INVALID) {
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludeftdm_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasdpsdpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcplibsmpfmpf2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcplibsmrcpclientmrcpclient2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcplibsmrcpv2transportmrcpv2transport2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcpmodulesmrcpsofiasipmrcpsofiasip2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibswin32utilvbs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/win32/util.vbs ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/include/switch.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_rtcp_frameh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_rtcp_frame.h ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/include/switch_rtp.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/codecs/mod_mp4v/Makefile
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_mp4vmod_mp4vc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_mp4v/mod_mp4v.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_portaudio/mod_portaudio.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.2008.vcproj
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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="freeswitchtrunksrcmodevent_handlersmod_json_cdrmod_json_cdr2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.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/languages/mod_managed/freeswitch_wrap.cxx
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ( => )</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_channel.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_core_session.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_dso.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_eventc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_event.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_ivr_originate.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_loadable_modulec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_loadable_module.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_rtp.c
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>