July 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8929 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_conference
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 12:26:10 2008 New Revision: 8929 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: underscores not dashes Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Jul 8 12:26:10 2008 @@ -97,7 +97,7 @@    </profile> 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 Tue Jul 8 12:26:10 2008 @@ -4274,7 +4274,7 @@ goto done; } - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 2; @@ -4306,7 +4306,7 @@ conference->pin = switch_core_strdup(conference->pool, dpin); } - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); /* Set the minimum number of members (once you go above it you cannot go below it) */ conference->min = 1; @@ -4317,7 +4317,7 @@ /* Start the conference thread for this conference */ launch_conference_thread(conference); } else { /* setup user variable */ - switch_channel_set_variable(channel, "conference-name", conference->name); + switch_channel_set_variable(channel, "conference_name", conference->name); } /* acquire a read lock on the thread so it can't leave without us */

1 0

[commit] r8928 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: anthm Date: Tue Jul 8 11:25:52 2008 New Revision: 8928 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Jul 8 11:25:52 2008 @@ -518,7 +518,7 @@ tportlog = 1; } - supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, Replaces", + supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, replaces", use_100rel ? "100rel, " : "", use_timer ? "timer, " : "" );

1 0

[commit] r8927 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 10:28:43 2008 New Revision: 8927 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add replaces to supported, SIP rocks so much nothing ever complained about it but let's add it anyway Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Jul 8 10:28:43 2008 @@ -518,7 +518,7 @@ tportlog = 1; } - supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path", + supported = switch_core_sprintf(profile->pool, "%s%sprecondition, path, Replaces", use_100rel ? "100rel, " : "", use_timer ? "timer, " : "" );

1 0

