February 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

09 Feb '07

Author: mikej Date: Thu Feb 8 21:36:03 2007 New Revision: 4176 Modified: freeswitch/trunk/libs/libdingaling/src/ldl_compat.h freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/libs/libdingaling/src/sha1.c freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.h freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/include/switch_buffer.h freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_config.h freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_frame.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/include/switch_sqlite.h freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/mod/applications/mod_park/mod_park.c freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch.c freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_config.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_resample.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_stun.c freeswitch/trunk/src/switch_utils.c freeswitch/trunk/src/switch_xml.c Log: fix magic emacs and vi formatting comments in the bottom of our source files to use tabs instead of spaces Modified: freeswitch/trunk/libs/libdingaling/src/ldl_compat.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/ldl_compat.h (original) +++ freeswitch/trunk/libs/libdingaling/src/ldl_compat.h Thu Feb 8 21:36:03 2007 @@ -65,7 +65,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Thu Feb 8 21:36:03 2007 @@ -2164,7 +2164,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Thu Feb 8 21:36:03 2007 @@ -570,7 +570,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libdingaling/src/sha1.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/sha1.c (original) +++ freeswitch/trunk/libs/libdingaling/src/sha1.c Thu Feb 8 21:36:03 2007 @@ -215,7 +215,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Thu Feb 8 21:36:03 2007 @@ -78,7 +78,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Thu Feb 8 21:36:03 2007 @@ -404,7 +404,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.h Thu Feb 8 21:36:03 2007 @@ -229,7 +229,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Thu Feb 8 21:36:03 2007 @@ -418,7 +418,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.h Thu Feb 8 21:36:03 2007 @@ -167,7 +167,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Thu Feb 8 21:36:03 2007 @@ -167,7 +167,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Thu Feb 8 21:36:03 2007 @@ -1467,7 +1467,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_buffer.h ============================================================================== --- freeswitch/trunk/src/include/switch_buffer.h (original) +++ freeswitch/trunk/src/include/switch_buffer.h Thu Feb 8 21:36:03 2007 @@ -135,7 +135,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Thu Feb 8 21:36:03 2007 @@ -210,7 +210,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Feb 8 21:36:03 2007 @@ -463,7 +463,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_config.h ============================================================================== --- freeswitch/trunk/src/include/switch_config.h (original) +++ freeswitch/trunk/src/include/switch_config.h Thu Feb 8 21:36:03 2007 @@ -113,7 +113,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Thu Feb 8 21:36:03 2007 @@ -75,7 +75,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Feb 8 21:36:03 2007 @@ -1441,7 +1441,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Thu Feb 8 21:36:03 2007 @@ -317,7 +317,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_frame.h ============================================================================== --- freeswitch/trunk/src/include/switch_frame.h (original) +++ freeswitch/trunk/src/include/switch_frame.h Thu Feb 8 21:36:03 2007 @@ -75,7 +75,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Feb 8 21:36:03 2007 @@ -630,7 +630,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Feb 8 21:36:03 2007 @@ -264,7 +264,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Thu Feb 8 21:36:03 2007 @@ -124,7 +124,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Feb 8 21:36:03 2007 @@ -618,7 +618,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Thu Feb 8 21:36:03 2007 @@ -168,7 +168,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Thu Feb 8 21:36:03 2007 @@ -171,7 +171,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Feb 8 21:36:03 2007 @@ -384,7 +384,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_sqlite.h ============================================================================== --- freeswitch/trunk/src/include/switch_sqlite.h (original) +++ freeswitch/trunk/src/include/switch_sqlite.h Thu Feb 8 21:36:03 2007 @@ -1812,7 +1812,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Thu Feb 8 21:36:03 2007 @@ -247,7 +247,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Feb 8 21:36:03 2007 @@ -976,7 +976,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Feb 8 21:36:03 2007 @@ -289,7 +289,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Feb 8 21:36:03 2007 @@ -353,7 +353,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c (original) +++ freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c Thu Feb 8 21:36:03 2007 @@ -144,7 +144,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Feb 8 21:36:03 2007 @@ -854,7 +854,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Feb 8 21:36:03 2007 @@ -4852,10 +4852,10 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: * For VIM: - * vim:set softtabstop = 4 shiftwidth = 4 tabstop = 4 expandtab: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: */ Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Feb 8 21:36:03 2007 @@ -684,7 +684,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c Thu Feb 8 21:36:03 2007 @@ -76,7 +76,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Thu Feb 8 21:36:03 2007 @@ -544,7 +544,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_park/mod_park.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_park/mod_park.c (original) +++ freeswitch/trunk/src/mod/applications/mod_park/mod_park.c Thu Feb 8 21:36:03 2007 @@ -69,7 +69,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Thu Feb 8 21:36:03 2007 @@ -240,7 +240,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Feb 8 21:36:03 2007 @@ -688,7 +688,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Thu Feb 8 21:36:03 2007 @@ -442,7 +442,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Thu Feb 8 21:36:03 2007 @@ -392,7 +392,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g722/mod_g722.c Thu Feb 8 21:36:03 2007 @@ -187,7 +187,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Thu Feb 8 21:36:03 2007 @@ -226,7 +226,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Thu Feb 8 21:36:03 2007 @@ -452,7 +452,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Thu Feb 8 21:36:03 2007 @@ -332,7 +332,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c Thu Feb 8 21:36:03 2007 @@ -177,7 +177,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Thu Feb 8 21:36:03 2007 @@ -336,7 +336,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Thu Feb 8 21:36:03 2007 @@ -438,7 +438,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c Thu Feb 8 21:36:03 2007 @@ -355,7 +355,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c Thu Feb 8 21:36:03 2007 @@ -185,7 +185,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Thu Feb 8 21:36:03 2007 @@ -387,7 +387,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c Thu Feb 8 21:36:03 2007 @@ -232,7 +232,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 21:36:03 2007 @@ -2730,7 +2730,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Feb 8 21:36:03 2007 @@ -1232,7 +1232,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Feb 8 21:36:03 2007 @@ -1763,7 +1763,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Feb 8 21:36:03 2007 @@ -5775,7 +5775,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Thu Feb 8 21:36:03 2007 @@ -1419,7 +1419,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Thu Feb 8 21:36:03 2007 @@ -409,7 +409,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h Thu Feb 8 21:36:03 2007 @@ -121,7 +121,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp Thu Feb 8 21:36:03 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h Thu Feb 8 21:36:03 2007 @@ -80,7 +80,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Thu Feb 8 21:36:03 2007 @@ -250,7 +250,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h Thu Feb 8 21:36:03 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp Thu Feb 8 21:36:03 2007 @@ -340,7 +340,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h Thu Feb 8 21:36:03 2007 @@ -83,7 +83,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Thu Feb 8 21:36:03 2007 @@ -205,7 +205,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Thu Feb 8 21:36:03 2007 @@ -659,7 +659,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h Thu Feb 8 21:36:03 2007 @@ -108,7 +108,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp Thu Feb 8 21:36:03 2007 @@ -255,7 +255,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h Thu Feb 8 21:36:03 2007 @@ -77,7 +77,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.cpp Thu Feb 8 21:36:03 2007 @@ -257,7 +257,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/xmlcdr.h Thu Feb 8 21:36:03 2007 @@ -78,7 +78,7 @@ /* For Emacs: * Local Variables: * mode:c++ - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Thu Feb 8 21:36:03 2007 @@ -334,7 +334,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Thu Feb 8 21:36:03 2007 @@ -1288,7 +1288,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c Thu Feb 8 21:36:03 2007 @@ -157,7 +157,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Thu Feb 8 21:36:03 2007 @@ -443,7 +443,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Thu Feb 8 21:36:03 2007 @@ -322,7 +322,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c (original) +++ freeswitch/trunk/src/mod/formats/mod_native_file/mod_native_file.c Thu Feb 8 21:36:03 2007 @@ -184,7 +184,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Thu Feb 8 21:36:03 2007 @@ -354,7 +354,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Thu Feb 8 21:36:03 2007 @@ -141,7 +141,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Feb 8 21:36:03 2007 @@ -2521,7 +2521,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Thu Feb 8 21:36:03 2007 @@ -304,7 +304,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c Thu Feb 8 21:36:03 2007 @@ -525,7 +525,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/mod_spidermonkey_odbc.c Thu Feb 8 21:36:03 2007 @@ -544,7 +544,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Thu Feb 8 21:36:03 2007 @@ -390,7 +390,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Thu Feb 8 21:36:03 2007 @@ -161,7 +161,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c ============================================================================== --- freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c (original) +++ freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c Thu Feb 8 21:36:03 2007 @@ -231,7 +231,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Feb 8 21:36:03 2007 @@ -247,7 +247,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Thu Feb 8 21:36:03 2007 @@ -268,7 +268,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Thu Feb 8 21:36:03 2007 @@ -395,7 +395,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Thu Feb 8 21:36:03 2007 @@ -258,7 +258,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Thu Feb 8 21:36:03 2007 @@ -252,7 +252,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Feb 8 21:36:03 2007 @@ -1285,7 +1285,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Thu Feb 8 21:36:03 2007 @@ -209,7 +209,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu Feb 8 21:36:03 2007 @@ -262,7 +262,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Feb 8 21:36:03 2007 @@ -4397,7 +4397,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Feb 8 21:36:03 2007 @@ -904,7 +904,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Feb 8 21:36:03 2007 @@ -4780,7 +4780,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Feb 8 21:36:03 2007 @@ -860,7 +860,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu Feb 8 21:36:03 2007 @@ -290,7 +290,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Thu Feb 8 21:36:03 2007 @@ -219,7 +219,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Feb 8 21:36:03 2007 @@ -1322,7 +1322,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Thu Feb 8 21:36:03 2007 @@ -374,7 +374,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Feb 8 21:36:03 2007 @@ -650,7 +650,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End: Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Feb 8 21:36:03 2007 @@ -1567,7 +1567,7 @@ /* For Emacs: * Local Variables: * mode:c - * indent-tabs-mode:nil + * indent-tabs-mode:t * tab-width:4 * c-basic-offset:4 * End:

1 0

[commit] r4175 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: mikej Date: Thu Feb 8 21:05:46 2007 New Revision: 4175 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Log: tweak the defines for memory barriers. This should fix the freebsd build, and adds proper memory barrier defines for msvc build. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Thu Feb 8 21:05:46 2007 @@ -71,7 +71,17 @@ * ****************/ -#if defined(__APPLE__) || defined(__FreeBSD__) +#if defined(__VIA_HACK__) +#define NO_BARRIER +#endif + +#if defined(NO_BARRIER) +# define PaUtil_FullMemoryBarrier() +# define PaUtil_ReadMemoryBarrier() +# define PaUtil_WriteMemoryBarrier() +#else + +#if defined(__APPLE__) //|| defined(__FreeBSD__) # include <libkern/OSAtomic.h> /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide full memory barriers, so the three types of barriers are the same. */ @@ -85,39 +95,29 @@ # define PaUtil_FullMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("sync":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory") -# elif defined(__VIA_HACK__) -# define PaUtil_FullMemoryBarrier() -# define PaUtil_ReadMemoryBarrier() -# define PaUtil_WriteMemoryBarrier() # elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__) # define PaUtil_FullMemoryBarrier() asm volatile("mfence":::"memory") # define PaUtil_ReadMemoryBarrier() asm volatile("lfence":::"memory") # define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory") # else -# ifdef ALLOW_SMP_DANGERS -# warning Memory barriers not defined on this system or system unknown -# warning For SMP safety, you should fix this. -# define PaUtil_FullMemoryBarrier() -# define PaUtil_ReadMemoryBarrier() -# define PaUtil_WriteMemoryBarrier() -# else -# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed. -# endif -# endif -#else -# ifdef ALLOW_SMP_DANGERS -# ifndef _MSC_VER -# warning Memory barriers not defined on this system or system unknown -# warning For SMP safety, you should fix this. -# endif # define PaUtil_FullMemoryBarrier() # define PaUtil_ReadMemoryBarrier() # define PaUtil_WriteMemoryBarrier() -# else -# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed. # endif +#elif defined(_MSC_VER) +# include <intrin.h> +# pragma intrinsic(_ReadWriteBarrier) +# pragma intrinsic(_ReadBarrier) +# pragma intrinsic(_WriteBarrier) +# define PaUtil_FullMemoryBarrier() _ReadWriteBarrier() +# define PaUtil_ReadMemoryBarrier() _ReadBarrier() +# define PaUtil_WriteMemoryBarrier() _WriteBarrier() +#else +# define PaUtil_FullMemoryBarrier() +# define PaUtil_ReadMemoryBarrier() +# define PaUtil_WriteMemoryBarrier() +#endif #endif - /*************************************************************************** * Initialize FIFO. * numBytes must be power of 2, returns -1 if not.

