Diff
Modified: freeswitch/trunk/bootstrap.sh ( => )
Modified: freeswitch/trunk/conf/sip_profiles/internal.xml
===================================================================
Modified: freeswitch/trunk/debian/freeswitch.conffiles ( => )
Modified: freeswitch/trunk/debian/freeswitch.install
===================================================================
Modified: freeswitch/trunk/docs/ChangeLog ( => )
Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c
===================================================================
Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17368 => 17369)
--- 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)
@@ -1013,6 +1013,7 @@
ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, 0, r);
} 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));
+ ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, 0, r);
} else {
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));
}
Modified: freeswitch/trunk/src/include/switch_rtp.h ( => )
Modified: freeswitch/trunk/src/include/switch_types.h
===================================================================
Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c ( => )
Modified: freeswitch/trunk/src/mod/endpoints/mod_gsmopen/mod_gsmopen.2008.vcproj
===================================================================
Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ( => )
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h
===================================================================
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ( => )
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
===================================================================
Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ( => )
Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c
===================================================================
Modified: freeswitch/trunk/src/switch.c ( => )
Modified: freeswitch/trunk/src/switch_core.c
===================================================================
Modified: freeswitch/trunk/src/switch_dso.c ( => )
Modified: freeswitch/trunk/src/switch_loadable_module.c
===================================================================
Modified: freeswitch/trunk/src/switch_rtp.c ( => )
Modified: freeswitch/trunk/src/switch_time.c
===================================================================