Revision
17381
Author
ncorbic
Date
2010-04-23 13:02:50 -0500 (Fri, 23 Apr 2010)

Log Message

Merge branch 'master' of git://git.freeswitch.org/freeswitch

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c

Modified Paths

Property Changed

Diff

Modified: freeswitch/trunk/.gitignore ( => )



Modified: freeswitch/trunk/Freeswitch.2008.express.sln
===================================================================

Modified: freeswitch/trunk/bootstrap.sh ( => )



Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/20-Demo.xml
===================================================================

Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/20-Local_extension.xml ( => )



Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/90-External.xml
===================================================================

Modified: freeswitch/trunk/conf/dialplan/skinny-patterns/99-Default_Drop.xml ( => )



Modified: freeswitch/trunk/conf/dialplan/skinny-patterns.xml
===================================================================

Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ( => )



Modified: freeswitch/trunk/conf/skinny_profiles/internal.xml
===================================================================

Modified: freeswitch/trunk/configure.in ( => )



Modified: freeswitch/trunk/debian/freeswitch.conffiles
===================================================================

Modified: freeswitch/trunk/debian/freeswitch.install ( => )



Modified: freeswitch/trunk/debian/rules
===================================================================

Modified: freeswitch/trunk/docs/ChangeLog ( => )



Modified: freeswitch/trunk/freeswitch.spec
===================================================================

Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c ( => )



Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
===================================================================
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-23 17:14:37 UTC (rev 17380)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-23 18:02:50 UTC (rev 17381)
@@ -617,9 +617,6 @@
 		return;
 	}
 
-	OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
-	SETUP_GRID[event->span][event->chan] = event->call_setup_id;
-
 	if (mcon->sigmod) {
 		ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
 	} else {
@@ -1011,8 +1008,8 @@
 			} else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP ||  ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
 				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));
 				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));
+			} 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));
@@ -1923,7 +1920,7 @@
 
 static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
 {
-	unsigned j;
+	unsigned int j;
 	int cnt=0;
 	ftdm_channel_state_t state_e = ftdm_str2ftdm_channel_state(state);
 	if (state_e == FTDM_CHANNEL_STATE_INVALID) {

Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h ( => )



Modified: freeswitch/trunk/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
===================================================================

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp.c ( => )



Modified: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/mpf.2008.vcproj ( => )



Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp/mrcp.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-client/mrcpclient.2008.vcproj ( => )



Modified: freeswitch/trunk/libs/unimrcp/libs/mrcp-signaling/mrcpsignaling.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/libs/mrcpv2-transport/mrcpv2transport.2008.vcproj ( => )



Modified: freeswitch/trunk/libs/unimrcp/libs/uni-rtsp/unirtsp.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-sofiasip/mrcpsofiasip.2008.vcproj ( => )



Modified: freeswitch/trunk/libs/unimrcp/modules/mrcp-unirtsp/mrcpunirtsp.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/win32/util.vbs ( => )



Modified: freeswitch/trunk/src/include/switch.h
===================================================================

Modified: freeswitch/trunk/src/include/switch_rtcp_frame.h ( => )



Modified: freeswitch/trunk/src/include/switch_rtp.h
===================================================================

Modified: freeswitch/trunk/src/include/switch_types.h ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
===================================================================

Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_nibblebill/mod_nibblebill.c
===================================================================

Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ( => )



Modified: freeswitch/trunk/src/mod/codecs/mod_mp4v/Makefile
===================================================================

Modified: freeswitch/trunk/src/mod/codecs/mod_mp4v/mod_mp4v.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_portaudio/mod_portaudio.c
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/mod_skypopen.2008.vcproj
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.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/event_handlers/mod_json_cdr/mod_json_cdr.2008.vcproj ( => )



Modified: freeswitch/trunk/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c
===================================================================

Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ( => )



Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
===================================================================

Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ( => )



Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c
===================================================================

Modified: freeswitch/trunk/src/switch.c ( => )



Modified: freeswitch/trunk/src/switch_channel.c
===================================================================

Modified: freeswitch/trunk/src/switch_core.c ( => )



Modified: freeswitch/trunk/src/switch_core_session.c
===================================================================

Modified: freeswitch/trunk/src/switch_core_sqldb.c ( => )



Modified: freeswitch/trunk/src/switch_dso.c
===================================================================

Modified: freeswitch/trunk/src/switch_event.c ( => )



Modified: freeswitch/trunk/src/switch_ivr_originate.c
===================================================================

Modified: freeswitch/trunk/src/switch_loadable_module.c ( => )



Modified: freeswitch/trunk/src/switch_rtp.c
===================================================================

Modified: freeswitch/trunk/src/switch_time.c ( => )