Diff
Modified: freeswitch/trunk/.gitignore (17195 => 17196)
--- freeswitch/trunk/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
@@ -8,6 +8,28 @@
.deps
.\#*
\#*
+Debug/
+Release/
+All/
+bin/
+*.user
+*.suo
+*.ncb
+*.pdb
+*.map
+*.lib
+*.obj
+*.idb
+*.res
+*.exp
+*.exe
+*.manifest
+*.dep
+*.dll
+BuildLog.htm
+Path
+w32/Library/lastversion
+w32/Library/tmpVersion.Bat
.version
AUTHORS
COPYING
@@ -17,6 +39,7 @@
NEWS
README
aclocal.m4
+autom4te.cache
build/Makefile
build/Makefile.in
build/config/compile
@@ -33,6 +56,7 @@
config.log
config.status
configure
+configure.lineno
freeswitch
fs_cli
fs_ivrd
Modified: freeswitch/trunk/Makefile.am (17195 => 17196)
--- freeswitch/trunk/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -349,7 +349,21 @@
cat src/include/switch_version.h.in > src/include/switch_version.h ; \
touch .version ; \
else \
- version=`svnversion . -n || echo hacked` ; \
+ if [ -d .git ] ; then \
+ version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="git-$$version" ; \
+ fi ;\
+ else \
+ version=`svnversion . -n || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="svn-$$version" ; \
+ fi ;\
+ fi ; \
oldversion=`cat .version 2>/dev/null || echo "0"` ; \
if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
@@ -437,23 +451,29 @@
test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
-is-svn:
- @if [ ! -d .svn ] ; then \
+is-scm:
+ @if [ ! -d .svn -a ! -d .git ] ; then \
echo ; echo ; \
- echo "**************************************************************************************************" ; \
- echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \
- echo "**************************************************************************************************" ; \
+ echo "*****************************************************************************************************" ; \
+ echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \
+ echo "git clone git://git.freeswitch.org/freeswitch.git " ; \
+ echo "or check out our read only svn mirror: " ; \
+ echo "svn checkout http://svn.freeswitch.org/svn/freeswitch/trunk " ; \
+ echo "*****************************************************************************************************" ; \
echo ; echo ; \
exit 1; \
fi
-update: is-svn
+update: is-scm
@if test -d .svn ; then \
test ! -f .version || rm -f .version ; \
echo Updating... ; \
svn update ; \
+ elif test -d .git ; then \
+ echo "Pulling updates..." ; \
+ git pull ; \
else \
- echo "This source directory is not an svn working copy" ; \
+ echo "This source directory is not a git tree or svn working copy" ; \
fi
.nodepends:
@@ -483,18 +503,18 @@
everything: install
-up: is-svn clean
- svn update
+up: is-scm clean
+ $(MAKE) update
$(MAKE) -j core
$(MAKE) -j modules
$(MAKE) install
-sync: is-svn
- svn update
+sync: is-scm
+ $(MAKE) update
$(MAKE) install
-speedy-sync: is-svn
- svn update
+speedy-sync: is-scm
+ $(MAKE) update
$(MAKE) -j install
libs/openzap/Makefile:
@@ -570,15 +590,15 @@
@echo
@echo http://www.cluecon.com
@sleep 5
-current: cluecon is-svn update-clean
- svn update
+current: cluecon update-clean is-scm
+ $(MAKE) update
$(MAKE) all
$(MAKE) install
installall: current
-speedy-current: is-svn update-clean
- svn update
+speedy-current: update-clean is-scm
+ $(MAKE) update
$(MAKE) speedy-sure
$(MAKE) install
Modified: freeswitch/trunk/build/swigall.sh (17195 => 17196)
--- freeswitch/trunk/build/swigall.sh 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/build/swigall.sh 2010-04-02 10:23:38 UTC (rev 17196)
@@ -1,6 +1,6 @@
cd src/mod/languages/mod_lua
make swigclean
-make mod_lua_wrap.cpp
+make lua_wrap
cd ../../../..
cd src/mod/languages/mod_perl
Modified: freeswitch/trunk/configure.in (17195 => 17196)
--- freeswitch/trunk/configure.in 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/configure.in 2010-04-02 10:23:38 UTC (rev 17196)
@@ -3,11 +3,11 @@
# Must change all of the below together
# For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS)
+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
AC_SUBST(SWITCH_VERSION_MINOR, [0])
-AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
-#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
+AC_SUBST(SWITCH_VERSION_MICRO, [head])
+#AC_SUBST(SWITCH_VERSION_REVISION, [])
AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
AC_CONFIG_FILES([.version:.version.in])
Modified: freeswitch/trunk/libs/.gitignore (17195 => 17196)
--- freeswitch/trunk/libs/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
@@ -189,6 +189,9 @@
ilbc/src/stamp-h1
ilbc/tests/Makefile
ilbc/tests/Makefile.in
+js/nsprpub/lib/ds/libplds4.so.1
+js/nsprpub/lib/libc/src/libplc4.so.1
+js/nsprpub/pr/src/libnspr4.so.1
js/Makefile
js/aclocal.m4
js/config.guess
@@ -990,3 +993,74 @@
unimrcp/build/acmacros/ltsugar.m4
unimrcp/build/acmacros/ltversion.m4
unimrcp/build/acmacros/lt~obsolete.m4
+*.tar.gz
+celt-0.7.1/
+flite-1.3.99/
+freeradius-client-1.1.6/
+iksemel/test/tst-dom
+iksemel/test/tst-filter
+iksemel/test/tst-iks
+iksemel/test/tst-ikstack
+iksemel/test/tst-jid
+iksemel/test/tst-md5
+iksemel/test/tst-sax
+iksemel/test/tst-sha
+iksemel/tools/ikslint
+iksemel/tools/iksperf
+iksemel/tools/iksroster
+json-c-0.9/
+lame-3.97/
+libmemcached-0.32/
+libshout-2.2.2/
+mpg123/
+openldap-2.4.19/
+pocketsphinx-0.5.99/
+portaudio/bin-stamp
+portaudio/bin/
+portaudio/lib-stamp
+silk/Decoder
+silk/Encoder
+silk/signalCompare
+soundtouch-1.3.1/
+sphinxbase-0.4.99/
+unimrcp/platforms/asr-client/asrclient
+unimrcp/platforms/umc/umc
+unimrcp/platforms/unimrcp-client/unimrcpclient
+unimrcp/platforms/unimrcp-server/unimrcpserver
+yaml/config.h
+yaml/stamp-h1
+yaml/tests/example-deconstructor
+yaml/tests/example-deconstructor-alt
+yaml/tests/example-reformatter
+yaml/tests/example-reformatter-alt
+yaml/tests/run-dumper
+yaml/tests/run-emitter
+yaml/tests/run-loader
+yaml/tests/run-parser
+yaml/tests/run-scanner
+Communicator_semi_40.cd_semi_6000/
+libogg-1.1.3/
+pthreads-w32-2-7-0-release/
+sounds/
+sphinxbase-0.4.99/
+sofia-sip/libsofia-sip-ua/http/http_tag_dll.c
+sofia-sip/libsofia-sip-ua/iptsec/auth_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_ref.c
+sofia-sip/libsofia-sip-ua/nea/nea_tag_dll.c
+sofia-sip/libsofia-sip-ua/nta/nta_tag_dll.c
+sofia-sip/libsofia-sip-ua/nth/nth_tag_dll.c
+sofia-sip/libsofia-sip-ua/nua/nua_tag_dll.c
+sofia-sip/libsofia-sip-ua/sdp/sdp_tag_dll.c
+sofia-sip/libsofia-sip-ua/sip/sip_tag_dll.c
+sofia-sip/libsofia-sip-ua/soa/soa_tag_dll.c
+sofia-sip/libsofia-sip-ua/stun/stun_tag_dll.c
+sofia-sip/libsofia-sip-ua/su/su_tag_dll.c
+sofia-sip/libsofia-sip-ua/tport/tport_tag_dll.c
+sofia-sip/libsofia-sip-ua/url/url_tag_dll.c
+win32/pcre/pcre_chartables.c
+apr-util/include/apu_config.h
+apr-util/include/apu_select_dbm.h
+include/
+js/nsprpub/pr/include/prcpucfg.h
+apr-util/xml/expat/lib/config.h
Modified: freeswitch/trunk/libs/apr-util/test/data/.empty ( => )
Modified: freeswitch/trunk/libs/esl/java/classes/.empty
===================================================================
Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17195 => 17196)
--- freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -105,7 +105,7 @@
#
# tools & test programs
#
-noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testpri testr2 testanalog testapp testcid
+noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn
if HAVE_SCTP
noinst_PROGRAMS += testboost
endif
@@ -131,9 +131,9 @@
detect_dtmf_LDADD = libfreetdm.la
detect_dtmf_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
-testisdn_SOURCES = $(SRC)/testisdn.c
-testisdn_LDADD = libfreetdm.la
-testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
+#testisdn_SOURCES = $(SRC)/testisdn.c
+#testisdn_LDADD = libfreetdm.la
+#testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
testpri_SOURCES = $(SRC)/testpri.c
testpri_LDADD = libfreetdm.la
@@ -160,7 +160,7 @@
#
# ftmod modules
#
-mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_isdn.la ftmod_analog.la ftmod_analog_em.la
+mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la
if HAVE_SCTP
@@ -196,32 +196,32 @@
ftmod_wanpipe_la_LIBADD = $(MYLIB)
endif
-ftmod_isdn_la_SOURCES = \
-$(SRC)/isdn/EuroISDNStateNT.c \
-$(SRC)/isdn/EuroISDNStateTE.c \
-$(SRC)/isdn/mfifo.c \
-$(SRC)/isdn/Q921.c \
-$(SRC)/isdn/Q931api.c \
-$(SRC)/isdn/Q931.c \
-$(SRC)/isdn/Q931ie.c \
-$(SRC)/isdn/Q931mes.c \
-$(SRC)/isdn/Q931StateNT.c \
-$(SRC)/isdn/Q931StateTE.c \
-$(SRC)/isdn/nationalmes.c \
-$(SRC)/isdn/nationalStateNT.c \
-$(SRC)/isdn/nationalStateTE.c \
-$(SRC)/isdn/DMSmes.c \
-$(SRC)/isdn/DMSStateNT.c \
-$(SRC)/isdn/DMSStateTE.c \
-$(SRC)/isdn/5ESSmes.c \
-$(SRC)/isdn/5ESSStateNT.c \
-$(SRC)/isdn/5ESSStateTE.c \
-$(SRC)/isdn/Q932mes.c \
-$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
+#ftmod_isdn_la_SOURCES = \
+#$(SRC)/isdn/EuroISDNStateNT.c \
+#$(SRC)/isdn/EuroISDNStateTE.c \
+#$(SRC)/isdn/mfifo.c \
+#$(SRC)/isdn/Q921.c \
+#$(SRC)/isdn/Q931api.c \
+#$(SRC)/isdn/Q931.c \
+#$(SRC)/isdn/Q931ie.c \
+#$(SRC)/isdn/Q931mes.c \
+#$(SRC)/isdn/Q931StateNT.c \
+#$(SRC)/isdn/Q931StateTE.c \
+#$(SRC)/isdn/nationalmes.c \
+#$(SRC)/isdn/nationalStateNT.c \
+#$(SRC)/isdn/nationalStateTE.c \
+#$(SRC)/isdn/DMSmes.c \
+#$(SRC)/isdn/DMSStateNT.c \
+#$(SRC)/isdn/DMSStateTE.c \
+#$(SRC)/isdn/5ESSmes.c \
+#$(SRC)/isdn/5ESSStateNT.c \
+#$(SRC)/isdn/5ESSStateTE.c \
+#$(SRC)/isdn/Q932mes.c \
+#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
-ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
-ftmod_isdn_la_LIBADD = $(MYLIB)
+#ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
+#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
+#ftmod_isdn_la_LIBADD = $(MYLIB)
ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
ftmod_analog_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
Modified: freeswitch/trunk/libs/js/nsprpub/include/.empty ( => )
Modified: freeswitch/trunk/libs/js/nsprpub/macbuild/.empty
===================================================================
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty ( => )
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
===================================================================
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty ( => )
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
===================================================================
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty ( => )
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
===================================================================
Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty ( => )
Modified: freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty
===================================================================
Modified: freeswitch/trunk/libs/portaudio/doc/html/.empty ( => )
Modified: freeswitch/trunk/libs/sofia-sip/configure.ac
===================================================================
--- freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 10:23:38 UTC (rev 17196)
@@ -100,14 +100,17 @@
fi
fi
+SOFIA_PLAT_CFLAGS=
# openbsd seems to not define NULL as a void pointer, I blame standards by committee for this.
# This is a dirty hack, but shuts up all the warnings
case "$host" in
- *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";;
+ *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";;
*) ;;
esac
+AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS)
+
### checks for header files
### -----------------------
AC_HEADER_STDC
Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am (17195 => 17196)
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -1,7 +1,7 @@
# common Makefile targets for libsofia-sip-ua modules
# ---------------------------------------------------
-AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS)
# Use with --enable-ndebug
if NDEBUG
Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am (17195 => 17196)
--- freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -4,7 +4,7 @@
sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
sofiabuilddir = ${top_builddir}/libsofia-sip-ua
-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
SOFIA_COVERAGE = $(COVERAGE_FLAGS)
Modified: freeswitch/trunk/libs/sqlite/art/tmp/.empty ( => )
Modified: freeswitch/trunk/libs/sqlite/notes/.empty
===================================================================
Modified: freeswitch/trunk/libs/sqlite/src/ex/.empty ( => )
Modified: freeswitch/trunk/scripts/tagscript.sh
===================================================================
--- freeswitch/trunk/scripts/tagscript.sh 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/scripts/tagscript.sh 2010-04-02 10:23:38 UTC (rev 17196)
@@ -35,11 +35,12 @@
sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
-e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
-e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
- -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
-i configure.in
if [ -n "$rev" ]; then
- sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
+ sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
-i configure.in
fi
@@ -63,14 +64,14 @@
cd ..
tar -czvf $dst_name.tar.gz $dst_dir
tar -cjvf $dst_name.tar.bz2 $dst_dir
-tar -cJvf $dst_name.tar.xz $dst_dir
+tar -cJvf $dst_name.tar.xz $dst_dir || echo tar does not support -J
rm -rf $dst_dir
cat 1>&2 <<EOF
----------------------------------------------------------------------
The v$ver tag has been committed locally, but it will not be
-globally visible until you 'git push' this repository up to the server
-(I didn't do that for you).
+globally visible until you 'git push --tags' this repository up to the
+server (I didn't do that for you, as you might want to review first).
----------------------------------------------------------------------
EOF
Modified: freeswitch/trunk/src/include/switch_channel.h (17195 => 17196)
--- freeswitch/trunk/src/include/switch_channel.h 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/include/switch_channel.h 2010-04-02 10:23:38 UTC (rev 17196)
@@ -245,6 +245,11 @@
#define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE)
#define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE)
+
+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal);
+
+#define switch_channel_export_variable(_channel, _varname, _value, _nolocal) switch_channel_export_variable_var_check(_channel, _varname, _value, SWITCH_TRUE, _nolocal)
+
/*!
\brief Retrieve a variable from a given channel
\param channel channel to retrieve variable from
Modified: freeswitch/trunk/src/mod/.gitignore (17195 => 17196)
--- freeswitch/trunk/src/mod/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
@@ -50,3 +50,10 @@
loggers/mod_syslog/Makefile
say/mod_say_en/Makefile
say/mod_say_ru/Makefile
+applications/mod_stress/mod_stress.log
+asr_tts/mod_unimrcp/mod_unimrcp.log
+endpoints/mod_portaudio/mod_portaudio.log
+endpoints/mod_skypopen/mod_skypopen.log
+formats/mod_portaudio_stream/mod_portaudio_stream.log
+languages/mod_java/freeswitch.jar
+languages/mod_managed/freeswitch_wrap.cpp
Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am (17195 => 17196)
--- freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -2,13 +2,12 @@
MODNAME=mod_enum
UDNS_DIR=$(switch_srcdir)/libs/udns
-AM_CFLAGS += -I$(UDNS_DIR) -DHAVE_POLL
+mod_enum_la_CFLAGS = -I$(UDNS_DIR) -DHAVE_POLL $(AM_CFLAGS)
mod_LTLIBRARIES = mod_enum.la
mod_enum_la_SOURCES = mod_enum.c
mod_enum_la_SOURCES += $(UDNS_DIR)/udns_dn.c $(UDNS_DIR)/udns_dntosp.c $(UDNS_DIR)/udns_parse.c $(UDNS_DIR)/udns_misc.c
mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_a.c $(UDNS_DIR)/udns_rr_ptr.c $(UDNS_DIR)/udns_rr_mx.c $(UDNS_DIR)/udns_rr_txt.c $(UDNS_DIR)/udns_bl.c
mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_srv.c $(UDNS_DIR)/udns_rr_naptr.c $(UDNS_DIR)/udns_codes.c $(UDNS_DIR)/udns_resolver.c
-mod_enum_la_CFLAGS = $(AM_CFLAGS)
mod_enum_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_enum_la_LDFLAGS = -avoid-version -module -no-undefined -shared
Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am (17195 => 17196)
--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -6,8 +6,7 @@
mod_LTLIBRARIES = mod_portaudio.la
mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
-mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1
+mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS)
mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
Modified: freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am (17195 => 17196)
--- freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
@@ -7,8 +7,7 @@
mod_LTLIBRARIES = mod_portaudio_stream.la
mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c
-mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_stream_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR)
+mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS)
mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (17195 => 17196)
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 10:23:38 UTC (rev 17196)
@@ -21403,6 +21403,26 @@
}
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+ int jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ char *arg3 = (char *) 0 ;
+ switch_bool_t arg4 ;
+ switch_bool_t arg5 ;
+ switch_status_t result;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (char *)jarg2;
+ arg3 = (char *)jarg3;
+ arg4 = (switch_bool_t)jarg4;
+ arg5 = (switch_bool_t)jarg5;
+ result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+ jresult = result;
+ return jresult;
+}
+
+
SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3) {
char * jresult ;
switch_channel_t *arg1 = (switch_channel_t *) 0 ;
Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (17195 => 17196)
--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 10:23:38 UTC (rev 17196)
@@ -2904,6 +2904,11 @@
return ret;
}
+ public static switch_status_t switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check, switch_bool_t nolocal) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check, (int)nolocal);
+ return ret;
+ }
+
public static string switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel channel, string varname, switch_bool_t dup) {
string ret = freeswitchPINVOKE.switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, (int)dup);
return ret;
@@ -10209,6 +10214,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")]
public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_export_variable_var_check")]
+ public static extern int switch_channel_export_variable_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_dup")]
public static extern string switch_channel_get_variable_dup(HandleRef jarg1, string jarg2, int jarg3);
Modified: freeswitch/trunk/src/mod/timers/.empty ( => )
Modified: freeswitch/trunk/src/switch_channel.c
===================================================================
--- freeswitch/trunk/src/switch_channel.c 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/switch_channel.c 2010-04-02 10:23:38 UTC (rev 17196)
@@ -737,6 +737,37 @@
return status;
}
+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal)
+{
+ const char *exports, *exports_varname = varname;
+ switch_status_t status;
+
+ exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE);
+
+ if (nolocal) {
+ exports_varname = switch_mprintf("nolocal:%s", varname);
+ }
+
+ if ((status = switch_channel_set_variable_var_check(channel, exports_varname, value, var_check)) != SWITCH_STATUS_SUCCESS) {
+ goto done;
+ }
+
+ if (varname && value) {
+ if (exports) {
+ switch_channel_set_variable_printf(channel, SWITCH_EXPORT_VARS_VARIABLE, "%s,%s", exports, exports_varname);
+ } else {
+ switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, exports_varname);
+ }
+ }
+
+done:
+ if (exports_varname != varname) {
+ free((char*)exports_varname);
+ }
+
+ return status;
+}
+
SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel,
const char *varname, const char *value, switch_bool_t var_check)
{
Modified: freeswitch/trunk/web/etc/.empty ( => )
Modified: freeswitch/trunk/web/planet/.empty
===================================================================