1 0

[commit] r4174 - in freeswitch/trunk/src: . include mod/endpoints/mod_iax mod/endpoints/mod_sofia mod/endpoints/mod_wanpipe
by Freeswitch SVN 09 Feb '07

09 Feb '07

Author: anthm Date: Thu Feb 8 20:34:01 2007 New Revision: 4174 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: improve core and basic flow Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Feb 8 20:34:01 2007 @@ -294,6 +294,13 @@ */ #define switch_channel_mark_answered(channel) switch_channel_perform_mark_answered(channel, __FILE__, __SWITCH_FUNC__, __LINE__) +/*! + \brief Mark a channel pre_answered (early media) with no indication (for outbound calls) + \param channel channel to mark pre_answered + \return SWITCH_STATUS_SUCCESS if channel was pre_answered successfully +*/ +#define switch_channel_mark_pre_answered(channel) switch_channel_perform_mark_pre_answered(channel, __FILE__, __SWITCH_FUNC__, __LINE__) + SWITCH_DECLARE(switch_status_t) switch_channel_perform_ringback(switch_channel_t *channel, const char *file, const char *func, @@ -310,6 +317,12 @@ const char *file, const char *func, int line); + +SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_channel_t *channel, + const char *file, + const char *func, + int line); + /*! \brief Indicate progress on a channel to attempt early media \param channel channel to pre-answer Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Feb 8 20:34:01 2007 @@ -523,6 +523,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_dequeue_message(switch_core_session_t *session, switch_core_session_message_t **message); /*! + \brief Flush a message queue on a given session + \param session the session to de-queue the message on + \return the SWITCH_STATUS_SUCCESS if the message was de-queued +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_flush_message(switch_core_session_t *session); + +/*! \brief Queue an event on another session using its uuid \param uuid_str the unique id of the session you want to send a message to \param event the event to send Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Thu Feb 8 20:34:01 2007 @@ -1035,7 +1035,7 @@ case IAX_EVENT_ACCEPT: if (channel && !switch_channel_test_flag(channel, CF_ANSWERED)) { if (tech_media(tech_pvt, iaxevent) == SWITCH_STATUS_SUCCESS) { - switch_channel_set_flag(channel, CF_EARLY_MEDIA); + switch_channel_mark_pre_answered(channel); } else { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Feb 8 20:34:01 2007 @@ -1580,7 +1580,7 @@ activate_rtp(tech_pvt); switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); - switch_channel_set_flag(channel, CF_EARLY_MEDIA); + switch_channel_mark_pre_answered(channel); return SWITCH_STATUS_SUCCESS; } @@ -2784,7 +2784,7 @@ if (r_sdp) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); - switch_channel_set_flag(channel, CF_EARLY_MEDIA); + switch_channel_mark_pre_answered(channel); if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); switch_channel_pre_answer(other_channel); Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Thu Feb 8 20:34:01 2007 @@ -84,6 +84,7 @@ char *dialplan; switch_hash_t *call_hash; switch_mutex_t *hash_mutex; + switch_mutex_t *channel_mutex; } globals; struct wanpipe_pri_span { @@ -138,12 +139,13 @@ int fd2; #endif }; +typedef struct private_object private_object_t; struct channel_map { - switch_core_session_t *map[36]; + char map[SANGOMA_MAX_CHAN_PER_SPAN][SWITCH_UUID_FORMATTED_LENGTH + 1]; }; -static int wp_close(struct private_object *tech_pvt) +static int wp_close(private_object_t *tech_pvt) { int ret = 0; @@ -157,7 +159,7 @@ return ret; } -static int wp_open(struct private_object *tech_pvt, int span, int chan) +static int wp_open(private_object_t *tech_pvt, int span, int chan) { sng_fd_t fd; wpsock_t *sock; @@ -317,7 +319,7 @@ */ static switch_status_t wanpipe_on_init(switch_core_session_t *session) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; wanpipe_tdm_api_t tdm_api = {{0}}; int err = 0; @@ -391,7 +393,7 @@ teletone_dtmf_detect_init (&tech_pvt->dtmf_detect, rate); if (switch_test_flag(tech_pvt, TFLAG_NOSIG)) { - switch_channel_answer(channel); + switch_channel_mark_answered(channel); } @@ -403,7 +405,7 @@ static switch_status_t wanpipe_on_ring(switch_core_session_t *session) { switch_channel_t *channel = NULL; - struct private_object *tech_pvt = NULL; + private_object_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -420,7 +422,7 @@ static switch_status_t wanpipe_on_hangup(switch_core_session_t *session) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; struct channel_map *chanmap = NULL; @@ -451,7 +453,7 @@ pri_destroycall(tech_pvt->spri->pri, tech_pvt->call); if (chanmap->map[tech_pvt->callno]) { - chanmap->map[tech_pvt->callno] = NULL; + chanmap->map[tech_pvt->callno][0] = '\0'; } /* pri_hangup(tech_pvt->spri->pri, @@ -477,7 +479,7 @@ static switch_status_t wanpipe_on_transmit(switch_core_session_t *session) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel; channel = switch_core_session_get_channel(session); @@ -495,7 +497,7 @@ static switch_status_t wanpipe_answer_channel(switch_core_session_t *session) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); @@ -515,7 +517,7 @@ static switch_status_t wanpipe_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; uint8_t *bp; uint32_t bytes = 0; @@ -598,7 +600,7 @@ static switch_status_t wanpipe_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flags, int stream_id) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; uint32_t result = 0; uint32_t bytes = frame->datalen; @@ -707,7 +709,7 @@ static switch_status_t wanpipe_send_dtmf(switch_core_session_t *session, char *digits) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; int wrote = 0; @@ -741,12 +743,44 @@ static switch_status_t wanpipe_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) { - return SWITCH_STATUS_FALSE; + switch_channel_t *channel; + private_object_t *tech_pvt; + switch_status_t status; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = (private_object_t *) switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + break; + case SWITCH_MESSAGE_INDICATE_MEDIA: + break; + case SWITCH_MESSAGE_INDICATE_HOLD: + break; + case SWITCH_MESSAGE_INDICATE_UNHOLD: + break; + case SWITCH_MESSAGE_INDICATE_BRIDGE: + break; + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + break; + case SWITCH_MESSAGE_INDICATE_REDIRECT: + break; + case SWITCH_MESSAGE_INDICATE_PROGRESS: + break; + case SWITCH_MESSAGE_INDICATE_RINGING: + break; + } + + return SWITCH_STATUS_SUCCESS; } static switch_status_t wanpipe_kill_channel(switch_core_session_t *session, int sig) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); @@ -838,11 +872,11 @@ if ((*new_session = switch_core_session_request(&wanpipe_endpoint_interface, pool))) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; switch_channel_t *channel; switch_core_session_add_stream(*new_session, NULL); - if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) { + if ((tech_pvt = (private_object_t *) switch_core_session_alloc(*new_session, sizeof(private_object_t)))) { memset(tech_pvt, 0, sizeof(*tech_pvt)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(*new_session)); channel = switch_core_session_get_channel(*new_session); @@ -924,6 +958,7 @@ return SWITCH_STATUS_GENERR; } } else { + switch_mutex_lock(globals.channel_mutex); do { if (autospan) { span++; @@ -933,23 +968,23 @@ if (channo == 0) { if (autochan > 0) { for(channo = 1; channo < SANGOMA_MAX_CHAN_PER_SPAN; channo++) { - if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo]) { + if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo][0]) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel %d\n", channo); break; } } } else if (autochan < 0) { for(channo = SANGOMA_MAX_CHAN_PER_SPAN; channo > 0; channo--) { - if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo]) { + if ((SPANS[span]->bchans & (1 << channo)) && !chanmap->map[channo][0]) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing channel %d\n", channo); break; } } } - if (channo <= 0 || channo == (SANGOMA_MAX_CHAN_PER_SPAN)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Free Channels!\n"); + if (channo <= 0 || channo == (SANGOMA_MAX_CHAN_PER_SPAN)) { channo = 0; + break; } } if (channo) { @@ -957,7 +992,8 @@ } } } while(autospan && span < MAX_SPANS && !spri && !channo); - + switch_mutex_unlock(globals.channel_mutex); + if (!spri || channo == 0 || channo == (SANGOMA_MAX_CHAN_PER_SPAN)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Free Channels!\n"); switch_core_session_destroy(new_session); @@ -998,7 +1034,9 @@ return SWITCH_STATUS_GENERR; } pri_sr_free(sr); - chanmap->map[channo] = *new_session; + switch_copy_string(chanmap->map[channo], + switch_core_session_get_uuid(*new_session), + sizeof(chanmap->map[channo])); tech_pvt->spri = spri; } } @@ -1058,6 +1096,7 @@ memset(&globals, 0, sizeof(globals)); switch_core_hash_init(&globals.call_hash, module_pool); switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.channel_mutex, SWITCH_MUTEX_NESTED, module_pool); /* start the pri's */ if ((status = config_wanpipe(0)) != SWITCH_STATUS_SUCCESS) { @@ -1071,10 +1110,6 @@ return status; } - - - - /*event Handlers */ static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent) @@ -1091,10 +1126,10 @@ { struct channel_map *chanmap; switch_core_session_t *session; - struct private_object *tech_pvt; + private_object_t *tech_pvt; chanmap = spri->private_info; - if ((session = chanmap->map[pevent->hangup.channel])) { + if ((session = switch_core_session_locate(chanmap->map[pevent->hangup.channel]))) { switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); @@ -1111,7 +1146,8 @@ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - chanmap->map[pevent->hangup.channel] = NULL; + chanmap->map[pevent->hangup.channel][0] = '\0'; + switch_core_session_rwunlock(session); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Hanging up channel s%dc%d\n", spri->span, pevent->hangup.channel); @@ -1127,11 +1163,12 @@ chanmap = spri->private_info; - if ((session = chanmap->map[pevent->answer.channel])) { + if ((session = switch_core_session_locate(chanmap->map[pevent->answer.channel]))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Answer on channel s%dc%d\n", spri->span, pevent->answer.channel); channel = switch_core_session_get_channel(session); assert(channel != NULL); - switch_channel_answer(channel); + switch_channel_mark_answered(channel); + switch_core_session_rwunlock(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Answer on channel s%dc%d but it's not in use?\n", spri->span, pevent->answer.channel); } @@ -1148,65 +1185,68 @@ chanmap = spri->private_info; - if ((session = chanmap->map[pevent->proceeding.channel])) { - switch_caller_profile_t *originator; + if ((session = switch_core_session_locate(chanmap->map[pevent->proceeding.channel]))) { + char *uuid; + switch_core_session_message_t *msg; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Proceeding on channel s%dc%d\n", spri->span, pevent->proceeding.channel); channel = switch_core_session_get_channel(session); assert(channel != NULL); - if ((originator = switch_channel_get_originator_caller_profile(channel))) { - switch_core_session_message_t msg; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Passing progress to Originator %s\n", originator->chan_name); - - msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; - msg.from = switch_channel_get_name(channel); - - switch_core_session_message_send(originator->uuid, &msg); - - switch_channel_set_flag(channel, CF_EARLY_MEDIA); + if ((msg = malloc(sizeof(*msg)))) { + memset(msg, 0, sizeof(*msg)); + msg->message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; + msg->from = __FILE__; + switch_core_session_queue_message(session, msg); + switch_set_flag(msg, SCSMF_DYNAMIC); + switch_channel_mark_pre_answered(channel); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); } - //switch_channel_answer(channel); + switch_core_session_rwunlock(session); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Proceeding on channel s%dc%d but it's not in use?\n", spri->span, pevent->proceeding.channel); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Proceeding on channel s%dc%d but it's not in use?\n", + spri->span, pevent->proceeding.channel); } return 0; } -#if 0 + static int on_ringing(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent) { switch_core_session_t *session; switch_channel_t *channel; struct channel_map *chanmap; - struct private_object *tech_pvt; + private_object_t *tech_pvt; + switch_core_session_message_t *msg; chanmap = spri->private_info; - if ((session = chanmap->map[pevent->ringing.channel])) { + if ((session = switch_core_session_locate(chanmap->map[pevent->ringing.channel]))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d\n", spri->span, pevent->ringing.channel); channel = switch_core_session_get_channel(session); assert(channel != NULL); - pri_proceeding(spri->pri, pevent->ringing.call, pevent->ringing.channel, 0); - pri_acknowledge(spri->pri, pevent->ringing.call, pevent->ringing.channel, 0); - - tech_pvt = switch_core_session_get_private(session); - if (!tech_pvt->call) { - tech_pvt->call = pevent->ringing.call; + if ((msg = malloc(sizeof(*msg)))) { + memset(msg, 0, sizeof(*msg)); + msg->message_id = SWITCH_MESSAGE_INDICATE_RINGING; + msg->from = __FILE__; + switch_core_session_queue_message(session, msg); + switch_set_flag(msg, SCSMF_DYNAMIC); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); } - tech_pvt->callno = pevent->ring.channel; - tech_pvt->span = spri->span; + + switch_core_session_rwunlock(session); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d but it's not in use?\n", spri->span, pevent->ringing.channel); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "-- Ringing on channel s%dc%d %s but it's not in use?\n", spri->span, pevent->ringing.channel, chanmap->map[pevent->ringing.channel]); } return 0; } -#endif + static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *pevent) { @@ -1214,14 +1254,17 @@ switch_core_session_t *session; switch_channel_t *channel; struct channel_map *chanmap; - - + int ret = 0; + + switch_mutex_lock(globals.channel_mutex); chanmap = spri->private_info; - if (chanmap->map[pevent->ring.channel]) { + if (switch_core_session_locate(chanmap->map[pevent->ring.channel])) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "--Duplicate Ring on channel s%dc%d (ignored)\n", spri->span, pevent->ring.channel); - return 0; + switch_core_session_rwunlock(session); + ret = 0; + goto done; } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "-- Ring on channel s%dc%d (from %s to %s)\n", spri->span, pevent->ring.channel, @@ -1232,12 +1275,12 @@ pri_acknowledge(spri->pri, pevent->ring.call, pevent->ring.channel, 0); if ((session = switch_core_session_request(&wanpipe_endpoint_interface, NULL))) { - struct private_object *tech_pvt; + private_object_t *tech_pvt; char ani2str[4] = ""; //wanpipe_tdm_api_t tdm_api; switch_core_session_add_stream(session, NULL); - if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object)))) { + if ((tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { memset(tech_pvt, 0, sizeof(*tech_pvt)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); channel = switch_core_session_get_channel(session); @@ -1248,7 +1291,8 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_core_session_destroy(&session); - return 0; + ret = 0; + goto done; } if (pevent->ring.ani2 >= 0) { @@ -1288,18 +1332,19 @@ if (!wp_open(tech_pvt, spri->span, pevent->ring.channel)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open fd!\n"); } - //sangoma_tdm_set_hw_period(fd, &tdm_api, 480); - - chanmap->map[pevent->ring.channel] = session; + switch_copy_string(chanmap->map[pevent->ring.channel], switch_core_session_get_uuid(session), sizeof(chanmap->map[pevent->ring.channel])); + switch_channel_set_state(channel, CS_INIT); switch_core_session_thread_launch(session); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create new Inbound Channel!\n"); } - - return 0; + done: + switch_mutex_unlock(globals.channel_mutex); + + return ret; } static int check_flags(struct sangoma_pri *spri) @@ -1323,11 +1368,12 @@ chanmap = spri->private_info; - if ((session = chanmap->map[pevent->restart.channel])) { + if ((session = switch_core_session_locate(chanmap->map[pevent->restart.channel]))) { switch_channel_t *channel; channel = switch_core_session_get_channel(session); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hanging Up channel %s\n", switch_channel_get_name(channel)); switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + switch_core_session_rwunlock(session); } wp_restart(spri->span, pevent->restart.channel); @@ -1369,12 +1415,12 @@ static void *SWITCH_THREAD_FUNC pri_thread_run(switch_thread_t *thread, void *obj) { struct sangoma_pri *spri = obj; - struct channel_map chanmap; + struct channel_map chanmap = {0}; switch_event_t *s_event; SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANY, on_anything); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RING, on_ring); - //SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing); + SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_RINGING, on_ringing); //SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_SETUP_ACK, on_proceed); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_PROCEEDING, on_proceed); SANGOMA_MAP_PRI_EVENT((*spri), SANGOMA_PRI_EVENT_ANSWER, on_answer); @@ -1450,7 +1496,7 @@ for (span = switch_xml_child(cfg, "span"); span; span = span->next) { - char *id = switch_xml_attr(span, "id"); + char *id = (char *) switch_xml_attr(span, "id"); int32_t i = 0; current_span = 0; Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Feb 8 20:34:01 2007 @@ -978,6 +978,38 @@ return channel->state; } +SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_channel_t *channel, + const char *file, + const char *func, + int line) +{ + switch_event_t *event; + + if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { + char *uuid; + switch_core_session_t *other_session; + + switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); + switch_channel_set_flag(channel, CF_EARLY_MEDIA); + switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_fire(&event); + } + + /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel + */ + if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); + switch_core_session_rwunlock(other_session); + } + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel_t *channel, const char *file, const char *func, @@ -1006,15 +1038,7 @@ status = switch_core_session_message_send(uuid, &msg); if (status == SWITCH_STATUS_SUCCESS) { - switch_event_t *event; - - switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); - switch_channel_set_flag(channel, CF_EARLY_MEDIA); - switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); - if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_fire(&event); - } + status = switch_channel_perform_mark_pre_answered(channel, file, func, line); } return status; @@ -1060,6 +1084,8 @@ int line) { switch_event_t *event; + char *uuid; + switch_core_session_t *other_session; assert(channel != NULL); @@ -1083,6 +1109,15 @@ switch_channel_event_set_data(channel, event); switch_event_fire(&event); } + + /* if we're in a bridge and the other channel is in a blocking read they will never realize we have answered so send + a SWITCH_SIG_BREAK to interrupt any blocking reads on that channel + */ + if ((uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { + switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); + switch_core_session_rwunlock(other_session); + } + switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Feb 8 20:34:01 2007 @@ -1766,6 +1766,22 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_core_session_flush_message(switch_core_session_t *session) +{ + switch_core_session_message_t *message; + + if (switch_core_session_dequeue_message(session, &message) == SWITCH_STATUS_SUCCESS) { + if (switch_test_flag(message, SCSMF_DYNAMIC)) { + switch_safe_free(message); + } else { + message = NULL; + } + } + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_DECLARE(switch_status_t) switch_core_session_receive_event(switch_core_session_t *session, switch_event_t **event) { @@ -2151,6 +2167,9 @@ session->read_resampler = NULL; session->write_resampler = NULL; + /* clear indications */ + switch_core_session_flush_message(session); + /* wipe theese, they will be recreated if need be */ switch_buffer_destroy(&session->raw_read_buffer); switch_buffer_destroy(&session->raw_write_buffer); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Feb 8 20:34:01 2007 @@ -2021,8 +2021,9 @@ message = NULL; } } - + if (!ans_a && originator) { + if (!ans_b && switch_channel_test_flag(chan_b, CF_ANSWERED)) { switch_channel_answer(chan_a); ans_a++;