[commit] r8926 - in freeswitch/trunk/debian: . default monit
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: ctrix Date: Tue Jul 8 05:49:53 2008 New Revision: 8926 Added: freeswitch/trunk/debian/freeswitch-lang-es.install freeswitch/trunk/debian/freeswitch-lang-nl.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install freeswitch/trunk/debian/freeswitch-sounds-music-8000.install freeswitch/trunk/debian/freeswitch.default Removed: freeswitch/trunk/debian/default/ Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/debian/control freeswitch/trunk/debian/freeswitch.init freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/monit/freeswitch.monitrc freeswitch/trunk/debian/rules Log: Debian build scripts updates. * Updated revision number * Fixed init problem reported by Jay Binks (FSSCRIPTS-1) * Added a patch to the debian build system add more features (thanks to Hadley Rich) (FSBUILD-45) - Added en-us-callie sounds and music on hold packages - Added recommends and suggests - Added mod_say_es and mod_say_nl - Updated descriptions - Added mod_cdr_csv * Fixed typos and some errors in the previus patch. * Modified monit script. Now it should work. * The debian build system now bootstrap automagically if it's necessary and all scripts are in place. Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Tue Jul 8 05:49:53 2008 @@ -1,3 +1,19 @@ +freeswitch (1.0.1~trunk) unstable; urgency=low + + * Updated revision number + * Fixed init problem reported by Jay Binks (FSSCRIPTS-1) + * Added a patch to the debian build system add more features (thanks to Hadley Rich) (FSBUILD-45) + - Added en-us-callie sounds and music on hold packages + - Added recommends and suggests + - Added mod_say_es and mod_say_nl + - Updated descriptions + - Added mod_cdr_csv + * Fixed typos and some errors in the previus patch. + * Modified monit script. Now it should work. + * The debian build system now bootstrap automagically if it's necessary and all scripts are in place. + + -- Massimo Cetra <devel(a)navynet.it> Sun, 6 Jul 2008 16:30:00 +0100 + freeswitch (1.0.0-1) unstable; urgency=low * Enhanced sofia sip nat handling Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Tue Jul 8 05:49:53 2008 @@ -2,14 +2,15 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb4.4-dev, libgnutls-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), fakeroot, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev +Standards-Version: 3.7.3 Package: freeswitch Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, unixodbc, libasound2, libcurl3, openssl, libncurses5 -Suggests: monit -Description: A telephony platform that really kicks some ass... +Recommends: freeswitch-lang-en +Suggests: freeswitch-spidermonkey, freeswitch-lua, freeswitch-perl, freeswitch-sounds-music-8000, monit +Description: The FreeSWITCH open source telephony platform FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch. It can be used as a simple switching engine, a media gateway @@ -19,22 +20,22 @@ Package: freeswitch-dev Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: Development Package for the FreeSwitch open source telephony platform +Description: Development Package for the FreeSWITCH open source telephony platform Package: freeswitch-spidermonkey Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A Javascript engine for freeswitch +Description: A Javascript engine for FreeSWITCH Package: freeswitch-perl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A perl engine for freeswitch +Description: A perl engine for FreeSWITCH Package: freeswitch-lua Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch -Description: A lua engine for freeswitch +Description: A lua engine for FreeSWITCH Package: freeswitch-codec-passthru-g7231 Architecture: any @@ -54,8 +55,30 @@ Package: freeswitch-lang-en Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Recommends: freeswitch-sounds-en-us-callie-8000 +Suggests: freeswitch-sounds-en-us-callie-16000, freeswitch-sounds-en-us-callie-32000 Description: English language files for the FreeSWITCH open source telephony platform +Package: freeswitch-sounds-en-us-callie-8000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-sounds-en-us-callie-16000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform (16000) + +Package: freeswitch-sounds-en-us-callie-32000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform (32000) + +Package: freeswitch-sounds-music-8000 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Music on hold files for the FreeSWITCH open source telephony platform + Package: freeswitch-lang-de Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch @@ -70,3 +93,13 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Italian language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-lang-es +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Spanish language files for the FreeSWITCH open source telephony platform + +Package: freeswitch-lang-nl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Dutch language files for the FreeSWITCH open source telephony platform Added: freeswitch/trunk/debian/freeswitch-lang-es.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-es.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1 @@ +opt/freeswitch/mod/mod_say_es.so* Added: freeswitch/trunk/debian/freeswitch-lang-nl.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-nl.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1 @@ +opt/freeswitch/mod/mod_say_nl.so* Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-16000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/16000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-32000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/32000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-en-us-callie-8000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/en/us/callie/*/8000/* + Added: freeswitch/trunk/debian/freeswitch-sounds-music-8000.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-sounds-music-8000.install Tue Jul 8 05:49:53 2008 @@ -0,0 +1,2 @@ +opt/freeswitch/sounds/music/8000/* + Added: freeswitch/trunk/debian/freeswitch.default ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch.default Tue Jul 8 05:49:53 2008 @@ -0,0 +1,11 @@ +# Startup settings for FreeSWITCH + +# Enable initd (let init handle start and stop of freeswitch). +# Set to "true" (lowercase) to enable. + +FREESWITCH_ENABLED="false" + +# The parameters Freeswitch should be started with + +FREESWITCH_PARAMS="-nc" + Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Tue Jul 8 05:49:53 2008 @@ -19,26 +19,20 @@ DESC="FreeSwitch Voice Switching System" NAME=freeswitch DAEMON=/opt/freeswitch/bin/$NAME -DAEMON_ARGS="-nc" USER=freeswitch PIDFILE=/opt/freeswitch/log/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME # Check if we are being executed by init -. /etc/default/$NAME CALLEDSCRIPT=`basename $0` -echo $CALLEDSCRIPT -case "$CALLEDSCRIPT" in - freeswitch) - ;; - *) - if [ "$USE_INIT" != "TRUE" ]; then - echo "FreeSwitch disabled" ; - exit 0 ; - fi - ;; -esac + +if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi + +if [ "$FREESWITCH_ENABLED" != "true" ]; then + echo "$DESC not enabled yet. Edit /etc/default/$NAME first." + exit 0 ; +fi # Exit if the package is not installed # [ -x "$DAEMON" ] || exit 0 @@ -65,7 +59,7 @@ start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ + $FREESWITCH_PARAMS \ || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Tue Jul 8 05:49:53 2008 @@ -3,6 +3,7 @@ opt/freeswitch/bin/scripts/* opt/freeswitch/lib/libfreeswitch*.so* opt/freeswitch/mod/mod_shout* +opt/freeswitch/mod/mod_cdr_csv.so* opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_expr.so* opt/freeswitch/mod/mod_rss.so* Modified: freeswitch/trunk/debian/monit/freeswitch.monitrc ============================================================================== --- freeswitch/trunk/debian/monit/freeswitch.monitrc (original) +++ freeswitch/trunk/debian/monit/freeswitch.monitrc Tue Jul 8 05:49:53 2008 @@ -2,7 +2,10 @@ group voice start program = "/etc/init.d/freeswitch start" stop program = "/etc/init.d/freeswitch stop" - if failed port 5060 type UDP then restart +# Checks sip port on localhost, not wlways suitable +# if failed port 5060 type UDP then restart +# Checks mod_event_socket on localhost. Maybe more suitable + if failed port 8021 type TCP then restart if 5 restarts within 5 cycles then timeout depends on freeswitch_bin depends on freeswitch_rc @@ -10,9 +13,9 @@ check file freeswitch_bin with path /opt/freeswitch/bin/freeswitch group voice if failed checksum then unmonitor - if failed permission 755 then unmonitor + if failed permission 750 then unmonitor if failed uid freeswitch then unmonitor - if failed gid daemon then unmonitor +# if failed gid daemon then unmonitor check file freeswitch_rc with path /etc/init.d/freeswitch group voice Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Tue Jul 8 05:49:53 2008 @@ -16,13 +16,13 @@ export DIRECTORIES_MODULES= export DOTNET_MODULES= export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap -export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket +export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_cdr_csv export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile formats/mod_tone_stream formats/mod_shout export LANGUAGES_MODULES=languages/mod_perl languages/mod_lua export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog -export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr say/mod_say_it +export SAY_MODULES=say/mod_say_en say/mod_say_it say/mod_say_de say/mod_say_fr say/mod_say_es say/mod_say_nl export TIMERS_MODULES= -export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf say/mod_say_es say/mod_say_nl +export DISABLED_MODULES=applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES) export MODULES=$(MYMODULES) @@ -49,14 +49,21 @@ config.status: configure dh_testdir - rm modules.conf + rm -f modules.conf touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} -configure: bootstrap.sh - AUTOCONF=${AUTOCONF} ./bootstrap.sh +configure: + if test ! -f Makefile.in ; then \ + if test -f ./bootstrap.sh ; then \ + AUTOCONF=${AUTOCONF} ./bootstrap.sh ; \ + else \ + echo "No Makefile.in and no known way to bootstrap." ; \ + exit 1; \ + fi; \ + fi; build: build-stamp build-stamp: config.status @@ -89,7 +96,7 @@ dh_clean -k dh_installdirs -A --sourcedir=debian/tmp - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install uhd-sounds-install moh-install # Build architecture-independent files here. @@ -116,8 +123,7 @@ # dh_installinfo # dh_undocumented # dh_installman - cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freswitch.monitrc - cp debian/default/freeswitch debian/freeswitch/etc/default + cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freeswitch.monitrc dh_install --sourcedir=debian/tmp dh_strip dh_compress

1 0

[commit] r8925 - freeswitch/trunk/debian
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 03:33:35 2008 New Revision: 8925 Modified: freeswitch/trunk/debian/freeswitch.init Log: typo (FSSCRIPTS-1) Modified: freeswitch/trunk/debian/freeswitch.init ============================================================================== --- freeswitch/trunk/debian/freeswitch.init (original) +++ freeswitch/trunk/debian/freeswitch.init Tue Jul 8 03:33:35 2008 @@ -33,7 +33,7 @@ freeswitch) ;; *) - if [ "USE_INIT" != "TRUE" ]; then + if [ "$USE_INIT" != "TRUE" ]; then echo "FreeSwitch disabled" ; exit 0 ; fi

1 0

[commit] r8924 - in freeswitch/trunk: scripts/scenario src/mod/asr_tts/mod_pocketsphinx src/mod/languages/mod_python
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 02:59:02 2008 New Revision: 8924 Modified: freeswitch/trunk/scripts/scenario/phones.cfg freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Log: fix seg src/mod/languages/mod_python Modified: freeswitch/trunk/scripts/scenario/phones.cfg ============================================================================== --- freeswitch/trunk/scripts/scenario/phones.cfg (original) +++ freeswitch/trunk/scripts/scenario/phones.cfg Tue Jul 8 02:59:02 2008 @@ -1,4 +1,4 @@ -Snom_300,10.0.1.241,1000 +Snom_300,10.0.1.17,1000 Snom_320,10.0.1.242,1002 Snom_360,10.0.1.243,1006 Snom_370,10.0.1.244,1007 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 8 02:59:02 2008 @@ -32,7 +32,6 @@ #include <switch.h> #include <pocketsphinx.h> -#define MODELDIR "/usr/local/share/pocketsphinx/model" SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Tue Jul 8 02:59:02 2008 @@ -1,6 +1,6 @@ #include "freeswitch_python.h" -#define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) +#define py_sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0) #define py_init_vars() do { caller_profile.source = "mod_python"; swapstate = S_SWAPPED_IN; } while(0) PySession::PySession():CoreSession() @@ -21,7 +21,7 @@ void PySession::setDTMFCallback(PyObject * pyfunc, char *funcargs) { - sanity_check(); + py_sanity_check(); if (!PyCallable_Check(pyfunc)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "DTMF function is not a python function.\n"); @@ -51,10 +51,12 @@ void PySession::check_hangup_hook() { +#if 0 PyObject *func; PyObject *result; char *resultStr; bool did_swap_in = false; +#endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "check_hangup_hook has been DISABLED, please do not use hangup hooks in python code until further notice!\n"); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Jul 8 02:59:02 2008 @@ -249,40 +249,11 @@ return SWITCH_STATUS_SUCCESS; } -static switch_application_interface_t python_application_interface = { - /*.interface_name */ "python", - /*.application_function */ python_function, - NULL, NULL, NULL, - /* flags */ SAF_NONE, - /* should we support no media mode here? If so, we need to detect the mode, and either disable the media functions or indicate media if/when we need */ - /*.next */ NULL -}; - -static switch_api_interface_t python_run_interface = { - /*.interface_name */ "python", - /*.desc */ "run a python script", - /*.function */ launch_python, - /*.syntax */ "python </path/to/script>", - /*.next */ NULL -}; - -static switch_loadable_module_interface_t python_module_interface = { - /*.module_name */ modname, - /*.endpoint_interface */ NULL, - /*.timer_interface */ NULL, - /*.dialplan_interface */ NULL, - /*.codec_interface */ NULL, - /*.application_interface */ &python_application_interface, - /*.api_interface */ &python_run_interface, - /*.file_interface */ NULL, - /*.speech_interface */ NULL, - /*.directory_interface */ NULL -}; - SWITCH_MODULE_LOAD_FUNCTION(mod_python_load) { - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = &python_module_interface; + switch_api_interface_t *api_interface; + switch_application_interface_t *app_interface; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n"); if (!Py_IsInitialized()) { @@ -305,6 +276,13 @@ PyEval_ReleaseLock(); } + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(api_interface, "python", "run a python script", launch_python, "python </path/to/script>"); + SWITCH_ADD_APP(app_interface, "python", "Launch python ivr", "Run a python ivr on a channel", python_function, "<script> [additional_vars [...]]", + SAF_SUPPORT_NOMEDIA); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8923 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:54:33 2008 New Revision: 8923 Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml Log: dox Modified: freeswitch/trunk/conf/autoload_configs/conference.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/conference.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/conference.conf.xml Tue Jul 8 00:54:33 2008 @@ -94,6 +94,11 @@   <param name="comfort-noise" value="true"/> +  +  +  </profile> <profile name="wideband">

1 0

[commit] r8922 - freeswitch/trunk/libs/sofia-sip
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:37:05 2008 New Revision: 8922 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE freeswitch/trunk/libs/sofia-sip/configure.ac Log: Thu Jun 5 11:48:10 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * configure.ac, RELEASE: 1.12.9 Modified: freeswitch/trunk/libs/sofia-sip/RELEASE ============================================================================== --- freeswitch/trunk/libs/sofia-sip/RELEASE (original) +++ freeswitch/trunk/libs/sofia-sip/RELEASE Tue Jul 8 00:37:05 2008 @@ -1,6 +1,6 @@ -====================================== -Release notes for Sofia-SIP 1.12.9pre1 -====================================== +================================== +Release notes for Sofia-SIP 1.12.9 +================================== Changes since last release -------------------------- @@ -104,3 +104,5 @@ - Fixed sf.net bug #1930055: nat detection did not un-REGISTER natted contact if fist response to REGISTER was 200 OK. - Fixed crashes in soa if m= lines were removed from user sdp. +- Fixed problem detecting CANCEL with To-tag copied from a provisional + response Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Tue Jul 8 00:37:05 2008 @@ -11,7 +11,7 @@ dnl --------------------------- dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR -AC_INIT([sofia-sip], [1.12.8pre1.12.9.1]) +AC_INIT([sofia-sip], [1.12.9]) AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) AC_SUBST(VER_LIBSOFIA_SIP_UA_MAJOR_MINOR, [1.12]) dnl Includedir specific to this sofia version

1 0

[commit] r8921 - freeswitch/trunk/libs/sofia-sip/win32
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:36:41 2008 New Revision: 8921 Modified: freeswitch/trunk/libs/sofia-sip/win32/README.txt Log: Thu Jun 5 11:46:04 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * win32/README.txt: updated download link for IPv6 Technology Preview. Modified: freeswitch/trunk/libs/sofia-sip/win32/README.txt ============================================================================== --- freeswitch/trunk/libs/sofia-sip/win32/README.txt (original) +++ freeswitch/trunk/libs/sofia-sip/win32/README.txt Tue Jul 8 00:36:41 2008 @@ -9,6 +9,7 @@ shared and static libraries for libsofia-sip-ua, and a few test programs. The test programs can be run with the script check.cmd. + Preparing the build tree ------------------------ @@ -23,29 +24,35 @@ - plus many sites, a web search for "win32 awk" will provide you many more links -Notes pthread support ---------------------- + +Notes for pthread support +------------------------- There is a pthread implementation for Visual C on Win32 included. Source code and documentation for the pthread library can also be downloaded from http://sources.redhat.com/pthreads-win32/. + MS-VC6 specific notes --------------------- The MSVC6 workspace file is "SofiaSIP.dsw". -With Visual Studio 6, and Windows 2000 or older Platform SDK, you -need to have so called "IPv6 Technology Preview for Windows 2000" -installed, in order to compile Sofia-SIP. This is required even -if IPv6 support is disabled (the socket APIs of older Platfrom SDKs -are insufficient). +With Visual Studio 6, and Windows 2000 or older Platform SDK, you need to +have the header files from the so called "IPv6 Technology Preview for +Windows 2000" installed, in order to compile Sofia-SIP. This is required +even if IPv6 support is disabled (the socket APIs of older Platfrom SDKs are +insufficient). -You can download the preview SDK from: -http://msdn.microsoft.com/downloads/sdks/platform/tpipv6.asp +You can download the preview SDK from Microsoft Download Center: + +http://www.microsoft.com/downloads/ + +Search for "IPv6 Technology Preview for Windows 2000". With newer Platform SDKs, the IPv6 Preview SDK is not needed. + MSVC2005 specific notes ------------------------

1 0

[commit] r8920 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta libsofia-sip-ua/nth libsofia-sip-ua/nua libsofia-sip-ua/sresolv libsofia-sip-ua/stun libsofia-sip-ua/su libsofia-sip-ua/tport tests utils
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: mikej Date: Tue Jul 8 00:36:13 2008 New Revision: 8920 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c freeswitch/trunk/libs/sofia-sip/tests/test_init.c freeswitch/trunk/libs/sofia-sip/tests/test_nat.c freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Log: Thu Jun 5 10:23:18 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * Using su_inet_ntop and su_inet_pton Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Jul 8 00:36:13 2008 @@ -1 +1 @@ -Thu Jun 5 12:20:19 EDT 2008 +Tue Jul 8 00:36:02 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c Tue Jul 8 00:36:13 2008 @@ -636,16 +636,16 @@ *m->m_url = *ag->ag_contact->m_url; if (host_is_ip4_address(m->m_url->url_host)) { - inet_pton(su->su_family = AF_INET, - m->m_url->url_host, - &su->su_sin.sin_addr); + su_inet_pton(su->su_family = AF_INET, + m->m_url->url_host, + &su->su_sin.sin_addr); ag->ag_su_nta_len = (sizeof su->su_sin); } else { TEST_1(host_is_ip_address(m->m_url->url_host)); - inet_pton(su->su_family = AF_INET6, - m->m_url->url_host, - &su->su_sin6.sin6_addr); + su_inet_pton(su->su_family = AF_INET6, + m->m_url->url_host, + &su->su_sin6.sin6_addr); ag->ag_su_nta_len = (sizeof su->su_sin6); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/test_nth.c Tue Jul 8 00:36:13 2008 @@ -185,7 +185,7 @@ t->t_addr->su_len = (sizeof t->t_addr->su_sin); s = su_socket(t->t_addr->su_family = AF_INET, SOCK_STREAM, 0); TEST_1(s != INVALID_SOCKET); - TEST_1(inet_pton(AF_INET, "127.0.0.1", &t->t_addr->su_sin.sin_addr) >= 0); + TEST_1(su_inet_pton(AF_INET, "127.0.0.1", &t->t_addr->su_sin.sin_addr) >= 0); TEST_1(bind(s, &t->t_addr->su_sa, t->t_addrlen = (sizeof t->t_addr->su_sin)) != -1); TEST_1(getsockname(s, &t->t_addr->su_sa, &t->t_addrlen) != -1); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c Tue Jul 8 00:36:13 2008 @@ -1365,7 +1365,7 @@ assert(s2->dns.reg != 0); - inet_pton(AF_INET, "127.0.0.1", &localhost); + su_inet_pton(AF_INET, "127.0.0.1", &localhost); va_start(va0, use_naptr); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/resolve_sip.c Tue Jul 8 00:36:13 2008 @@ -221,7 +221,7 @@ if (a->a_record->r_status) continue; /* There was an error */ - inet_ntop(AF_INET, &a->a_addr, addr, sizeof(addr)); + su_inet_ntop(AF_INET, &a->a_addr, addr, sizeof(addr)); printf("%s@%s:%u\n", sr->sr_tport, addr, sr->sr_port); sr->sr_exitcode = 0; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/test_sresolv.c Tue Jul 8 00:36:13 2008 @@ -184,6 +184,11 @@ #endif #endif #endif + +SOFIAPUBFUN int su_inet_pton(int af, char const *src, void *dst); +SOFIAPUBFUN const char *su_inet_ntop(int af, void const *src, + char *dst, size_t size); + #else #define sres_send(s,b,len,flags) send((s),(b),(len),(flags)) @@ -195,6 +200,10 @@ #define SOCKET_ERROR (-1) #define INVALID_SOCKET ((sres_socket_t)-1) #define sres_socket(x,y,z) socket((x),(y),(z)) + +#define su_inet_pton inet_pton +#define su_inet_ntop inet_ntop + #endif #if 1 @@ -264,8 +273,8 @@ a1len = a2len = a3len = a4len = sizeof (struct sockaddr_in6); if (af == AF_INET) { - TEST_1(inet_pton(af, "127.0.0.1", &sin3->sin_addr) > 0); - TEST_1(inet_pton(af, "127.0.0.1", &sin4->sin_addr) > 0); + TEST_1(su_inet_pton(af, "127.0.0.1", &sin3->sin_addr) > 0); + TEST_1(su_inet_pton(af, "127.0.0.1", &sin4->sin_addr) > 0); } else { } @@ -734,7 +743,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ffe:1200:3012:c000:210:a4ff:fe8d:6a46"); TEST_P(rr_a6->a6_prename, NULL); @@ -748,7 +757,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ffe:1200:3012:c000:210:a4ff:fe8d:6a46"); TEST_P(rr_a6->a6_prename, NULL); @@ -778,7 +787,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 64); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::a08:20ff:fe7d:e7ac"); TEST_S(rr_a6->a6_prename, "mynet.example.com."); @@ -795,7 +804,7 @@ TEST(rr_a6->a6_record->r_class, sres_class_in); TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0:12:3012:c006:a08:20ff:fe7d:e7ac"); TEST_P(rr_a6->a6_prename, NULL); @@ -811,7 +820,7 @@ TEST(rr_a6->a6_record->r_class, sres_class_in); TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 128); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::"); + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::"); TEST_S(rr_a6->a6_prename, "a6.example.com."); sres_free_answers(res, ctx->result), ctx->result = NULL; @@ -824,7 +833,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 64); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "::a08:20ff:fe7d:e7ac"); TEST_S(rr_a6->a6_prename, "mynet.example.com."); @@ -853,7 +862,7 @@ TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:4630"); sres_free_answers(res, ctx->result), ctx->result = NULL; @@ -865,7 +874,7 @@ TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:4630"); sres_free_answers(res, result), result = NULL; @@ -1027,7 +1036,7 @@ const sres_ptr_record_t *rr; struct sockaddr_in sin = {0}; - inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr); + su_inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr); sin.sin_family = AF_INET; BEGIN(); @@ -1089,8 +1098,8 @@ BEGIN(); - inet_pton(AF_INET6, "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", - &sin6.sin6_addr); + su_inet_pton(AF_INET6, "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", + &sin6.sin6_addr); sin6.sin6_family = AF_INET6; @@ -1154,9 +1163,9 @@ sres_query(res, test_answer_multi, ctx, sres_type_aaaa, "mgw02.example.com"); - inet_pton(AF_INET6, - "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", - &sin6.sin6_addr); + su_inet_pton(AF_INET6, + "3ffe:1200:3012:c000:0a08:20ff:fe7d:e7ac", + &sin6.sin6_addr); sin6.sin6_family = AF_INET6; @@ -1361,7 +1370,7 @@ TEST(rr_a6->a6_record->r_ttl, 60); TEST(rr_a6->a6_prelen, 0); - TEST_S(inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0::"); + TEST_S(su_inet_ntop(AF_INET6, &rr_a6->a6_suffix, buf, sizeof(buf)), "3ff0::"); TEST_P(rr_a6->a6_prename, NULL); @@ -1373,7 +1382,7 @@ TEST(rr_aaaa->aaaa_record->r_type, sres_type_aaaa); TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:462f"); sres_free_answers(res, result); @@ -1416,7 +1425,7 @@ TEST(rr_aaaa->aaaa_record->r_type, sres_type_aaaa); TEST(rr_aaaa->aaaa_record->r_class, sres_class_in); TEST(rr_aaaa->aaaa_record->r_ttl, 60); - TEST_S(inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), + TEST_S(su_inet_ntop(AF_INET6, &rr_aaaa->aaaa_addr, buf, sizeof(buf)), "3ffe:1200:3012:c000:206:5bff:fe55:462f"); TEST_P(result[1], NULL); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c Tue Jul 8 00:36:13 2008 @@ -276,8 +276,8 @@ } SU_DEBUG_0(("%s: local address NATed as %s:%u\n", __func__, - inet_ntop(sa->su_family, SU_ADDR(sa), - ipaddr, sizeof(ipaddr)), + su_inet_ntop(sa->su_family, SU_ADDR(sa), + ipaddr, sizeof(ipaddr)), (unsigned) ntohs(sa->su_port))); break; @@ -428,8 +428,8 @@ err = bind(s, (struct sockaddr *)&sockaddr, socklen); if (err < 0) { SU_DEBUG_1(("%s: Error %d binding to %s:%u\n", __func__, err, - inet_ntop(sockaddr.su_family, SU_ADDR(&sockaddr), - ipaddr, sizeof(ipaddr)), + su_inet_ntop(sockaddr.su_family, SU_ADDR(&sockaddr), + ipaddr, sizeof(ipaddr)), (unsigned) ntohs(sockaddr.su_port))); return -1; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/addrinfo.c Tue Jul 8 00:36:13 2008 @@ -143,7 +143,7 @@ #endif port = ntohs(su->su_port); - inet_ntop(ai->ai_family, SU_ADDR(su), buffer, sizeof(buffer)); + su_inet_ntop(ai->ai_family, SU_ADDR(su), buffer, sizeof(buffer)); printf("%d@[%s]:%u", ai->ai_protocol, buffer, port); if (ai->ai_flags & AI_CANONNAME) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/localinfo.c Tue Jul 8 00:36:13 2008 @@ -167,8 +167,8 @@ fputs(li->li_canonname, stdout); } else { - inet_ntop(li->li_family, SU_ADDR(li->li_addr), - buffer, sizeof(buffer)); + su_inet_ntop(li->li_family, SU_ADDR(li->li_addr), + buffer, sizeof(buffer)); printf("%s maddr=[%s]", li->li_canonname, buffer); } if (li->li_scope & LI_SCOPE_GLOBAL) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_addrinfo.c Tue Jul 8 00:36:13 2008 @@ -223,7 +223,7 @@ /* translator hack */ { char *q = getenv("GAI"); - if (q && inet_pton(AF_INET6, q, &faith_prefix) == 1) + if (q && su_inet_pton(AF_INET6, q, &faith_prefix) == 1) translate = YES; } firsttime = 0; @@ -411,7 +411,7 @@ /* hostname as numeric name */ for (i = 0; gai_afdl[i].a_af; i++) { - if (inet_pton(gai_afdl[i].a_af, hostname, pton)) { + if (su_inet_pton(gai_afdl[i].a_af, hostname, pton)) { u_long v4a; u_char pfx; @@ -752,7 +752,7 @@ if (host == NULL || hostlen == 0) { /* what should we do? */ } else if (flags & NI_NUMERICHOST) { - if (inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) + if (su_inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) == NULL) return ENI_SYSTEM; if (strlen(numaddr) > hostlen) @@ -784,7 +784,8 @@ } else { if (flags & NI_NAMEREQD) return ENI_NOHOSTNAME; - if (inet_ntop(gni_afd->a_af, addr, numaddr, sizeof(numaddr)) + if (su_inet_ntop(gni_afd->a_af, addr, + numaddr, sizeof(numaddr)) == NULL) return ENI_NOHOSTNAME; if (strlen(numaddr) > hostlen) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_localinfo.c Tue Jul 8 00:36:13 2008 @@ -1047,7 +1047,7 @@ sa = calloc(1, sizeof(su_sockaddr_t)); sa->su_family = AF_INET6; - if (inet_pton(AF_INET6, addr, &sa->su_sin6.sin6_addr) <= 0) + if (su_inet_pton(AF_INET6, addr, &sa->su_sin6.sin6_addr) <= 0) goto err; s = su_socket(AF_INET6, SOCK_DGRAM, 0); @@ -1105,7 +1105,7 @@ li->li_addrlen = sizeof(*su); li->li_addr = su = (su_sockaddr_t *)(li + 1); su->su_family = li->li_family = AF_INET6; - if (inet_pton(AF_INET6, addr, &su->su_sin6.sin6_addr) <= 0) + if (su_inet_pton(AF_INET6, addr, &su->su_sin6.sin6_addr) <= 0) goto err; if (li->li_flags & LI_IFNAME) li->li_ifname = ifname; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_proxy.c Tue Jul 8 00:36:13 2008 @@ -373,7 +373,7 @@ char buf[SU_ADDRSIZE]; SU_DEBUG_3(("accept: connection from %s:%u\n", - inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), + su_inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), ntohs(su->su_port))); if (!su_wait_create(f->f_wait, f->f_socket, SU_WAIT_IN) && @@ -628,7 +628,7 @@ char buf[SU_ADDRSIZE]; SU_DEBUG_3(("forwarder_shutdown: shutdown from %s:%u\n", - inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), + su_inet_ntop(su->su_family, SU_ADDR(su), buf, sizeof(buf)), ntohs(su->su_port))); if (su_root_unregister(f->f_pr->pr_root, f->f_wait, forwarder_recv, f) < 0) { @@ -663,9 +663,9 @@ su2 = f->f_dest, su1 = f->f_peer->f_dest, d2 = "up", d1 = "down"; SU_DEBUG_3(("forwarder_close: connection from %s:%u to %s:%d\n", - inet_ntop(su1->su_family, SU_ADDR(su1), buf1, sizeof(buf1)), + su_inet_ntop(su1->su_family, SU_ADDR(su1), buf1, sizeof(buf1)), ntohs(su1->su_port), - inet_ntop(su2->su_family, SU_ADDR(su2), buf2, sizeof(buf2)), + su_inet_ntop(su2->su_family, SU_ADDR(su2), buf2, sizeof(buf2)), ntohs(su2->su_port))); forwarder_destroy(f); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su.c Tue Jul 8 00:36:13 2008 @@ -116,7 +116,7 @@ if (opt_verbatim) printf("udpsocket: using address [%s]:%u\n", - inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port)); return s; @@ -183,7 +183,7 @@ if (opt_verbatim) printf("do_rtt: %d bytes from [%s]:%u: \"%s\", rtt = %lg ms\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, rtt / 1000); do_ping(p, p->t, NULL); @@ -237,7 +237,7 @@ if (opt_verbatim) printf("do_recv: %d bytes from [%s]:%u: \"%s\" at %s\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, snow(now)); fflush(stdout); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/test_su_osx.c Tue Jul 8 00:36:13 2008 @@ -127,7 +127,7 @@ if (opt_verbatim) printf("udpsocket: using address [%s]:%u\n", - inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port)); return s; @@ -202,7 +202,7 @@ if (opt_verbatim) printf("do_rtt: %d bytes from [%s]:%u: \"%s\", rtt = %lg ms\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, rtt / 1000); do_ping(p, p->t, NULL); @@ -260,7 +260,7 @@ if (opt_verbatim) printf("do_recv: %d bytes from [%s]:%u: \"%s\" at %s\n", - n, inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), + n, su_inet_ntop(su.su_family, SU_ADDR(&su), nbuf, sizeof(nbuf)), ntohs(su.su_sin.sin_port), buf, snow(now)); fflush(stdout); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su.c Tue Jul 8 00:36:13 2008 @@ -177,7 +177,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(s, &su.su_sa, sulen), 0); TEST(getsockname(s, &su.su_sa, &sulen), 0); @@ -197,7 +197,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(l, &su.su_sa, sulen), 0); TEST(bind(s, &su.su_sa, sulen), 0); @@ -304,7 +304,7 @@ memset(&su, 0, sulen); su.su_len = sulen; su.su_family = AF_INET; - TEST(inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); + TEST(su_inet_pton(AF_INET, "127.0.0.1", &su.su_sin.sin_addr), 1); TEST(bind(s, &su.su_sa, sulen), 0); TEST(getsockname(s, &su.su_sa, &sulen), 0); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root.c Tue Jul 8 00:36:13 2008 @@ -239,9 +239,9 @@ TEST_1(su_wait_create(ep->wait, ep->s, SU_WAIT_IN|SU_WAIT_ERR) != -1); TEST_1(getsockname(ep->s, &ep->addr->su_sa, &ep->addrlen) != -1); if (SU_HAS_INADDR_ANY(ep->addr)) { - inet_pton(su->su_family, - su->su_family == AF_INET ? "127.0.0.1" : "::1", - SU_ADDR(ep->addr)); + su_inet_pton(su->su_family, + su->su_family == AF_INET ? "127.0.0.1" : "::1", + SU_ADDR(ep->addr)); } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/torture_su_root_osx.c Tue Jul 8 00:36:13 2008 @@ -108,9 +108,9 @@ TEST_1(su_wait_create(ep->wait, ep->s, SU_WAIT_IN|SU_WAIT_ERR) != -1); TEST_1(getsockname(ep->s, &ep->addr->su_sa, &ep->addrlen) != -1); if (SU_HAS_INADDR_ANY(ep->addr)) { - inet_pton(su->su_family, - su->su_family == AF_INET ? "127.0.0.1" : "::1", - SU_ADDR(ep->addr)); + su_inet_pton(su->su_family, + su->su_family == AF_INET ? "127.0.0.1" : "::1", + SU_ADDR(ep->addr)); } } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Tue Jul 8 00:36:13 2008 @@ -3958,7 +3958,7 @@ #else SU_DEBUG_9(("tport_resolve addrinfo = %s%s%s:%d\n", "", - inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), + su_inet_ntop(su->su_family, SU_ADDR(su), ipaddr, sizeof(ipaddr)), "", htons(su->su_port))); #endif Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_stun.c Tue Jul 8 00:36:13 2008 @@ -197,7 +197,8 @@ SU_DEBUG_5(("%s: stun_bind() ok: local address NATed as %s:%u\n", __func__, - inet_ntop(su->su_family, SU_ADDR(su), ipname, sizeof(ipname)), + su_inet_ntop(su->su_family, SU_ADDR(su), + ipname, sizeof(ipname)), (unsigned) ntohs(su->su_port))); } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Tue Jul 8 00:36:13 2008 @@ -144,7 +144,7 @@ imr->imr_multiaddr = su->su_sin.sin_addr; if (host_is_ip4_address(tpn->tpn_canon) && - inet_pton(AF_INET, tpn->tpn_canon, &iface) > 0) { + su_inet_pton(AF_INET, tpn->tpn_canon, &iface) > 0) { imr->imr_interface = iface; } @@ -506,8 +506,8 @@ origin, info)); if (from->su_family != AF_UNSPEC) SU_DEBUG_3(("\treported by [%s]:%u\n", - inet_ntop(from->su_family, SU_ADDR(from), - info, sizeof(info)), + su_inet_ntop(from->su_family, SU_ADDR(from), + info, sizeof(info)), ntohs(from->su_port))); if (msg->msg_namelen == 0) Modified: freeswitch/trunk/libs/sofia-sip/tests/test_init.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_init.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_init.c Tue Jul 8 00:36:13 2008 @@ -217,7 +217,7 @@ else if (su->su_family == AF_INET6) { a_uri = (void *) su_sprintf(ctx->home, "sip:[%s]:%u", - inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), + su_inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), ntohs(su->su_port)); a_bind = "sip:[::]:*"; } @@ -225,7 +225,7 @@ else if (su->su_family == AF_INET) { a_uri = (void *) su_sprintf(ctx->home, "sip:%s:%u", - inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), + su_inet_ntop(su->su_family, SU_ADDR(su), b, sizeof b), ntohs(su->su_port)); } @@ -234,15 +234,15 @@ su->su_len = sulen = (sizeof su->su_sin6), su->su_family = AF_INET6; len = strcspn(p_uri->url_host + 1, "]"); assert(len < sizeof b); memcpy(b, p_uri->url_host + 1, len); b[len] = '\0'; - inet_pton(su->su_family, b, SU_ADDR(su)); + su_inet_pton(su->su_family, b, SU_ADDR(su)); } else { su->su_len = sulen = (sizeof su->su_sin), su->su_family = AF_INET; - inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); + su_inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); } #else su->su_len = sulen = (sizeof su->su_sin), su->su_family = AF_INET; - inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); + su_inet_pton(su->su_family, p_uri->url_host, SU_ADDR(su)); #endif su->su_port = htons(strtoul(url_port(p_uri), NULL, 10)); Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nat.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nat.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nat.c Tue Jul 8 00:36:13 2008 @@ -531,13 +531,13 @@ } getpeername(b->in_socket, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); + su_inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); snprintf(b->in_name, sizeof b->in_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(addr->su_port)); getsockname(out_socket, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); + su_inet_ntop(addr->su_family, SU_ADDR(addr), ipname, sizeof ipname); snprintf(b->out_name, sizeof b->out_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(addr->su_port)); @@ -617,7 +617,7 @@ size_t namelen; struct binding *b; - inet_ntop(from->su_family, SU_ADDR(from), ipname, sizeof ipname); + su_inet_ntop(from->su_family, SU_ADDR(from), ipname, sizeof ipname); snprintf(name, sizeof name, from->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", ipname, ntohs(from->su_port)); @@ -915,7 +915,7 @@ b->out_register = out_register; getsockname(out, (void *)addr, &addrlen); - inet_ntop(addr->su_family, SU_ADDR(addr), name, sizeof name); + su_inet_ntop(addr->su_family, SU_ADDR(addr), name, sizeof name); snprintf(b->out_name, sizeof b->out_name, addr->su_family == AF_INET6 ? "[%s]:%u" : "%s:%u", name, ntohs(addr->su_port)); Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Tue Jul 8 00:36:13 2008 @@ -134,13 +134,6 @@ #include "config.h" -#if !defined(HAVE_WIN32) -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#endif - #include "sofia-sip/su.h" #include "sofia-resolv/sres.h" @@ -803,7 +796,7 @@ if (answers[i]->sr_record->r_status != 0) continue; - inet_ntop(af, &answers[i]->sr_a->a_addr, addr, sizeof addr); + su_inet_ntop(af, &answers[i]->sr_a->a_addr, addr, sizeof addr); for (j = 0; tports[j].name; j++) { if (strcasecmp(tport, tports[j].name) == 0)

1 0