1 0

[commit] r4173 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 16:21:12 2007 New Revision: 4173 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: don't use a few more blocks either. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 16:21:12 2007 @@ -2551,6 +2551,8 @@ (strncasecmp(candidates[x].address, "10.", 3) && strncasecmp(candidates[x].address, "192.168.", 8) && strncasecmp(candidates[x].address, "127.", 4) && + strncasecmp(candidates[x].address, "255.", 4) && + strncasecmp(candidates[x].address, "0.", 2) && strncasecmp(candidates[x].address, "1.", 2) && strncasecmp(candidates[x].address, "2.", 2) && strncasecmp(candidates[x].address, "172.16.", 7) && @@ -2560,6 +2562,7 @@ strncasecmp(candidates[x].address, "172.2", 5) && strncasecmp(candidates[x].address, "172.30.", 7) && strncasecmp(candidates[x].address, "172.31.", 7) && + strncasecmp(candidates[x].address, "192.0.2.", 8) && // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them? strncasecmp(candidates[x].address, "169.254.", 8) ))) { ldl_payload_t payloads[5];

1 0

[commit] r4172 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 16:16:27 2007 New Revision: 4172 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: don't use 169.254. auto ip's either. Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 16:16:27 2007 @@ -2559,7 +2559,8 @@ strncasecmp(candidates[x].address, "172.19.", 7) && strncasecmp(candidates[x].address, "172.2", 5) && strncasecmp(candidates[x].address, "172.30.", 7) && - strncasecmp(candidates[x].address, "172.31.", 7) + strncasecmp(candidates[x].address, "172.31.", 7) && + strncasecmp(candidates[x].address, "169.254.", 8) ))) { ldl_payload_t payloads[5]; char *exten;

1 0

[commit] r4171 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 16:08:45 2007 New Revision: 4171 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: add a more descriptive error message on no (or no usable) candidates Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Feb 8 16:08:45 2007 @@ -703,6 +703,7 @@ } if (!(tech_pvt->remote_ip && tech_pvt->remote_port)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No valid candidates received!\n"); return 0; }

1 0

[commit] r4170 - in freeswitch/trunk/src: . include
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: anthm Date: Thu Feb 8 15:47:46 2007 New Revision: 4170 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_core.c Log: fix bug/race in core Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Feb 8 15:47:46 2007 @@ -485,6 +485,8 @@ CF_NOMEDIA = (1 << 13) - Channel has no media CF_SUSPEND = (1 << 14) - Suspend i/o CF_EVENT_PARSE = (1 << 15) - Suspend control events +CF_NO_INDICATE = (1 << 16) - Disable Indications +CF_REPEAT_STATE = (1 << 17) - Tell the state machine to repeat a state </pre> */ @@ -505,7 +507,8 @@ CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), CF_EVENT_PARSE = (1 << 15), - CF_NO_INDICATE = (1 << 16) + CF_NO_INDICATE = (1 << 16), + CF_REPEAT_STATE = (1 << 17) } switch_channel_flag_t; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Feb 8 15:47:46 2007 @@ -3014,6 +3014,7 @@ const switch_endpoint_interface_t *endpoint_interface; const switch_state_handler_table_t *driver_state_handler = NULL; const switch_state_handler_table_t *application_state_handler = NULL; + #ifdef CRASH_PROT switch_thread_id_t thread_id = switch_thread_self(); jmp_buf env; @@ -3065,7 +3066,12 @@ switch_mutex_lock(session->mutex); while ((state = switch_channel_get_state(session->channel)) != CS_DONE) { - if (state != laststate) { + uint8_t exception = 0; + if (switch_channel_test_flag(session->channel, CF_REPEAT_STATE)) { + switch_channel_clear_flag(session->channel, CF_REPEAT_STATE); + exception = 1; + } + if (state != laststate || state == CS_HANGUP || exception) { int index = 0; int proceed = 1; midstate = state;

1 0

[commit] r4169 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 15:16:08 2007 New Revision: 4169 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_utils.c Log: make sofia set network_addr as the address the packet was actually received from, not the address from the uri. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Thu Feb 8 15:16:08 2007 @@ -94,6 +94,15 @@ */ SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family); +/*! + \brief find the char representation of an ip adress + \param buf the buffer to write the ip adress found into + \param len the length of the buf + \param the struct in_addr * to get the adress from + \return the ip adress string +*/ +SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in); + #define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) /*! Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Feb 8 15:16:08 2007 @@ -74,6 +74,7 @@ #include <sofia-sip/su_md5.h> #include <sofia-sip/su_log.h> #include <sofia-sip/nea.h> +#include <sofia-sip/msg_addr.h> extern su_log_t tport_log[]; @@ -4173,7 +4174,7 @@ sip_unknown_t *un; private_object_t *tech_pvt = NULL; switch_channel_t *channel = NULL; - sip_from_t const *from = sip->sip_from; + sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; char *username, *req_username = NULL; @@ -4184,8 +4185,9 @@ char *via_rport, *via_host, *via_port; char *from_port; char uri[1024]; + char network_ip[80]; + - if (!(sip && sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); return; @@ -4212,6 +4214,9 @@ tech_pvt->key = switch_core_session_strdup(session, key); } + get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *)msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); + + to_user = (char *) to->a_url->url_user; to_host = (char *) to->a_url->url_host; if (!(to_port = (char *) to->a_url->url_port)) { @@ -4365,7 +4370,7 @@ profile->dialplan, displayname, (char *) from->a_url->url_user, - (char *) from->a_url->url_host, + network_ip, NULL, NULL, NULL, Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Feb 8 15:16:08 2007 @@ -36,7 +36,6 @@ #ifndef WIN32 #include <arpa/inet.h> #endif -static char *get_addr(char *buf, switch_size_t len, struct in_addr *in); SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family) { @@ -348,7 +347,7 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF"; -static char *get_addr(char *buf, switch_size_t len, struct in_addr *in) +SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in) { uint8_t x, *i; char *p = buf;

1 0

[commit] r4168 - freeswitch/trunk/libs/udns
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 14:35:07 2007 New Revision: 4168 Modified: freeswitch/trunk/libs/udns/udns.h Log: missing ; Modified: freeswitch/trunk/libs/udns/udns.h ============================================================================== --- freeswitch/trunk/libs/udns/udns.h (original) +++ freeswitch/trunk/libs/udns/udns.h Thu Feb 8 14:35:07 2007 @@ -62,7 +62,7 @@ #include "winsock2.h" typedef SOCKET dns_socket; #else -typedef int dns_socket +typedef int dns_socket; #endif UDNS_API const char *

1 0

[commit] r4167 - in freeswitch/trunk: libs/udns src/mod/applications/mod_enum
by Freeswitch SVN 08 Feb '07

08 Feb '07

Author: mikej Date: Thu Feb 8 14:23:36 2007 New Revision: 4167 Modified: freeswitch/trunk/libs/udns/udns.h freeswitch/trunk/libs/udns/udns_dn.c freeswitch/trunk/libs/udns/udns_parse.c freeswitch/trunk/libs/udns/udns_resolver.c freeswitch/trunk/libs/udns/udns_rr_txt.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: fix warnings and some windows compatibility issues in enum/udns Modified: freeswitch/trunk/libs/udns/udns.h ============================================================================== --- freeswitch/trunk/libs/udns/udns.h (original) +++ freeswitch/trunk/libs/udns/udns.h Thu Feb 8 14:23:36 2007 @@ -58,6 +58,13 @@ /**************************************************************************/ /**************** Common definitions **************************************/ +#ifdef WIN32 +#include "winsock2.h" +typedef SOCKET dns_socket; +#else +typedef int dns_socket +#endif + UDNS_API const char * dns_version(void); @@ -352,7 +359,7 @@ /* initialize default resolver context and open it if do_open is true. * <0 on failure. */ -UDNS_API int +UDNS_API dns_socket dns_init(int do_open); /* return new resolver context with the same settings as copy */ @@ -408,11 +415,11 @@ dns_set_dbgfn(struct dns_ctx *ctx, dns_dbgfn *dbgfn); /* open and return UDP socket */ -UDNS_API int +UDNS_API dns_socket dns_open(struct dns_ctx *ctx); /* return UDP socket or -1 if not open */ -UDNS_API int +UDNS_API dns_socket dns_sock(const struct dns_ctx *ctx); /* close the UDP socket */ Modified: freeswitch/trunk/libs/udns/udns_dn.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_dn.c (original) +++ freeswitch/trunk/libs/udns/udns_dn.c Thu Feb 8 14:23:36 2007 @@ -82,7 +82,7 @@ while(np < ne) { if (*np == '.') { /* label delimiter */ - c = dp - llab; /* length of the label */ + c = (unsigned)(dp - llab); /* length of the label */ if (!c) { /* empty label */ if (np == (dnscc_t *)name && np + 1 == ne) { /* special case for root dn, aka `.' */ @@ -131,7 +131,7 @@ *dp++ = (dnsc_t)c; /* place next out byte */ } - if ((c = dp - llab) > DNS_MAXLABEL) + if ((c = (unsigned)(dp - llab)) > DNS_MAXLABEL) return -1; /* label too long */ if ((llab[-1] = (dnsc_t)c) != 0) { *dp++ = 0; @@ -141,7 +141,7 @@ else if (isabs) *isabs = 1; - return dp - dn; + return (int)(dp - dn); } dnscc_t dns_inaddr_arpa_dn[14] = "\07in-addr\04arpa"; @@ -169,7 +169,7 @@ if (p > dne) return 0; *p = n + '0'; } - *dn = p - dn; + *dn = (dnsc_t)(p - dn); dn = p + 1; } return dn; @@ -187,7 +187,7 @@ l = dns_dnlen(tdn); if (p + l > dne) return dnsiz >= DNS_MAXDN ? -1 : 0; memcpy(p, tdn, l); - return (p + l) - dn; + return (int)((p + l) - dn); } int dns_a4ptodn(const struct in_addr *addr, const char *tname, @@ -232,7 +232,7 @@ l = dns_dnlen(tdn); if (p + l > dne) return dnsiz >= DNS_MAXDN ? -1 : 0; memcpy(p, tdn, l); - return (p + l) - dn; + return (int)((p + l) - dn); } int dns_a6ptodn(const struct in6_addr *addr, const char *tname, @@ -331,7 +331,7 @@ } if (np >= ne) goto toolong; *np++ = '\0'; - return np - name; + return (int)(np - name); toolong: return namesiz >= DNS_MAXNAME ? -1 : 0; } Modified: freeswitch/trunk/libs/udns/udns_parse.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_parse.c (original) +++ freeswitch/trunk/libs/udns/udns_parse.c Thu Feb 8 14:23:36 2007 @@ -60,7 +60,7 @@ *dp++ = 0; /* return next pos: either after the first jump or current */ *cur = jump ? jump : pp; - return dp - dn; + return (int)(dp - dn); } if (c & 192) { /* jump */ if (pp >= end) /* eop instead of jump pos */ Modified: freeswitch/trunk/libs/udns/udns_resolver.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_resolver.c (original) +++ freeswitch/trunk/libs/udns/udns_resolver.c Thu Feb 8 14:23:36 2007 @@ -22,6 +22,18 @@ */ #ifdef WIN32 +#ifdef _MSC_VER +#if (_MSC_VER >= 1400) // VC8+ +#ifndef _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE +#endif +#ifndef _CRT_NONSTDC_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE +#endif +#endif // VC8+ +#include "inet_pton.h" +#include "process.h" +#endif # include <winsock2.h> /* includes <windows.h> */ # include <ws2tcpip.h> /* needed for struct in6_addr */ # include <iphlpapi.h> /* for dns server addresses etc */ @@ -187,7 +199,7 @@ /* dynamic data */ unsigned short dnsc_nextid; /* next queue ID to use */ - int dnsc_udpsock; /* UDP socket */ + dns_socket dnsc_udpsock; /* UDP socket */ struct dns_qlink dnsc_qactive; /* active list sorted by deadline */ int dnsc_nactive; /* number entries in dnsc_qactive */ dnsc_t *dnsc_pbuf; /* packet buffer (udpbuf size) */ @@ -225,7 +237,14 @@ #define SETCTXFRESH(ctx) SETCTXINITED(ctx); assert(!CTXOPEN(ctx)) #define SETCTXINACTIVE(ctx) SETCTXINITED(ctx); assert(qlist_empty(&ctx->dnsc_qactive)) #define SETCTXOPEN(ctx) SETCTXINITED(ctx); assert(CTXOPEN(ctx)) +#ifdef WIN32 +#define CTXOPEN(ctx) (ctx->dnsc_udpsock != INVALID_SOCKET ) +#else #define CTXOPEN(ctx) (ctx->dnsc_udpsock >= 0) +#ifndef INVALID_SOCKET +#define INVALID_SOCKET -1 +#endif +#endif #if defined(NDEBUG) || !defined(DEBUG) #define dns_assert_ctx(ctx) @@ -321,7 +340,7 @@ } static void dns_set_opts_internal(struct dns_ctx *ctx, const char *opts) { - unsigned i, v; + size_t i, v; for(;;) { while(ISSPACE(*opts)) ++opts; if (!*opts) break; @@ -337,7 +356,7 @@ while (*opts >= '0' && *opts <= '9'); if (dns_opts[i].min && v < dns_opts[i].min) v = dns_opts[i].min; else if (v > dns_opts[i].max) v = dns_opts[i].max; - dns_ctxopt(ctx, dns_opts[i].offset) = v; + dns_ctxopt(ctx, dns_opts[i].offset) = (unsigned)v; break; } while(*opts && !ISSPACE(*opts)) ++opts; @@ -420,7 +439,7 @@ else if (!now || q->dnsq_deadline <= now) deadline = 0, timeout = 0; else - deadline = q->dnsq_deadline, timeout = deadline - now; + deadline = q->dnsq_deadline, timeout = (int)(deadline - now); if (ctx->dnsc_utmexp == deadline) return; ctx->dnsc_utmfn(ctx, timeout, ctx->dnsc_utmctx); @@ -608,10 +627,10 @@ static void dns_firstid(struct dns_ctx *ctx) { struct timeval tv; gettimeofday(&tv, NULL); - ctx->dnsc_nextid = (tv.tv_usec ^ getpid()) & 0xffff; + ctx->dnsc_nextid = (unsigned short)((tv.tv_usec ^ getpid()) & 0xffff); } -int dns_init(int do_open) { +dns_socket dns_init(int do_open) { struct dns_ctx *ctx = &dns_defctx; assert(!CTXINITED(ctx)); memset(ctx, 0, sizeof(*ctx)); @@ -620,7 +639,7 @@ ctx->dnsc_ndots = 1; ctx->dnsc_udpbuf = DNS_EDNS0PACKET; ctx->dnsc_port = DNS_PORT; - ctx->dnsc_udpsock = -1; + ctx->dnsc_udpsock = INVALID_SOCKET; qlist_init(&ctx->dnsc_qactive); if (dns_init_internal(ctx) != 0) return -1; @@ -637,7 +656,7 @@ if (!n) return NULL; *n = *ctx; - n->dnsc_udpsock = -1; + n->dnsc_udpsock = INVALID_SOCKET; qlist_init(&n->dnsc_qactive); n->dnsc_nactive = 0; n->dnsc_pbuf = NULL; @@ -665,8 +684,8 @@ memset(ctx, 0, sizeof(*ctx)); } -int dns_open(struct dns_ctx *ctx) { - int sock; +dns_socket dns_open(struct dns_ctx *ctx) { + dns_socket sock; unsigned i; int port; union sockaddr_ns *sns; @@ -768,12 +787,12 @@ SETCTXINITED(ctx); if (ctx->dnsc_udpsock < 0) return; closesocket(ctx->dnsc_udpsock); - ctx->dnsc_udpsock = -1; + ctx->dnsc_udpsock = INVALID_SOCKET; free(ctx->dnsc_pbuf); ctx->dnsc_pbuf = NULL; } -int dns_sock(const struct dns_ctx *ctx) { +dns_socket dns_sock(const struct dns_ctx *ctx) { SETCTXINITED(ctx); return ctx->dnsc_udpsock; } @@ -983,7 +1002,7 @@ q->dnsq_buf[DNS_H_ARCNT2] = 1; } assert(p <= q->dnsq_buf + DNS_QBUF); - q->dnsq_len = p - q->dnsq_buf; + q->dnsq_len = (unsigned)(p - q->dnsq_buf); qlist_add_head(q, &ctx->dnsc_qactive); ++ctx->dnsc_nactive; @@ -1248,7 +1267,7 @@ dns_request_utm(ctx, now); if (!q) return maxwait; - w = q->dnsq_deadline - now; + w = (int)(q->dnsq_deadline - now); return maxwait < 0 || maxwait > w ? w : maxwait; } @@ -1306,7 +1325,7 @@ tv.tv_sec = n; tv.tv_usec = 0; FD_SET(ctx->dnsc_udpsock, &rfd); - n = select(ctx->dnsc_udpsock + 1, &rfd, NULL, NULL, &tv); + n = select((int)(ctx->dnsc_udpsock + 1), &rfd, NULL, NULL, &tv); #endif now = time(NULL); if (n > 0) Modified: freeswitch/trunk/libs/udns/udns_rr_txt.c ============================================================================== --- freeswitch/trunk/libs/udns/udns_rr_txt.c (original) +++ freeswitch/trunk/libs/udns/udns_rr_txt.c Thu Feb 8 14:23:36 2007 @@ -75,7 +75,7 @@ sp += l; cp += l; } - ret->dnstxt_txt[r].len = sp - ret->dnstxt_txt[r].txt; + ret->dnstxt_txt[r].len = (int)(sp - ret->dnstxt_txt[r].txt); *sp++ = '\0'; } dns_stdrr_finish((struct dns_rr_null *)ret, (char*)sp, &p); Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Thu Feb 8 14:23:36 2007 @@ -423,7 +423,8 @@ char *name = NULL; enum_query_t query = {0}; enum dns_type l_qtyp = DNS_T_NAPTR; - int i = 0, fd = -1, abs = 0; + int i = 0, abs = 0; + dns_socket fd = (dns_socket)-1; fd_set fds; struct timeval tv = {0}; time_t now = 0; @@ -484,7 +485,7 @@ #endif tv.tv_sec = i; tv.tv_usec = 0; - i = select(fd+1, &fds, 0, 0, &tv); + i = select((int)(fd+1), &fds, 0, 0, &tv); now = time(NULL); if (i > 0) dns_ioevent(nctx, now); } @@ -500,7 +501,7 @@ if (fd > -1) { closesocket(fd); - fd = -1; + fd = (dns_socket)-1; } if (nctx) {

1 0