Freeswitch-branches

Download

freeswitch-branches@lists.freeswitch.org

1655 discussions

[commit] r2226 - freeswitch/branches/stpeter
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 14:48:19 2006 New Revision: 2226 Added: freeswitch/branches/stpeter/ Log: Creating empty folder for stpeter

1 0

[commit] r2225 - freeswitch/branches/joshaidan
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 09:56:15 2006 New Revision: 2225 Added: freeswitch/branches/joshaidan/ Log: Creating empty folder for joshaidan

1 0

[commit] r2224 - in freeswitch/branches/bojin: . build build/config conf docs libs libs/codec libs/codec/g726 libs/codec/g726/src libs/codec/gsm libs/codec/gsm/inc libs/codec/gsm/src libs/codec/ilbc libs/codec/ilbc/src libs/codec/lpc10 libs/iax libs/iax/src libs/iax/src/asterisk libs/libdingaling libs/libdingaling/docs libs/libdingaling/src libs/libspeakup libs/libspeakup/src libs/libteletone libs/libteletone/src libs/srtp libs/srtp/crypto libs/srtp/crypto/ae_xfm libs/srtp/crypto/ciphe
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: bojin Date: Thu Aug 3 09:31:39 2006 New Revision: 2224 Added: freeswitch/branches/bojin/.indent.pro - copied unchanged from r2223, /freeswitch/trunk/.indent.pro freeswitch/branches/bojin/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/AUTHORS freeswitch/branches/bojin/COPYING - copied unchanged from r2223, /freeswitch/trunk/COPYING freeswitch/branches/bojin/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/ChangeLog freeswitch/branches/bojin/INSTALL - copied unchanged from r2223, /freeswitch/trunk/INSTALL freeswitch/branches/bojin/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/Makefile.am freeswitch/branches/bojin/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/Makefile.in freeswitch/branches/bojin/NEWS - copied unchanged from r2223, /freeswitch/trunk/NEWS freeswitch/branches/bojin/README - copied unchanged from r2223, /freeswitch/trunk/README freeswitch/branches/bojin/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/aclocal.m4 freeswitch/branches/bojin/build/ (props changed) - copied from r2223, /freeswitch/trunk/build/ freeswitch/branches/bojin/build.sh - copied unchanged from r2223, /freeswitch/trunk/build.sh freeswitch/branches/bojin/build/addenv.sh - copied unchanged from r2223, /freeswitch/trunk/build/addenv.sh freeswitch/branches/bojin/build/build.sh - copied unchanged from r2223, /freeswitch/trunk/build/build.sh freeswitch/branches/bojin/build/buildlib.sh - copied unchanged from r2223, /freeswitch/trunk/build/buildlib.sh freeswitch/branches/bojin/build/checkversion.sh - copied unchanged from r2223, /freeswitch/trunk/build/checkversion.sh freeswitch/branches/bojin/build/config/ - copied from r2223, /freeswitch/trunk/build/config/ freeswitch/branches/bojin/build/config/ac_cflags_gcc_option.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_cflags_gcc_option.m4 freeswitch/branches/bojin/build/config/ac_cflags_sun_option.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_cflags_sun_option.m4 freeswitch/branches/bojin/build/config/ac_gcc_archflag.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_gcc_archflag.m4 freeswitch/branches/bojin/build/config/ac_gcc_x86_cpuid.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_gcc_x86_cpuid.m4 freeswitch/branches/bojin/build/config/ac_prog_gzip.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_prog_gzip.m4 freeswitch/branches/bojin/build/config/ac_prog_wget.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ac_prog_wget.m4 freeswitch/branches/bojin/build/config/ax_cc_maxopt.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ax_cc_maxopt.m4 freeswitch/branches/bojin/build/config/ax_cflags_warn_all_ansi.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ax_cflags_warn_all_ansi.m4 freeswitch/branches/bojin/build/config/ax_check_compiler_flags.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ax_check_compiler_flags.m4 freeswitch/branches/bojin/build/config/ax_compiler_vendor.m4 - copied unchanged from r2223, /freeswitch/trunk/build/config/ax_compiler_vendor.m4 freeswitch/branches/bojin/build/config/compile - copied unchanged from r2223, /freeswitch/trunk/build/config/compile freeswitch/branches/bojin/build/config/config.guess - copied unchanged from r2223, /freeswitch/trunk/build/config/config.guess freeswitch/branches/bojin/build/config/config.sub - copied unchanged from r2223, /freeswitch/trunk/build/config/config.sub freeswitch/branches/bojin/build/config/depcomp - copied unchanged from r2223, /freeswitch/trunk/build/config/depcomp freeswitch/branches/bojin/build/config/install-sh - copied unchanged from r2223, /freeswitch/trunk/build/config/install-sh freeswitch/branches/bojin/build/config/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/build/config/ltmain.sh freeswitch/branches/bojin/build/config/missing - copied unchanged from r2223, /freeswitch/trunk/build/config/missing freeswitch/branches/bojin/build/modmake.sh - copied unchanged from r2223, /freeswitch/trunk/build/modmake.sh freeswitch/branches/bojin/build/thisbuild-init.sh - copied unchanged from r2223, /freeswitch/trunk/build/thisbuild-init.sh freeswitch/branches/bojin/conf/ - copied from r2223, /freeswitch/trunk/conf/ freeswitch/branches/bojin/conf/freeswitch.xml - copied unchanged from r2223, /freeswitch/trunk/conf/freeswitch.xml freeswitch/branches/bojin/configure - copied unchanged from r2223, /freeswitch/trunk/configure freeswitch/branches/bojin/configure.in - copied unchanged from r2223, /freeswitch/trunk/configure.in freeswitch/branches/bojin/docs/ (props changed) - copied from r2223, /freeswitch/trunk/docs/ freeswitch/branches/bojin/docs/Doxygen.conf - copied unchanged from r2223, /freeswitch/trunk/docs/Doxygen.conf freeswitch/branches/bojin/docs/JavaScript.txt - copied unchanged from r2223, /freeswitch/trunk/docs/JavaScript.txt freeswitch/branches/bojin/docs/docs.vcproj - copied unchanged from r2223, /freeswitch/trunk/docs/docs.vcproj freeswitch/branches/bojin/generic_mod.mk - copied unchanged from r2223, /freeswitch/trunk/generic_mod.mk freeswitch/branches/bojin/indent_options.sh - copied unchanged from r2223, /freeswitch/trunk/indent_options.sh freeswitch/branches/bojin/libs/ (props changed) - copied from r2223, /freeswitch/trunk/libs/ freeswitch/branches/bojin/libs/codec/ - copied from r2223, /freeswitch/trunk/libs/codec/ freeswitch/branches/bojin/libs/codec/g726/ - copied from r2223, /freeswitch/trunk/libs/codec/g726/ freeswitch/branches/bojin/libs/codec/g726/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/AUTHORS freeswitch/branches/bojin/libs/codec/g726/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/COPYING freeswitch/branches/bojin/libs/codec/g726/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/ChangeLog freeswitch/branches/bojin/libs/codec/g726/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/INSTALL freeswitch/branches/bojin/libs/codec/g726/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/Makefile.am freeswitch/branches/bojin/libs/codec/g726/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/Makefile.in freeswitch/branches/bojin/libs/codec/g726/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/NEWS freeswitch/branches/bojin/libs/codec/g726/README - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/README freeswitch/branches/bojin/libs/codec/g726/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/aclocal.m4 freeswitch/branches/bojin/libs/codec/g726/compile - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/compile freeswitch/branches/bojin/libs/codec/g726/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/config.guess freeswitch/branches/bojin/libs/codec/g726/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/config.sub freeswitch/branches/bojin/libs/codec/g726/configure - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/configure freeswitch/branches/bojin/libs/codec/g726/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/configure.in freeswitch/branches/bojin/libs/codec/g726/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/depcomp freeswitch/branches/bojin/libs/codec/g726/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/install-sh freeswitch/branches/bojin/libs/codec/g726/libg726.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/libg726.vcproj freeswitch/branches/bojin/libs/codec/g726/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/ltmain.sh freeswitch/branches/bojin/libs/codec/g726/missing - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/missing freeswitch/branches/bojin/libs/codec/g726/src/ - copied from r2223, /freeswitch/trunk/libs/codec/g726/src/ freeswitch/branches/bojin/libs/codec/g726/src/g726_16.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g726_16.c freeswitch/branches/bojin/libs/codec/g726/src/g726_24.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g726_24.c freeswitch/branches/bojin/libs/codec/g726/src/g726_32.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g726_32.c freeswitch/branches/bojin/libs/codec/g726/src/g726_40.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g726_40.c freeswitch/branches/bojin/libs/codec/g726/src/g72x.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g72x.c freeswitch/branches/bojin/libs/codec/g726/src/g72x.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/g72x.h freeswitch/branches/bojin/libs/codec/g726/src/private.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/g726/src/private.h freeswitch/branches/bojin/libs/codec/gsm/ (props changed) - copied from r2223, /freeswitch/trunk/libs/codec/gsm/ freeswitch/branches/bojin/libs/codec/gsm/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/AUTHORS freeswitch/branches/bojin/libs/codec/gsm/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/COPYING freeswitch/branches/bojin/libs/codec/gsm/COPYRIGHT - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/COPYRIGHT freeswitch/branches/bojin/libs/codec/gsm/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/ChangeLog freeswitch/branches/bojin/libs/codec/gsm/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/INSTALL freeswitch/branches/bojin/libs/codec/gsm/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/Makefile.am freeswitch/branches/bojin/libs/codec/gsm/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/Makefile.in freeswitch/branches/bojin/libs/codec/gsm/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/NEWS freeswitch/branches/bojin/libs/codec/gsm/README - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/README freeswitch/branches/bojin/libs/codec/gsm/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/aclocal.m4 freeswitch/branches/bojin/libs/codec/gsm/compile - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/compile freeswitch/branches/bojin/libs/codec/gsm/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/config.guess freeswitch/branches/bojin/libs/codec/gsm/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/config.sub freeswitch/branches/bojin/libs/codec/gsm/configure - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/configure freeswitch/branches/bojin/libs/codec/gsm/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/configure.in freeswitch/branches/bojin/libs/codec/gsm/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/depcomp freeswitch/branches/bojin/libs/codec/gsm/inc/ - copied from r2223, /freeswitch/trunk/libs/codec/gsm/inc/ freeswitch/branches/bojin/libs/codec/gsm/inc/config.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/inc/config.h freeswitch/branches/bojin/libs/codec/gsm/inc/gsm.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/inc/gsm.h freeswitch/branches/bojin/libs/codec/gsm/inc/private.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/inc/private.h freeswitch/branches/bojin/libs/codec/gsm/inc/proto.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/inc/proto.h freeswitch/branches/bojin/libs/codec/gsm/inc/unproto.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/inc/unproto.h freeswitch/branches/bojin/libs/codec/gsm/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/install-sh freeswitch/branches/bojin/libs/codec/gsm/libgsm.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/libgsm.vcproj freeswitch/branches/bojin/libs/codec/gsm/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/ltmain.sh freeswitch/branches/bojin/libs/codec/gsm/missing - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/missing freeswitch/branches/bojin/libs/codec/gsm/src/ - copied from r2223, /freeswitch/trunk/libs/codec/gsm/src/ freeswitch/branches/bojin/libs/codec/gsm/src/add.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/add.c freeswitch/branches/bojin/libs/codec/gsm/src/code.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/code.c freeswitch/branches/bojin/libs/codec/gsm/src/decode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/decode.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_create.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_create.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_decode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_decode.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_destroy.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_destroy.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_encode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_encode.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_lpc.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_lpc.c freeswitch/branches/bojin/libs/codec/gsm/src/gsm_option.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/gsm_option.c freeswitch/branches/bojin/libs/codec/gsm/src/long_term.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/long_term.c freeswitch/branches/bojin/libs/codec/gsm/src/preprocess.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/preprocess.c freeswitch/branches/bojin/libs/codec/gsm/src/rpe.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/rpe.c freeswitch/branches/bojin/libs/codec/gsm/src/short_term.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/short_term.c freeswitch/branches/bojin/libs/codec/gsm/src/table.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/gsm/src/table.c freeswitch/branches/bojin/libs/codec/ilbc/ (props changed) - copied from r2223, /freeswitch/trunk/libs/codec/ilbc/ freeswitch/branches/bojin/libs/codec/ilbc/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/AUTHORS freeswitch/branches/bojin/libs/codec/ilbc/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/COPYING freeswitch/branches/bojin/libs/codec/ilbc/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/ChangeLog freeswitch/branches/bojin/libs/codec/ilbc/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/INSTALL freeswitch/branches/bojin/libs/codec/ilbc/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/Makefile.am freeswitch/branches/bojin/libs/codec/ilbc/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/Makefile.in freeswitch/branches/bojin/libs/codec/ilbc/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/NEWS freeswitch/branches/bojin/libs/codec/ilbc/README - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/README freeswitch/branches/bojin/libs/codec/ilbc/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/aclocal.m4 freeswitch/branches/bojin/libs/codec/ilbc/compile - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/compile freeswitch/branches/bojin/libs/codec/ilbc/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/config.guess freeswitch/branches/bojin/libs/codec/ilbc/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/config.sub freeswitch/branches/bojin/libs/codec/ilbc/configure - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/configure freeswitch/branches/bojin/libs/codec/ilbc/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/configure.in freeswitch/branches/bojin/libs/codec/ilbc/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/depcomp freeswitch/branches/bojin/libs/codec/ilbc/draft-ietf-avt-ilbc-codec-05.txt - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/draft-ietf-avt-ilbc-codec-05.txt freeswitch/branches/bojin/libs/codec/ilbc/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/install-sh freeswitch/branches/bojin/libs/codec/ilbc/libilbc.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/libilbc.vcproj freeswitch/branches/bojin/libs/codec/ilbc/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/ltmain.sh freeswitch/branches/bojin/libs/codec/ilbc/missing - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/missing freeswitch/branches/bojin/libs/codec/ilbc/src/ - copied from r2223, /freeswitch/trunk/libs/codec/ilbc/src/ freeswitch/branches/bojin/libs/codec/ilbc/src/FrameClassify.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/FrameClassify.c freeswitch/branches/bojin/libs/codec/ilbc/src/FrameClassify.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/FrameClassify.h freeswitch/branches/bojin/libs/codec/ilbc/src/LPCdecode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/LPCdecode.c freeswitch/branches/bojin/libs/codec/ilbc/src/LPCdecode.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/LPCdecode.h freeswitch/branches/bojin/libs/codec/ilbc/src/LPCencode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/LPCencode.c freeswitch/branches/bojin/libs/codec/ilbc/src/LPCencode.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/LPCencode.h freeswitch/branches/bojin/libs/codec/ilbc/src/StateConstructW.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/StateConstructW.c freeswitch/branches/bojin/libs/codec/ilbc/src/StateConstructW.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/StateConstructW.h freeswitch/branches/bojin/libs/codec/ilbc/src/StateSearchW.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/StateSearchW.c freeswitch/branches/bojin/libs/codec/ilbc/src/StateSearchW.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/StateSearchW.h freeswitch/branches/bojin/libs/codec/ilbc/src/anaFilter.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/anaFilter.c freeswitch/branches/bojin/libs/codec/ilbc/src/anaFilter.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/anaFilter.h freeswitch/branches/bojin/libs/codec/ilbc/src/constants.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/constants.c freeswitch/branches/bojin/libs/codec/ilbc/src/constants.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/constants.h freeswitch/branches/bojin/libs/codec/ilbc/src/createCB.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/createCB.c freeswitch/branches/bojin/libs/codec/ilbc/src/createCB.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/createCB.h freeswitch/branches/bojin/libs/codec/ilbc/src/doCPLC.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/doCPLC.c freeswitch/branches/bojin/libs/codec/ilbc/src/doCPLC.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/doCPLC.h freeswitch/branches/bojin/libs/codec/ilbc/src/enhancer.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/enhancer.c freeswitch/branches/bojin/libs/codec/ilbc/src/enhancer.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/enhancer.h freeswitch/branches/bojin/libs/codec/ilbc/src/extract-cfile.awk - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/extract-cfile.awk freeswitch/branches/bojin/libs/codec/ilbc/src/filter.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/filter.c freeswitch/branches/bojin/libs/codec/ilbc/src/filter.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/filter.h freeswitch/branches/bojin/libs/codec/ilbc/src/gainquant.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/gainquant.c freeswitch/branches/bojin/libs/codec/ilbc/src/gainquant.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/gainquant.h freeswitch/branches/bojin/libs/codec/ilbc/src/getCBvec.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/getCBvec.c freeswitch/branches/bojin/libs/codec/ilbc/src/getCBvec.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/getCBvec.h freeswitch/branches/bojin/libs/codec/ilbc/src/helpfun.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/helpfun.c freeswitch/branches/bojin/libs/codec/ilbc/src/helpfun.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/helpfun.h freeswitch/branches/bojin/libs/codec/ilbc/src/hpInput.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/hpInput.c freeswitch/branches/bojin/libs/codec/ilbc/src/hpInput.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/hpInput.h freeswitch/branches/bojin/libs/codec/ilbc/src/hpOutput.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/hpOutput.c freeswitch/branches/bojin/libs/codec/ilbc/src/hpOutput.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/hpOutput.h freeswitch/branches/bojin/libs/codec/ilbc/src/iCBConstruct.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iCBConstruct.c freeswitch/branches/bojin/libs/codec/ilbc/src/iCBConstruct.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iCBConstruct.h freeswitch/branches/bojin/libs/codec/ilbc/src/iCBSearch.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.c freeswitch/branches/bojin/libs/codec/ilbc/src/iCBSearch.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iCBSearch.h freeswitch/branches/bojin/libs/codec/ilbc/src/iLBC_decode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_decode.c freeswitch/branches/bojin/libs/codec/ilbc/src/iLBC_decode.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_decode.h freeswitch/branches/bojin/libs/codec/ilbc/src/iLBC_define.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_define.h freeswitch/branches/bojin/libs/codec/ilbc/src/iLBC_encode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_encode.c freeswitch/branches/bojin/libs/codec/ilbc/src/iLBC_encode.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/iLBC_encode.h freeswitch/branches/bojin/libs/codec/ilbc/src/lsf.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/lsf.c freeswitch/branches/bojin/libs/codec/ilbc/src/lsf.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/lsf.h freeswitch/branches/bojin/libs/codec/ilbc/src/packing.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/packing.c freeswitch/branches/bojin/libs/codec/ilbc/src/packing.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/packing.h freeswitch/branches/bojin/libs/codec/ilbc/src/syntFilter.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/syntFilter.c freeswitch/branches/bojin/libs/codec/ilbc/src/syntFilter.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/ilbc/src/syntFilter.h freeswitch/branches/bojin/libs/codec/lpc10/ - copied from r2223, /freeswitch/trunk/libs/codec/lpc10/ freeswitch/branches/bojin/libs/codec/lpc10/Makefile - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/Makefile freeswitch/branches/bojin/libs/codec/lpc10/README - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/README freeswitch/branches/bojin/libs/codec/lpc10/analys.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/analys.c freeswitch/branches/bojin/libs/codec/lpc10/bsynz.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/bsynz.c freeswitch/branches/bojin/libs/codec/lpc10/chanwr.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/chanwr.c freeswitch/branches/bojin/libs/codec/lpc10/dcbias.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/dcbias.c freeswitch/branches/bojin/libs/codec/lpc10/decode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/decode.c freeswitch/branches/bojin/libs/codec/lpc10/deemp.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/deemp.c freeswitch/branches/bojin/libs/codec/lpc10/difmag.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/difmag.c freeswitch/branches/bojin/libs/codec/lpc10/dyptrk.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/dyptrk.c freeswitch/branches/bojin/libs/codec/lpc10/encode.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/encode.c freeswitch/branches/bojin/libs/codec/lpc10/energy.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/energy.c freeswitch/branches/bojin/libs/codec/lpc10/f2c.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/f2c.h freeswitch/branches/bojin/libs/codec/lpc10/f2clib.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/f2clib.c freeswitch/branches/bojin/libs/codec/lpc10/ham84.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/ham84.c freeswitch/branches/bojin/libs/codec/lpc10/hp100.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/hp100.c freeswitch/branches/bojin/libs/codec/lpc10/invert.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/invert.c freeswitch/branches/bojin/libs/codec/lpc10/irc2pc.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/irc2pc.c freeswitch/branches/bojin/libs/codec/lpc10/ivfilt.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/ivfilt.c freeswitch/branches/bojin/libs/codec/lpc10/liblpc10.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/liblpc10.vcproj freeswitch/branches/bojin/libs/codec/lpc10/lpc10.h - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/lpc10.h freeswitch/branches/bojin/libs/codec/lpc10/lpcdec.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/lpcdec.c freeswitch/branches/bojin/libs/codec/lpc10/lpcenc.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/lpcenc.c freeswitch/branches/bojin/libs/codec/lpc10/lpcini.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/lpcini.c freeswitch/branches/bojin/libs/codec/lpc10/lpfilt.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/lpfilt.c freeswitch/branches/bojin/libs/codec/lpc10/median.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/median.c freeswitch/branches/bojin/libs/codec/lpc10/mload.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/mload.c freeswitch/branches/bojin/libs/codec/lpc10/onset.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/onset.c freeswitch/branches/bojin/libs/codec/lpc10/pitsyn.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/pitsyn.c freeswitch/branches/bojin/libs/codec/lpc10/placea.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/placea.c freeswitch/branches/bojin/libs/codec/lpc10/placev.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/placev.c freeswitch/branches/bojin/libs/codec/lpc10/preemp.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/preemp.c freeswitch/branches/bojin/libs/codec/lpc10/prepro.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/prepro.c freeswitch/branches/bojin/libs/codec/lpc10/random.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/random.c freeswitch/branches/bojin/libs/codec/lpc10/rcchk.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/rcchk.c freeswitch/branches/bojin/libs/codec/lpc10/synths.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/synths.c freeswitch/branches/bojin/libs/codec/lpc10/tbdm.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/tbdm.c freeswitch/branches/bojin/libs/codec/lpc10/voicin.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/voicin.c freeswitch/branches/bojin/libs/codec/lpc10/vparms.c - copied unchanged from r2223, /freeswitch/trunk/libs/codec/lpc10/vparms.c freeswitch/branches/bojin/libs/iax/ (props changed) - copied from r2223, /freeswitch/trunk/libs/iax/ freeswitch/branches/bojin/libs/iax/.cvsignore - copied unchanged from r2223, /freeswitch/trunk/libs/iax/.cvsignore freeswitch/branches/bojin/libs/iax/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/iax/AUTHORS freeswitch/branches/bojin/libs/iax/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/iax/COPYING freeswitch/branches/bojin/libs/iax/COPYING.LIB - copied unchanged from r2223, /freeswitch/trunk/libs/iax/COPYING.LIB freeswitch/branches/bojin/libs/iax/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/iax/ChangeLog freeswitch/branches/bojin/libs/iax/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/iax/INSTALL freeswitch/branches/bojin/libs/iax/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/iax/Makefile.am freeswitch/branches/bojin/libs/iax/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/iax/Makefile.in freeswitch/branches/bojin/libs/iax/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/iax/NEWS freeswitch/branches/bojin/libs/iax/README - copied unchanged from r2223, /freeswitch/trunk/libs/iax/README freeswitch/branches/bojin/libs/iax/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/iax/aclocal.m4 freeswitch/branches/bojin/libs/iax/bootstrap.sh - copied unchanged from r2223, /freeswitch/trunk/libs/iax/bootstrap.sh freeswitch/branches/bojin/libs/iax/build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/iax/build.sh freeswitch/branches/bojin/libs/iax/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/iax/config.guess freeswitch/branches/bojin/libs/iax/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/iax/config.sub freeswitch/branches/bojin/libs/iax/configure - copied unchanged from r2223, /freeswitch/trunk/libs/iax/configure freeswitch/branches/bojin/libs/iax/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/iax/configure.in freeswitch/branches/bojin/libs/iax/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/iax/depcomp freeswitch/branches/bojin/libs/iax/iax-config.in - copied unchanged from r2223, /freeswitch/trunk/libs/iax/iax-config.in freeswitch/branches/bojin/libs/iax/iax.spec.in - copied unchanged from r2223, /freeswitch/trunk/libs/iax/iax.spec.in freeswitch/branches/bojin/libs/iax/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/iax/install-sh freeswitch/branches/bojin/libs/iax/libiax2.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/iax/libiax2.vcproj freeswitch/branches/bojin/libs/iax/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/iax/ltmain.sh freeswitch/branches/bojin/libs/iax/missing - copied unchanged from r2223, /freeswitch/trunk/libs/iax/missing freeswitch/branches/bojin/libs/iax/src/ (props changed) - copied from r2223, /freeswitch/trunk/libs/iax/src/ freeswitch/branches/bojin/libs/iax/src/.cvsignore - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/.cvsignore freeswitch/branches/bojin/libs/iax/src/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/Makefile.am freeswitch/branches/bojin/libs/iax/src/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/Makefile.in freeswitch/branches/bojin/libs/iax/src/answer.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/answer.h freeswitch/branches/bojin/libs/iax/src/asterisk/ - copied from r2223, /freeswitch/trunk/libs/iax/src/asterisk/ freeswitch/branches/bojin/libs/iax/src/busy.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/busy.h freeswitch/branches/bojin/libs/iax/src/dialtone.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/dialtone.h freeswitch/branches/bojin/libs/iax/src/frame.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/frame.h freeswitch/branches/bojin/libs/iax/src/iax-client.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax-client.h freeswitch/branches/bojin/libs/iax/src/iax.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax.c freeswitch/branches/bojin/libs/iax/src/iax.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax.h freeswitch/branches/bojin/libs/iax/src/iax2-parser.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax2-parser.c freeswitch/branches/bojin/libs/iax/src/iax2-parser.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax2-parser.h freeswitch/branches/bojin/libs/iax/src/iax2.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/iax2.h freeswitch/branches/bojin/libs/iax/src/jitterbuf.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/jitterbuf.c freeswitch/branches/bojin/libs/iax/src/jitterbuf.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/jitterbuf.h freeswitch/branches/bojin/libs/iax/src/md5.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/md5.c freeswitch/branches/bojin/libs/iax/src/md5.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/md5.h freeswitch/branches/bojin/libs/iax/src/miniphone.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/miniphone.c freeswitch/branches/bojin/libs/iax/src/miniphone.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/miniphone.h freeswitch/branches/bojin/libs/iax/src/options.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/options.c freeswitch/branches/bojin/libs/iax/src/options.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/options.h freeswitch/branches/bojin/libs/iax/src/ring10.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/ring10.h freeswitch/branches/bojin/libs/iax/src/ringtone.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/ringtone.h freeswitch/branches/bojin/libs/iax/src/winiphone.c - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/winiphone.c freeswitch/branches/bojin/libs/iax/src/winpoop.h - copied unchanged from r2223, /freeswitch/trunk/libs/iax/src/winpoop.h freeswitch/branches/bojin/libs/libdingaling/ (props changed) - copied from r2223, /freeswitch/trunk/libs/libdingaling/ freeswitch/branches/bojin/libs/libdingaling/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/AUTHORS freeswitch/branches/bojin/libs/libdingaling/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/COPYING freeswitch/branches/bojin/libs/libdingaling/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/ChangeLog freeswitch/branches/bojin/libs/libdingaling/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/INSTALL freeswitch/branches/bojin/libs/libdingaling/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/Makefile.am freeswitch/branches/bojin/libs/libdingaling/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/Makefile.in freeswitch/branches/bojin/libs/libdingaling/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/NEWS freeswitch/branches/bojin/libs/libdingaling/README - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/README freeswitch/branches/bojin/libs/libdingaling/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/aclocal.m4 freeswitch/branches/bojin/libs/libdingaling/compile - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/compile freeswitch/branches/bojin/libs/libdingaling/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/config.guess freeswitch/branches/bojin/libs/libdingaling/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/config.sub freeswitch/branches/bojin/libs/libdingaling/configure - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/configure freeswitch/branches/bojin/libs/libdingaling/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/configure.in freeswitch/branches/bojin/libs/libdingaling/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/depcomp freeswitch/branches/bojin/libs/libdingaling/doc - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/doc freeswitch/branches/bojin/libs/libdingaling/docs/ - copied from r2223, /freeswitch/trunk/libs/libdingaling/docs/ freeswitch/branches/bojin/libs/libdingaling/docs/Doxygen.conf - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/docs/Doxygen.conf freeswitch/branches/bojin/libs/libdingaling/docs/docs.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/docs/docs.vcproj freeswitch/branches/bojin/libs/libdingaling/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/install-sh freeswitch/branches/bojin/libs/libdingaling/libdingaling.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/libdingaling.vcproj freeswitch/branches/bojin/libs/libdingaling/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/ltmain.sh freeswitch/branches/bojin/libs/libdingaling/missing - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/missing freeswitch/branches/bojin/libs/libdingaling/mkinstalldirs - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/mkinstalldirs freeswitch/branches/bojin/libs/libdingaling/src/ - copied from r2223, /freeswitch/trunk/libs/libdingaling/src/ freeswitch/branches/bojin/libs/libdingaling/src/dingaling.def - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/src/dingaling.def freeswitch/branches/bojin/libs/libdingaling/src/ldl_compat.h - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/src/ldl_compat.h freeswitch/branches/bojin/libs/libdingaling/src/libdingaling.c - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/branches/bojin/libs/libdingaling/src/libdingaling.h - copied unchanged from r2223, /freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/branches/bojin/libs/libresample-0.1.3.build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/libresample-0.1.3.build.sh freeswitch/branches/bojin/libs/libspeakup/ (props changed) - copied from r2223, /freeswitch/trunk/libs/libspeakup/ freeswitch/branches/bojin/libs/libspeakup/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/AUTHORS freeswitch/branches/bojin/libs/libspeakup/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/COPYING freeswitch/branches/bojin/libs/libspeakup/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/ChangeLog freeswitch/branches/bojin/libs/libspeakup/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/INSTALL freeswitch/branches/bojin/libs/libspeakup/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/Makefile.am freeswitch/branches/bojin/libs/libspeakup/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/Makefile.in freeswitch/branches/bojin/libs/libspeakup/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/NEWS freeswitch/branches/bojin/libs/libspeakup/README - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/README freeswitch/branches/bojin/libs/libspeakup/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/aclocal.m4 freeswitch/branches/bojin/libs/libspeakup/compile - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/compile freeswitch/branches/bojin/libs/libspeakup/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/config.guess freeswitch/branches/bojin/libs/libspeakup/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/config.sub freeswitch/branches/bojin/libs/libspeakup/configure - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/configure freeswitch/branches/bojin/libs/libspeakup/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/configure.in freeswitch/branches/bojin/libs/libspeakup/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/depcomp freeswitch/branches/bojin/libs/libspeakup/doc - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/doc freeswitch/branches/bojin/libs/libspeakup/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/install-sh freeswitch/branches/bojin/libs/libspeakup/jitterbuffer.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/jitterbuffer.vcproj freeswitch/branches/bojin/libs/libspeakup/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/ltmain.sh freeswitch/branches/bojin/libs/libspeakup/missing - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/missing freeswitch/branches/bojin/libs/libspeakup/mkinstalldirs - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/mkinstalldirs freeswitch/branches/bojin/libs/libspeakup/src/ - copied from r2223, /freeswitch/trunk/libs/libspeakup/src/ freeswitch/branches/bojin/libs/libspeakup/src/jb_speakup.c - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/src/jb_speakup.c freeswitch/branches/bojin/libs/libspeakup/src/jb_speakup.h - copied unchanged from r2223, /freeswitch/trunk/libs/libspeakup/src/jb_speakup.h freeswitch/branches/bojin/libs/libteletone/ (props changed) - copied from r2223, /freeswitch/trunk/libs/libteletone/ freeswitch/branches/bojin/libs/libteletone/AUTHORS - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/AUTHORS freeswitch/branches/bojin/libs/libteletone/COPYING - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/COPYING freeswitch/branches/bojin/libs/libteletone/ChangeLog - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/ChangeLog freeswitch/branches/bojin/libs/libteletone/INSTALL - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/INSTALL freeswitch/branches/bojin/libs/libteletone/Makefile.am - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/Makefile.am freeswitch/branches/bojin/libs/libteletone/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/Makefile.in freeswitch/branches/bojin/libs/libteletone/NEWS - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/NEWS freeswitch/branches/bojin/libs/libteletone/README - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/README freeswitch/branches/bojin/libs/libteletone/aclocal.m4 - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/aclocal.m4 freeswitch/branches/bojin/libs/libteletone/compile - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/compile freeswitch/branches/bojin/libs/libteletone/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/config.guess freeswitch/branches/bojin/libs/libteletone/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/config.sub freeswitch/branches/bojin/libs/libteletone/configure - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/configure freeswitch/branches/bojin/libs/libteletone/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/configure.in freeswitch/branches/bojin/libs/libteletone/depcomp - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/depcomp freeswitch/branches/bojin/libs/libteletone/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/install-sh freeswitch/branches/bojin/libs/libteletone/libteletone.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/libteletone.vcproj freeswitch/branches/bojin/libs/libteletone/ltmain.sh - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/ltmain.sh freeswitch/branches/bojin/libs/libteletone/missing - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/missing freeswitch/branches/bojin/libs/libteletone/mkinstalldirs - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/mkinstalldirs freeswitch/branches/bojin/libs/libteletone/src/ - copied from r2223, /freeswitch/trunk/libs/libteletone/src/ freeswitch/branches/bojin/libs/libteletone/src/libteletone.h - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/branches/bojin/libs/libteletone/src/libteletone_detect.c - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/branches/bojin/libs/libteletone/src/libteletone_detect.h - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/src/libteletone_detect.h freeswitch/branches/bojin/libs/libteletone/src/libteletone_generate.c - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/branches/bojin/libs/libteletone/src/libteletone_generate.h - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/src/libteletone_generate.h freeswitch/branches/bojin/libs/libteletone/teletone.def - copied unchanged from r2223, /freeswitch/trunk/libs/libteletone/teletone.def freeswitch/branches/bojin/libs/mozilla.build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/mozilla.build.sh freeswitch/branches/bojin/libs/openldap-2.3.19.build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/openldap-2.3.19.build.sh freeswitch/branches/bojin/libs/portaudio.build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/portaudio.build.sh freeswitch/branches/bojin/libs/srtp/ (props changed) - copied from r2223, /freeswitch/trunk/libs/srtp/ freeswitch/branches/bojin/libs/srtp.build.sh - copied unchanged from r2223, /freeswitch/trunk/libs/srtp.build.sh freeswitch/branches/bojin/libs/srtp/CHANGES - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/CHANGES freeswitch/branches/bojin/libs/srtp/LICENSE - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/LICENSE freeswitch/branches/bojin/libs/srtp/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/Makefile.in freeswitch/branches/bojin/libs/srtp/README - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/README freeswitch/branches/bojin/libs/srtp/TODO - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/TODO freeswitch/branches/bojin/libs/srtp/VERSION - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/VERSION freeswitch/branches/bojin/libs/srtp/config.guess - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/config.guess freeswitch/branches/bojin/libs/srtp/config.hw - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/config.hw freeswitch/branches/bojin/libs/srtp/config.sub - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/config.sub freeswitch/branches/bojin/libs/srtp/config_in.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/config_in.h freeswitch/branches/bojin/libs/srtp/configure - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/configure freeswitch/branches/bojin/libs/srtp/configure.in - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/configure.in freeswitch/branches/bojin/libs/srtp/crypto/ (props changed) - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/ freeswitch/branches/bojin/libs/srtp/crypto/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/Makefile.in freeswitch/branches/bojin/libs/srtp/crypto/VERSION - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/VERSION freeswitch/branches/bojin/libs/srtp/crypto/ae_xfm/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/ae_xfm/ freeswitch/branches/bojin/libs/srtp/crypto/ae_xfm/xfm.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/ae_xfm/xfm.c freeswitch/branches/bojin/libs/srtp/crypto/cipher/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/ freeswitch/branches/bojin/libs/srtp/crypto/cipher/aes.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/aes.c freeswitch/branches/bojin/libs/srtp/crypto/cipher/aes_cbc.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/aes_cbc.c freeswitch/branches/bojin/libs/srtp/crypto/cipher/aes_icm.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c freeswitch/branches/bojin/libs/srtp/crypto/cipher/cipher.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/cipher.c freeswitch/branches/bojin/libs/srtp/crypto/cipher/null_cipher.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/cipher/null_cipher.c freeswitch/branches/bojin/libs/srtp/crypto/hash/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/hash/ freeswitch/branches/bojin/libs/srtp/crypto/hash/auth.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/hash/auth.c freeswitch/branches/bojin/libs/srtp/crypto/hash/hmac.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/hash/hmac.c freeswitch/branches/bojin/libs/srtp/crypto/hash/null_auth.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/hash/null_auth.c freeswitch/branches/bojin/libs/srtp/crypto/hash/sha1.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/hash/sha1.c freeswitch/branches/bojin/libs/srtp/crypto/include/ (props changed) - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/include/ freeswitch/branches/bojin/libs/srtp/crypto/include/aes.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/aes.h freeswitch/branches/bojin/libs/srtp/crypto/include/aes_cbc.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/aes_cbc.h freeswitch/branches/bojin/libs/srtp/crypto/include/aes_icm.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/aes_icm.h freeswitch/branches/bojin/libs/srtp/crypto/include/alloc.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/alloc.h freeswitch/branches/bojin/libs/srtp/crypto/include/auth.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/auth.h freeswitch/branches/bojin/libs/srtp/crypto/include/cipher.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/cipher.h freeswitch/branches/bojin/libs/srtp/crypto/include/crypto.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/crypto.h freeswitch/branches/bojin/libs/srtp/crypto/include/crypto_kernel.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/crypto_kernel.h freeswitch/branches/bojin/libs/srtp/crypto/include/crypto_math.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/crypto_math.h freeswitch/branches/bojin/libs/srtp/crypto/include/crypto_types.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/crypto_types.h freeswitch/branches/bojin/libs/srtp/crypto/include/cryptoalg.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/cryptoalg.h freeswitch/branches/bojin/libs/srtp/crypto/include/datatypes.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/datatypes.h freeswitch/branches/bojin/libs/srtp/crypto/include/err.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/err.h freeswitch/branches/bojin/libs/srtp/crypto/include/gf2_8.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/gf2_8.h freeswitch/branches/bojin/libs/srtp/crypto/include/hmac.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/hmac.h freeswitch/branches/bojin/libs/srtp/crypto/include/integers.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/integers.h freeswitch/branches/bojin/libs/srtp/crypto/include/kernel_compat.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/kernel_compat.h freeswitch/branches/bojin/libs/srtp/crypto/include/key.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/key.h freeswitch/branches/bojin/libs/srtp/crypto/include/null_auth.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/null_auth.h freeswitch/branches/bojin/libs/srtp/crypto/include/null_cipher.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/null_cipher.h freeswitch/branches/bojin/libs/srtp/crypto/include/prng.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/prng.h freeswitch/branches/bojin/libs/srtp/crypto/include/rand_source.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/rand_source.h freeswitch/branches/bojin/libs/srtp/crypto/include/rdb.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/rdb.h freeswitch/branches/bojin/libs/srtp/crypto/include/rdbx.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/rdbx.h freeswitch/branches/bojin/libs/srtp/crypto/include/sha1.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/sha1.h freeswitch/branches/bojin/libs/srtp/crypto/include/stat.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/stat.h freeswitch/branches/bojin/libs/srtp/crypto/include/xfm.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/include/xfm.h freeswitch/branches/bojin/libs/srtp/crypto/kernel/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/kernel/ freeswitch/branches/bojin/libs/srtp/crypto/kernel/alloc.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/kernel/alloc.c freeswitch/branches/bojin/libs/srtp/crypto/kernel/crypto_kernel.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/kernel/crypto_kernel.c freeswitch/branches/bojin/libs/srtp/crypto/kernel/err.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/kernel/err.c freeswitch/branches/bojin/libs/srtp/crypto/kernel/key.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/kernel/key.c freeswitch/branches/bojin/libs/srtp/crypto/math/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/math/ freeswitch/branches/bojin/libs/srtp/crypto/math/datatypes.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/math/datatypes.c freeswitch/branches/bojin/libs/srtp/crypto/math/gf2_8.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/math/gf2_8.c freeswitch/branches/bojin/libs/srtp/crypto/math/math.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/math/math.c freeswitch/branches/bojin/libs/srtp/crypto/math/stat.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/math/stat.c freeswitch/branches/bojin/libs/srtp/crypto/replay/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/replay/ freeswitch/branches/bojin/libs/srtp/crypto/replay/rdb.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/replay/rdb.c freeswitch/branches/bojin/libs/srtp/crypto/replay/rdbx.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/replay/rdbx.c freeswitch/branches/bojin/libs/srtp/crypto/replay/ut_sim.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/replay/ut_sim.c freeswitch/branches/bojin/libs/srtp/crypto/rng/ - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/rng/ freeswitch/branches/bojin/libs/srtp/crypto/rng/ctr_prng.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/rng/ctr_prng.c freeswitch/branches/bojin/libs/srtp/crypto/rng/prng.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/rng/prng.c freeswitch/branches/bojin/libs/srtp/crypto/rng/rand_linux_kernel.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/rng/rand_linux_kernel.c freeswitch/branches/bojin/libs/srtp/crypto/rng/rand_source.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/rng/rand_source.c freeswitch/branches/bojin/libs/srtp/crypto/test/ (props changed) - copied from r2223, /freeswitch/trunk/libs/srtp/crypto/test/ freeswitch/branches/bojin/libs/srtp/crypto/test/aes_calc.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/aes_calc.c freeswitch/branches/bojin/libs/srtp/crypto/test/auth_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/auth_driver.c freeswitch/branches/bojin/libs/srtp/crypto/test/cipher_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/cipher_driver.c freeswitch/branches/bojin/libs/srtp/crypto/test/datatypes_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/datatypes_driver.c freeswitch/branches/bojin/libs/srtp/crypto/test/env.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/env.c freeswitch/branches/bojin/libs/srtp/crypto/test/kernel_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/kernel_driver.c freeswitch/branches/bojin/libs/srtp/crypto/test/rand_gen.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/rand_gen.c freeswitch/branches/bojin/libs/srtp/crypto/test/sha1_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/sha1_driver.c freeswitch/branches/bojin/libs/srtp/crypto/test/stat_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/crypto/test/stat_driver.c freeswitch/branches/bojin/libs/srtp/doc/ - copied from r2223, /freeswitch/trunk/libs/srtp/doc/ freeswitch/branches/bojin/libs/srtp/doc/Doxyfile - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/Doxyfile freeswitch/branches/bojin/libs/srtp/doc/Makefile - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/Makefile freeswitch/branches/bojin/libs/srtp/doc/Makefile.in - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/Makefile.in freeswitch/branches/bojin/libs/srtp/doc/crypto_kernel.txt - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/crypto_kernel.txt freeswitch/branches/bojin/libs/srtp/doc/draft-irtf-cfrg-icm-00.txt - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/draft-irtf-cfrg-icm-00.txt freeswitch/branches/bojin/libs/srtp/doc/header.template - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/header.template freeswitch/branches/bojin/libs/srtp/doc/intro.txt - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/intro.txt freeswitch/branches/bojin/libs/srtp/doc/libsrtp.pdf - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/libsrtp.pdf freeswitch/branches/bojin/libs/srtp/doc/references.txt - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/references.txt freeswitch/branches/bojin/libs/srtp/doc/rfc3711.txt - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/doc/rfc3711.txt freeswitch/branches/bojin/libs/srtp/include/ - copied from r2223, /freeswitch/trunk/libs/srtp/include/ freeswitch/branches/bojin/libs/srtp/include/rtp.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/include/rtp.h freeswitch/branches/bojin/libs/srtp/include/srtp.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/include/srtp.h freeswitch/branches/bojin/libs/srtp/include/ut_sim.h - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/include/ut_sim.h freeswitch/branches/bojin/libs/srtp/install-sh - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/install-sh freeswitch/branches/bojin/libs/srtp/srtp/ - copied from r2223, /freeswitch/trunk/libs/srtp/srtp/ freeswitch/branches/bojin/libs/srtp/srtp.def - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/srtp.def freeswitch/branches/bojin/libs/srtp/srtp.vcproj - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/srtp.vcproj freeswitch/branches/bojin/libs/srtp/srtp/srtp.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/srtp/srtp.c freeswitch/branches/bojin/libs/srtp/tables/ - copied from r2223, /freeswitch/trunk/libs/srtp/tables/ freeswitch/branches/bojin/libs/srtp/tables/aes_tables.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/tables/aes_tables.c freeswitch/branches/bojin/libs/srtp/test/ (props changed) - copied from r2223, /freeswitch/trunk/libs/srtp/test/ freeswitch/branches/bojin/libs/srtp/test/lfsr.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/lfsr.c freeswitch/branches/bojin/libs/srtp/test/rdbx_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/rdbx_driver.c freeswitch/branches/bojin/libs/srtp/test/replay_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/replay_driver.c freeswitch/branches/bojin/libs/srtp/test/roc_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/roc_driver.c freeswitch/branches/bojin/libs/srtp/test/rtp.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/rtp.c freeswitch/branches/bojin/libs/srtp/test/rtpw.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/rtpw.c freeswitch/branches/bojin/libs/srtp/test/srtp_driver.c - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/test/srtp_driver.c freeswitch/branches/bojin/libs/srtp/timing - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/timing freeswitch/branches/bojin/libs/srtp/undos.sh - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/undos.sh freeswitch/branches/bojin/libs/srtp/update.sh - copied unchanged from r2223, /freeswitch/trunk/libs/srtp/update.sh freeswitch/branches/bojin/mac/ - copied from r2223, /freeswitch/trunk/mac/ freeswitch/branches/bojin/mac/xcode/ - copied from r2223, /freeswitch/trunk/mac/xcode/ freeswitch/branches/bojin/mac/xcode/FreeSWITCH.xcodeproj/ - copied from r2223, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/ freeswitch/branches/bojin/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj freeswitch/branches/bojin/mac/xcode/apr.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/apr.plist freeswitch/branches/bojin/mac/xcode/aprutil.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/aprutil.plist freeswitch/branches/bojin/mac/xcode/dingaling.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/dingaling.plist freeswitch/branches/bojin/mac/xcode/exosip2.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/exosip2.plist freeswitch/branches/bojin/mac/xcode/gsm.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/gsm.plist freeswitch/branches/bojin/mac/xcode/iax.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/iax.plist freeswitch/branches/bojin/mac/xcode/iksemel.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/iksemel.plist freeswitch/branches/bojin/mac/xcode/ilbc.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/ilbc.plist freeswitch/branches/bojin/mac/xcode/libfreeswitch.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/libfreeswitch.plist freeswitch/branches/bojin/mac/xcode/osip2.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/osip2.plist freeswitch/branches/bojin/mac/xcode/osipparser2.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/osipparser2.plist freeswitch/branches/bojin/mac/xcode/pcre.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/pcre.plist freeswitch/branches/bojin/mac/xcode/portaudio.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/portaudio.plist freeswitch/branches/bojin/mac/xcode/resample.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/resample.plist freeswitch/branches/bojin/mac/xcode/sndfile.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/sndfile.plist freeswitch/branches/bojin/mac/xcode/speakup.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/speakup.plist freeswitch/branches/bojin/mac/xcode/speex.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/speex.plist freeswitch/branches/bojin/mac/xcode/sqlite.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/sqlite.plist freeswitch/branches/bojin/mac/xcode/srtp.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/srtp.plist freeswitch/branches/bojin/mac/xcode/teletone.plist - copied unchanged from r2223, /freeswitch/trunk/mac/xcode/teletone.plist freeswitch/branches/bojin/mkinstalldirs - copied unchanged from r2223, /freeswitch/trunk/mkinstalldirs freeswitch/branches/bojin/modules.conf.in - copied unchanged from r2223, /freeswitch/trunk/modules.conf.in freeswitch/branches/bojin/patches/ - copied from r2223, /freeswitch/trunk/patches/ freeswitch/branches/bojin/scripts/ - copied from r2223, /freeswitch/trunk/scripts/ freeswitch/branches/bojin/scripts/fsxs.in - copied unchanged from r2223, /freeswitch/trunk/scripts/fsxs.in freeswitch/branches/bojin/scripts/multicast/ - copied from r2223, /freeswitch/trunk/scripts/multicast/ freeswitch/branches/bojin/scripts/multicast/recv.pl - copied unchanged from r2223, /freeswitch/trunk/scripts/multicast/recv.pl freeswitch/branches/bojin/scripts/multicast/send.pl - copied unchanged from r2223, /freeswitch/trunk/scripts/multicast/send.pl freeswitch/branches/bojin/scripts/rss/ - copied from r2223, /freeswitch/trunk/scripts/rss/ freeswitch/branches/bojin/scripts/rss/rss2ivr.pl - copied unchanged from r2223, /freeswitch/trunk/scripts/rss/rss2ivr.pl freeswitch/branches/bojin/scripts/rss/syncrss.pl - copied unchanged from r2223, /freeswitch/trunk/scripts/rss/syncrss.pl freeswitch/branches/bojin/scripts/socket/ - copied from r2223, /freeswitch/trunk/scripts/socket/ freeswitch/branches/bojin/scripts/socket/FreeSWITCH/ - copied from r2223, /freeswitch/trunk/scripts/socket/FreeSWITCH/ freeswitch/branches/bojin/scripts/socket/FreeSWITCH/Client.pm - copied unchanged from r2223, /freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm freeswitch/branches/bojin/scripts/socket/fs.pl - copied unchanged from r2223, /freeswitch/trunk/scripts/socket/fs.pl freeswitch/branches/bojin/src/ - copied from r2223, /freeswitch/trunk/src/ freeswitch/branches/bojin/src/include/ (props changed) - copied from r2223, /freeswitch/trunk/src/include/ freeswitch/branches/bojin/src/include/switch.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch.h freeswitch/branches/bojin/src/include/switch_am_config.h.in - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/branches/bojin/src/include/switch_apr.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_apr.h freeswitch/branches/bojin/src/include/switch_buffer.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_buffer.h freeswitch/branches/bojin/src/include/switch_caller.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_caller.h freeswitch/branches/bojin/src/include/switch_channel.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_channel.h freeswitch/branches/bojin/src/include/switch_config.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_config.h freeswitch/branches/bojin/src/include/switch_console.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_console.h freeswitch/branches/bojin/src/include/switch_core.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_core.h freeswitch/branches/bojin/src/include/switch_event.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_event.h freeswitch/branches/bojin/src/include/switch_frame.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_frame.h freeswitch/branches/bojin/src/include/switch_ivr.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_ivr.h freeswitch/branches/bojin/src/include/switch_loadable_module.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/branches/bojin/src/include/switch_log.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_log.h freeswitch/branches/bojin/src/include/switch_module_interfaces.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/branches/bojin/src/include/switch_platform.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_platform.h freeswitch/branches/bojin/src/include/switch_resample.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_resample.h freeswitch/branches/bojin/src/include/switch_rtp.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_rtp.h freeswitch/branches/bojin/src/include/switch_sqlite.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_sqlite.h freeswitch/branches/bojin/src/include/switch_stun.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_stun.h freeswitch/branches/bojin/src/include/switch_types.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_types.h freeswitch/branches/bojin/src/include/switch_utils.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_utils.h freeswitch/branches/bojin/src/include/switch_version.h.in - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_version.h.in freeswitch/branches/bojin/src/include/switch_xml.h - copied unchanged from r2223, /freeswitch/trunk/src/include/switch_xml.h freeswitch/branches/bojin/src/mod/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/ freeswitch/branches/bojin/src/mod/applications/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/ freeswitch/branches/bojin/src/mod/applications/mod_bridgecall/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_bridgecall/ freeswitch/branches/bojin/src/mod/applications/mod_bridgecall/mod_bridgecall.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.c freeswitch/branches/bojin/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_bridgecall/mod_bridgecall.vcproj freeswitch/branches/bojin/src/mod/applications/mod_commands/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_commands/ freeswitch/branches/bojin/src/mod/applications/mod_commands/mod_commands.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/bojin/src/mod/applications/mod_commands/mod_commands.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.vcproj freeswitch/branches/bojin/src/mod/applications/mod_conference/ - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_conference/ freeswitch/branches/bojin/src/mod/applications/mod_conference/mod_conference.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/bojin/src/mod/applications/mod_conference/mod_conference.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.vcproj freeswitch/branches/bojin/src/mod/applications/mod_dptools/ - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_dptools/ freeswitch/branches/bojin/src/mod/applications/mod_dptools/mod_dptools.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/bojin/src/mod/applications/mod_dptools/mod_dptools.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.vcproj freeswitch/branches/bojin/src/mod/applications/mod_echo/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_echo/ freeswitch/branches/bojin/src/mod/applications/mod_echo/mod_echo.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.c freeswitch/branches/bojin/src/mod/applications/mod_echo/mod_echo.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_echo/mod_echo.vcproj freeswitch/branches/bojin/src/mod/applications/mod_ivrtest/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_ivrtest/ freeswitch/branches/bojin/src/mod/applications/mod_ivrtest/mod_ivrtest.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/branches/bojin/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.vcproj freeswitch/branches/bojin/src/mod/applications/mod_playback/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_playback/ freeswitch/branches/bojin/src/mod/applications/mod_playback/mod_playback.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/branches/bojin/src/mod/applications/mod_playback/mod_playback.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.vcproj freeswitch/branches/bojin/src/mod/applications/mod_rss/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_rss/ freeswitch/branches/bojin/src/mod/applications/mod_rss/mod_rss.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/branches/bojin/src/mod/applications/mod_rss/mod_rss.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.vcproj freeswitch/branches/bojin/src/mod/applications/mod_skel/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/applications/mod_skel/ freeswitch/branches/bojin/src/mod/applications/mod_skel/mod_skel.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c freeswitch/branches/bojin/src/mod/asr_tts/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/asr_tts/ freeswitch/branches/bojin/src/mod/asr_tts/mod_cepstral/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ freeswitch/branches/bojin/src/mod/asr_tts/mod_cepstral/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile freeswitch/branches/bojin/src/mod/asr_tts/mod_cepstral/mod_cepstral.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/branches/bojin/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj freeswitch/branches/bojin/src/mod/codecs/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/ freeswitch/branches/bojin/src/mod/codecs/mod_g711/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/ freeswitch/branches/bojin/src/mod/codecs/mod_g711/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/Makefile freeswitch/branches/bojin/src/mod/codecs/mod_g711/g711.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/g711.c freeswitch/branches/bojin/src/mod/codecs/mod_g711/g711.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/g711.h freeswitch/branches/bojin/src/mod/codecs/mod_g711/mod_g711.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/branches/bojin/src/mod/codecs/mod_g711/mod_g711.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.vcproj freeswitch/branches/bojin/src/mod/codecs/mod_g729/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_g729/ freeswitch/branches/bojin/src/mod/codecs/mod_g729/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/branches/bojin/src/mod/codecs/mod_g729/mod_g729.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c freeswitch/branches/bojin/src/mod/codecs/mod_g729/mod_g729.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.vcproj freeswitch/branches/bojin/src/mod/codecs/mod_gsm/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_gsm/ freeswitch/branches/bojin/src/mod/codecs/mod_gsm/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile freeswitch/branches/bojin/src/mod/codecs/mod_gsm/mod_gsm.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.c freeswitch/branches/bojin/src/mod/codecs/mod_gsm/mod_gsm.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_gsm/mod_gsm.vcproj freeswitch/branches/bojin/src/mod/codecs/mod_ilbc/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_ilbc/ freeswitch/branches/bojin/src/mod/codecs/mod_ilbc/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile freeswitch/branches/bojin/src/mod/codecs/mod_ilbc/mod_ilbc.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/branches/bojin/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj freeswitch/branches/bojin/src/mod/codecs/mod_l16/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_l16/ freeswitch/branches/bojin/src/mod/codecs/mod_l16/mod_l16.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/branches/bojin/src/mod/codecs/mod_l16/mod_l16.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.vcproj freeswitch/branches/bojin/src/mod/codecs/mod_speex/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/codecs/mod_speex/ freeswitch/branches/bojin/src/mod/codecs/mod_speex/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_speex/Makefile freeswitch/branches/bojin/src/mod/codecs/mod_speex/mod_speex.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.c freeswitch/branches/bojin/src/mod/codecs/mod_speex/mod_speex.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/codecs/mod_speex/mod_speex.vcproj freeswitch/branches/bojin/src/mod/dialplans/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/dialplans/ freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_directory/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.vcproj freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_xml/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_xml/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/bojin/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.vcproj freeswitch/branches/bojin/src/mod/directories/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/directories/ freeswitch/branches/bojin/src/mod/directories/mod_ldap/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/directories/mod_ldap/ freeswitch/branches/bojin/src/mod/directories/mod_ldap/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/directories/mod_ldap/Makefile freeswitch/branches/bojin/src/mod/directories/mod_ldap/mod_ldap.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c freeswitch/branches/bojin/src/mod/directories/mod_ldap/mod_ldap.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.vcproj freeswitch/branches/bojin/src/mod/endpoints/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/ freeswitch/branches/bojin/src/mod/endpoints/mod_dingaling/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/ freeswitch/branches/bojin/src/mod/endpoints/mod_dingaling/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile freeswitch/branches/bojin/src/mod/endpoints/mod_dingaling/mod_dingaling.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/bojin/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.vcproj freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/ freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/Makefile freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/mod_exosip.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/mod_exosip.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/mod_exosip.vcproj freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/osip_rfc3264.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264.c freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/osip_rfc3264.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264.h freeswitch/branches/bojin/src/mod/endpoints/mod_exosip/osip_rfc3264i.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_exosip/osip_rfc3264i.h freeswitch/branches/bojin/src/mod/endpoints/mod_iax/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_iax/ freeswitch/branches/bojin/src/mod/endpoints/mod_iax/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile freeswitch/branches/bojin/src/mod/endpoints/mod_iax/mod_iax.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/branches/bojin/src/mod/endpoints/mod_iax/mod_iax.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.vcproj freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_PortAudio.vcproj freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/mod_portaudio.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/pablio.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/pablio.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.h freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/ringbuffer.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ringbuffer.c freeswitch/branches/bojin/src/mod/endpoints/mod_portaudio/ringbuffer.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_portaudio/ringbuffer.h freeswitch/branches/bojin/src/mod/endpoints/mod_wanpipe/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ freeswitch/branches/bojin/src/mod/endpoints/mod_wanpipe/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile freeswitch/branches/bojin/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/branches/bojin/src/mod/endpoints/mod_woomera/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/endpoints/mod_woomera/ freeswitch/branches/bojin/src/mod/endpoints/mod_woomera/mod_woomera.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c freeswitch/branches/bojin/src/mod/endpoints/mod_woomera/mod_woomera.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.vcproj freeswitch/branches/bojin/src/mod/event_handlers/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/ freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/ - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/ freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/README - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/README freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/basecdr.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/basecdr.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/baseregistry.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/baseregistry.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/baseregistry.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/cdrcontainer.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/cdrcontainer.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/csvcdr.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/csvcdr.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/csvcdr.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/mod_cdr.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mod_cdr.vcproj freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/mysqlcdr.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/pddcdr.cpp - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.cpp freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/pddcdr.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/pddcdr.h freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/schema-update.mysql - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema-update.mysql freeswitch/branches/bojin/src/mod/event_handlers/mod_cdr/schema.sql - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_cdr/schema.sql freeswitch/branches/bojin/src/mod/event_handlers/mod_event_multicast/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ freeswitch/branches/bojin/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/branches/bojin/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.vcproj freeswitch/branches/bojin/src/mod/event_handlers/mod_event_socket/ - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/ freeswitch/branches/bojin/src/mod/event_handlers/mod_event_socket/mod_event_socket.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/bojin/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.vcproj freeswitch/branches/bojin/src/mod/event_handlers/mod_event_test/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/ freeswitch/branches/bojin/src/mod/event_handlers/mod_event_test/mod_event_test.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.c freeswitch/branches/bojin/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_event_test/mod_event_test.vcproj freeswitch/branches/bojin/src/mod/event_handlers/mod_xmpp_event/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ freeswitch/branches/bojin/src/mod/event_handlers/mod_xmpp_event/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile freeswitch/branches/bojin/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/branches/bojin/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/branches/bojin/src/mod/event_handlers/mod_zeroconf/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ freeswitch/branches/bojin/src/mod/event_handlers/mod_zeroconf/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile freeswitch/branches/bojin/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/branches/bojin/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.vcproj freeswitch/branches/bojin/src/mod/formats/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/formats/ freeswitch/branches/bojin/src/mod/formats/mod_sndfile/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/formats/mod_sndfile/ freeswitch/branches/bojin/src/mod/formats/mod_sndfile/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile freeswitch/branches/bojin/src/mod/formats/mod_sndfile/mod_sndfile.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/bojin/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfilel.vcproj freeswitch/branches/bojin/src/mod/languages/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/languages/ freeswitch/branches/bojin/src/mod/languages/mod_perl/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/ freeswitch/branches/bojin/src/mod/languages/mod_perl/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/Makefile freeswitch/branches/bojin/src/mod/languages/mod_perl/compiler.opts - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/compiler.opts freeswitch/branches/bojin/src/mod/languages/mod_perl/compiler.opts.in - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/compiler.opts.in freeswitch/branches/bojin/src/mod/languages/mod_perl/freeswitch.pm - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/branches/bojin/src/mod/languages/mod_perl/fs_perl.pm - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.pm freeswitch/branches/bojin/src/mod/languages/mod_perl/fs_perl.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/fs_perl.vcproj freeswitch/branches/bojin/src/mod/languages/mod_perl/mod_perl.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c freeswitch/branches/bojin/src/mod/languages/mod_perl/mod_perl.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.vcproj freeswitch/branches/bojin/src/mod/languages/mod_perl/perlibs.h - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/perlibs.h freeswitch/branches/bojin/src/mod/languages/mod_perl/perlibs.h.in - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/perlibs.h.in freeswitch/branches/bojin/src/mod/languages/mod_perl/perlxsi.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/perlxsi.c freeswitch/branches/bojin/src/mod/languages/mod_perl/switch_swig.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig.c freeswitch/branches/bojin/src/mod/languages/mod_perl/switch_swig.i - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig.i freeswitch/branches/bojin/src/mod/languages/mod_perl/switch_swig_wrap.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c freeswitch/branches/bojin/src/mod/languages/mod_spidermonkey/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/ freeswitch/branches/bojin/src/mod/languages/mod_spidermonkey/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile freeswitch/branches/bojin/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/bojin/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.vcproj freeswitch/branches/bojin/src/mod/loggers/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/loggers/ freeswitch/branches/bojin/src/mod/loggers/mod_console/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/loggers/mod_console/ freeswitch/branches/bojin/src/mod/loggers/mod_console/mod_console.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/branches/bojin/src/mod/loggers/mod_console/mod_console.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/loggers/mod_console/mod_console.vcproj freeswitch/branches/bojin/src/mod/loggers/mod_syslog/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/loggers/mod_syslog/ freeswitch/branches/bojin/src/mod/loggers/mod_syslog/mod_syslog.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/loggers/mod_syslog/mod_syslog.c freeswitch/branches/bojin/src/mod/timers/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/timers/ freeswitch/branches/bojin/src/mod/timers/mod_softtimer/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/timers/mod_softtimer/ freeswitch/branches/bojin/src/mod/timers/mod_softtimer/mod_softtimer.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.c freeswitch/branches/bojin/src/mod/timers/mod_softtimer/mod_softtimer.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/timers/mod_softtimer/mod_softtimer.vcproj freeswitch/branches/bojin/src/mod/xml_int/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/xml_int/ freeswitch/branches/bojin/src/mod/xml_int/mod_xml_rpc/ (props changed) - copied from r2223, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ freeswitch/branches/bojin/src/mod/xml_int/mod_xml_rpc/Makefile - copied unchanged from r2223, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile freeswitch/branches/bojin/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c - copied unchanged from r2223, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/bojin/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj - copied unchanged from r2223, /freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj freeswitch/branches/bojin/src/switch.c - copied unchanged from r2223, /freeswitch/trunk/src/switch.c freeswitch/branches/bojin/src/switch_buffer.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_buffer.c freeswitch/branches/bojin/src/switch_caller.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_caller.c freeswitch/branches/bojin/src/switch_channel.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_channel.c freeswitch/branches/bojin/src/switch_config.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_config.c freeswitch/branches/bojin/src/switch_console.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_console.c freeswitch/branches/bojin/src/switch_core.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_core.c freeswitch/branches/bojin/src/switch_event.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_event.c freeswitch/branches/bojin/src/switch_ivr.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_ivr.c freeswitch/branches/bojin/src/switch_loadable_module.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_loadable_module.c freeswitch/branches/bojin/src/switch_log.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_log.c freeswitch/branches/bojin/src/switch_resample.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_resample.c freeswitch/branches/bojin/src/switch_rtp.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_rtp.c freeswitch/branches/bojin/src/switch_stun.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_stun.c freeswitch/branches/bojin/src/switch_utils.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_utils.c freeswitch/branches/bojin/src/switch_xml.c - copied unchanged from r2223, /freeswitch/trunk/src/switch_xml.c freeswitch/branches/bojin/w32/ - copied from r2223, /freeswitch/trunk/w32/ freeswitch/branches/bojin/w32/Setup/ (props changed) - copied from r2223, /freeswitch/trunk/w32/Setup/ freeswitch/branches/bojin/w32/Setup/Setup.vdproj - copied unchanged from r2223, /freeswitch/trunk/w32/Setup/Setup.vdproj freeswitch/branches/bojin/w32/vsnet/ (props changed) - copied from r2223, /freeswitch/trunk/w32/vsnet/ freeswitch/branches/bojin/w32/vsnet/FreeSwitchConsole.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj freeswitch/branches/bojin/w32/vsnet/FreeSwitchConsole.vcproj.user - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/FreeSwitchConsole.vcproj.user freeswitch/branches/bojin/w32/vsnet/FreeSwitchCore.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/FreeSwitchCore.vcproj freeswitch/branches/bojin/w32/vsnet/FreeSwitchVersion.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/FreeSwitchVersion.vcproj freeswitch/branches/bojin/w32/vsnet/Freeswitch.sln - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Freeswitch.sln freeswitch/branches/bojin/w32/vsnet/GetLibs.vbs - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/GetLibs.vbs freeswitch/branches/bojin/w32/vsnet/Tools/ (props changed) - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/ freeswitch/branches/bojin/w32/vsnet/Tools/apr/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/ freeswitch/branches/bojin/w32/vsnet/Tools/apr/apr.hw - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/apr.hw freeswitch/branches/bojin/w32/vsnet/Tools/apr/apr.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/apr.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/apriconv.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/apriconv.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/aprutil.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/aprutil.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/gen_uri_delims.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/gen_uri_delims.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/libapr.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/libapr.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/libapriconv.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/libapriconv.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/libaprutil.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/libaprutil.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/apr/xml.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/apr/xml.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/curl/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/curl/ freeswitch/branches/bojin/w32/vsnet/Tools/curl/curllib.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/curl/curllib.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/gnutls/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/gnutls/ freeswitch/branches/bojin/w32/vsnet/Tools/gnutls/gnutls.zip - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/gnutls/gnutls.zip freeswitch/branches/bojin/w32/vsnet/Tools/gnutls/libcrypt.zip - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/gnutls/libcrypt.zip freeswitch/branches/bojin/w32/vsnet/Tools/gnutls/libgpg-error.zip - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/gnutls/libgpg-error.zip freeswitch/branches/bojin/w32/vsnet/Tools/howl/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/howl/ freeswitch/branches/bojin/w32/vsnet/Tools/howl/libhowl.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/howl/libhowl.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/howl/libmDNSResponder.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/howl/libmDNSResponder.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/iksemel/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/iksemel/ freeswitch/branches/bojin/w32/vsnet/Tools/iksemel/config.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/iksemel/config.h freeswitch/branches/bojin/w32/vsnet/Tools/iksemel/iksemel.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/iksemel/iksemel.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/libetpan.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libetpan.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/libsndfile/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/ freeswitch/branches/bojin/w32/vsnet/Tools/libsndfile.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libsndfile.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/libsndfile/config.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/config.h freeswitch/branches/bojin/w32/vsnet/Tools/libsndfile/libsndfile.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/libsndfile.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/libsndfile/sndfile.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/sndfile.h freeswitch/branches/bojin/w32/vsnet/Tools/libspeex.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/libspeex.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/openldap/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/ freeswitch/branches/bojin/w32/vsnet/Tools/openldap/lber_types.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/lber_types.h freeswitch/branches/bojin/w32/vsnet/Tools/openldap/ldap_config.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/ldap_config.h freeswitch/branches/bojin/w32/vsnet/Tools/openldap/ldap_features.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/ldap_features.h freeswitch/branches/bojin/w32/vsnet/Tools/openldap/liblber.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/liblber.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/openldap/libldap.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/libldap.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/openldap/libldap_r.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/libldap_r.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/openldap/portable.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/openldap/portable.h freeswitch/branches/bojin/w32/vsnet/Tools/pcre/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/pcre/ freeswitch/branches/bojin/w32/vsnet/Tools/pcre/config.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/pcre/config.h freeswitch/branches/bojin/w32/vsnet/Tools/pcre/libpcre.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/pcre/libpcre.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/pcre/pcre.h - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/pcre/pcre.h freeswitch/branches/bojin/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/pcre/pcre_chartables.c.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/sqlite.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/sqlite.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/xmlrpc/ - copied from r2223, /freeswitch/trunk/w32/vsnet/Tools/xmlrpc/ freeswitch/branches/bojin/w32/vsnet/Tools/xmlrpc/Abyss.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/xmlrpc/Abyss.vcproj freeswitch/branches/bojin/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj - copied unchanged from r2223, /freeswitch/trunk/w32/vsnet/Tools/xmlrpc/xmlrpc.vcproj Modified: freeswitch/branches/bojin/ (props changed) Log:

1 0

[commit] r2223 - freeswitch/branches/bojin
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 08:29:16 2006 New Revision: 2223 Added: freeswitch/branches/bojin/ Log: Creating empty folder for bojin

1 0

[commit] r2222 - freeswitch/branches/bharat25
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Thu Aug 3 06:10:15 2006 New Revision: 2222 Added: freeswitch/branches/bharat25/ Log: Creating empty folder for bharat25

1 0

[commit] r2221 - freeswitch/branches/chjish
by Freeswitch SVN 03 Aug '06

03 Aug '06

Author: sphere Date: Wed Aug 2 22:17:13 2006 New Revision: 2221 Added: freeswitch/branches/chjish/ Log: Creating empty folder for chjish

1 0

[commit] r2220 - freeswitch/branches/ptinsley/ivr_functions
by Freeswitch SVN 02 Aug '06

02 Aug '06

Author: ptinsley Date: Wed Aug 2 10:32:59 2006 New Revision: 2220 Added: freeswitch/branches/ptinsley/ivr_functions/ - copied from r2219, /freeswitch/trunk/ Log: Copy of trunk to test functions moving into the core.

1 0

[commit] r2219 - freeswitch/branches/jambertdg
by Freeswitch SVN 02 Aug '06

02 Aug '06

Author: sphere Date: Tue Aug 1 23:50:10 2006 New Revision: 2219 Added: freeswitch/branches/jambertdg/ Log: Creating empty folder for jambertdg

1 0

[commit] r2218 - in freeswitch/branches/stkn: . conf libs mac/xcode mac/xcode/FreeSWITCH.xcodeproj mac/xcode/libs scripts/socket scripts/socket/FreeSWITCH src src/include src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/codecs/mod_g711 src/mod/codecs/mod_l16 src/mod/dialplans/mod_dialplan_xml src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_exosip src/mod/endpoints/mod_portaudio src/mod/event_handlers/mod_cdr src/mod/ev
by Freeswitch SVN 01 Aug '06

01 Aug '06

Author: stkn Date: Tue Aug 1 13:17:53 2006 New Revision: 2218 Added: freeswitch/branches/stkn/mac/xcode/FreeSWITCH.xcodeproj/ - copied from r2217, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/ freeswitch/branches/stkn/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj freeswitch/branches/stkn/mac/xcode/apr.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/apr.plist freeswitch/branches/stkn/mac/xcode/aprutil.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/aprutil.plist freeswitch/branches/stkn/mac/xcode/dingaling.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/dingaling.plist freeswitch/branches/stkn/mac/xcode/exosip2.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/exosip2.plist freeswitch/branches/stkn/mac/xcode/gsm.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/gsm.plist freeswitch/branches/stkn/mac/xcode/iax.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/iax.plist freeswitch/branches/stkn/mac/xcode/iksemel.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/iksemel.plist freeswitch/branches/stkn/mac/xcode/ilbc.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/ilbc.plist freeswitch/branches/stkn/mac/xcode/libfreeswitch.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/libfreeswitch.plist freeswitch/branches/stkn/mac/xcode/osip2.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/osip2.plist freeswitch/branches/stkn/mac/xcode/osipparser2.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/osipparser2.plist freeswitch/branches/stkn/mac/xcode/pcre.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/pcre.plist freeswitch/branches/stkn/mac/xcode/portaudio.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/portaudio.plist freeswitch/branches/stkn/mac/xcode/resample.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/resample.plist freeswitch/branches/stkn/mac/xcode/sndfile.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/sndfile.plist freeswitch/branches/stkn/mac/xcode/speakup.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/speakup.plist freeswitch/branches/stkn/mac/xcode/speex.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/speex.plist freeswitch/branches/stkn/mac/xcode/sqlite.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/sqlite.plist freeswitch/branches/stkn/mac/xcode/srtp.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/srtp.plist freeswitch/branches/stkn/mac/xcode/teletone.plist - copied unchanged from r2217, /freeswitch/trunk/mac/xcode/teletone.plist freeswitch/branches/stkn/w32/vsnet/Tools/libsndfile/ - copied from r2217, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/ freeswitch/branches/stkn/w32/vsnet/Tools/libsndfile/config.h - copied unchanged from r2217, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/config.h freeswitch/branches/stkn/w32/vsnet/Tools/libsndfile/libsndfile.vcproj - copied unchanged from r2217, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/libsndfile.vcproj freeswitch/branches/stkn/w32/vsnet/Tools/libsndfile/sndfile.h - copied unchanged from r2217, /freeswitch/trunk/w32/vsnet/Tools/libsndfile/sndfile.h Removed: freeswitch/branches/stkn/libs/MD5 freeswitch/branches/stkn/mac/xcode/libs/ Modified: freeswitch/branches/stkn/Makefile.am freeswitch/branches/stkn/Makefile.in freeswitch/branches/stkn/conf/freeswitch.xml freeswitch/branches/stkn/scripts/socket/FreeSWITCH/Client.pm freeswitch/branches/stkn/scripts/socket/fs.pl freeswitch/branches/stkn/src/include/switch.h freeswitch/branches/stkn/src/include/switch_apr.h freeswitch/branches/stkn/src/include/switch_core.h freeswitch/branches/stkn/src/include/switch_loadable_module.h freeswitch/branches/stkn/src/include/switch_module_interfaces.h freeswitch/branches/stkn/src/include/switch_types.h freeswitch/branches/stkn/src/include/switch_utils.h freeswitch/branches/stkn/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/stkn/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/stkn/src/mod/codecs/mod_g711/mod_g711.c freeswitch/branches/stkn/src/mod/codecs/mod_l16/mod_l16.c freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/Makefile freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/stkn/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/Makefile freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/branches/stkn/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/README freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/stkn/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/branches/stkn/src/mod/formats/mod_sndfile/Makefile freeswitch/branches/stkn/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/stkn/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/stkn/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/stkn/src/switch_console.c freeswitch/branches/stkn/src/switch_core.c freeswitch/branches/stkn/src/switch_event.c freeswitch/branches/stkn/src/switch_ivr.c freeswitch/branches/stkn/src/switch_loadable_module.c freeswitch/branches/stkn/src/switch_utils.c freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln freeswitch/branches/stkn/w32/vsnet/GetLibs.vbs freeswitch/branches/stkn/w32/vsnet/Tools/ (props changed) Log: Merge changes from trunk Modified: freeswitch/branches/stkn/Makefile.am ============================================================================== --- freeswitch/branches/stkn/Makefile.am (original) +++ freeswitch/branches/stkn/Makefile.am Tue Aug 1 13:17:53 2006 @@ -140,7 +140,7 @@ lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_PROGRAMS = freeswitch @@ -174,13 +174,14 @@ @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) + ./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + ./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX) + ./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX) rm build/freeswitch.env Modified: freeswitch/branches/stkn/Makefile.in ============================================================================== --- freeswitch/branches/stkn/Makefile.in (original) +++ freeswitch/branches/stkn/Makefile.in Tue Aug 1 13:17:53 2006 @@ -356,7 +356,7 @@ lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_SCRIPTS = scripts/fsxs freeswitch_SOURCES = src/switch.c\ @@ -1104,13 +1104,14 @@ @./build/addenv.sh build/freeswitch.env PREFIX $(PREFIX) @./build/addenv.sh build/freeswitch.env MAKE $(MAKE) mkdir -p $(PREFIX) - ./build/buildlib.sh . install sqlite-3.3.5.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe - ./build/buildlib.sh . install apr-1.2.6.tar.gz --prefix=$(PREFIX) - ./build/buildlib.sh . install apr-util-1.2.6.tar.gz --with-apr=../apr-1.2.6 --prefix=$(PREFIX) + ./build/buildlib.sh . install sqlite-3.3.6.tar.gz --prefix=$(PREFIX) --disable-tcl --enable-threadsafe + ./build/buildlib.sh . install apr-1.2.7.tar.gz --prefix=$(PREFIX) + ./build/buildlib.sh . install apr-util-1.2.7.tar.gz --with-apr=../apr-1.2.7 --prefix=$(PREFIX) ./build/buildlib.sh . libresample-0.1.3.tgz --prefix=$(PREFIX) ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX) rm build/freeswitch.env modules: $(NAME) Modified: freeswitch/branches/stkn/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/stkn/conf/freeswitch.xml (original) +++ freeswitch/branches/stkn/conf/freeswitch.xml Tue Aug 1 13:17:53 2006 @@ -368,7 +368,7 @@  <context name="default"> <extension name="tollfree"> - <condition field="destination_number" expression="^(18[0{2}8{2}7{2}6{2}]\d{7})"> + <condition field="destination_number" expression="^(18(0{2}|8{2}|7{2}|6{2})\d{7})$"> <action application="bridge" data="exosip/$1-freeswitch(a)voip.trxtel.com"/> </condition> </extension> Modified: freeswitch/branches/stkn/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/branches/stkn/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/branches/stkn/scripts/socket/FreeSWITCH/Client.pm Tue Aug 1 13:17:53 2006 @@ -89,7 +89,7 @@ my ($self,$data) = @_; my $s = $self->{_sock}; - print $s $data; + print $s $data ; } sub cmd($$$) { @@ -97,12 +97,26 @@ my $cmd = shift; my $to = shift; - $self->output($cmd); + $self->output($cmd->{command}); + foreach(keys %{$cmd}) { + next if ($_ eq "command"); + $self->output($cmd->{$_}); + } + $self->output("\n\n"); + my $h = $self->readhash($to); $h; } +sub disconnect($) { + my $self = shift; + $self->{_sock}->shutdown(2); + $self->{_sock}->close(); + undef $self->{_sock}; + delete $self->{_sock}; +} + sub connect($) { my $self = shift; @@ -120,8 +134,7 @@ if ($h->{"content-type"} eq "auth/request") { my $pass = $self->{"_password"}; - $self->output("auth $pass"); - $h = $self->readhash(undef); + $h = $self->cmd({command => "auth $pass"}); } if ($h->{'reply-text'} =~ "OK") { Modified: freeswitch/branches/stkn/scripts/socket/fs.pl ============================================================================== --- freeswitch/branches/stkn/scripts/socket/fs.pl (original) +++ freeswitch/branches/stkn/scripts/socket/fs.pl Tue Aug 1 13:17:53 2006 @@ -11,21 +11,29 @@ my $log = shift; +$SIG{CHLD} = sub {$fs->disconnect(); die "done"}; + if ($log) { $pid = fork; if (!$pid) { my $fs2 = init FreeSWITCH::Client {-password => $password} or die "Error $@"; - $fs2->cmd("log $log"); + + + $fs2->cmd({ command => "log $log" }); while (1) { my $reply = $fs2->readhash(undef); - + if ($reply->{socketerror}) { + die "socket error"; + } if ($reply->{body}) { print $reply->{body} . "\n"; } elsif ($reply->{'reply-text'}) { print $reply->{'reply-text'} . "\n"; } } + exit; } + } @@ -34,8 +42,11 @@ my $reply; if ($_) { - my $reply = $fs->cmd("api $_"); - + my $reply = $fs->cmd({command => "api $_"}); + if ($reply->{socketerror}) { + $fs2->disconnect(); + die "socket error"; + } if ($reply->{body}) { print $reply->{body}; } elsif ($reply->{'reply-text'}) { Modified: freeswitch/branches/stkn/src/include/switch.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch.h (original) +++ freeswitch/branches/stkn/src/include/switch.h Tue Aug 1 13:17:53 2006 @@ -73,6 +73,7 @@ #include <switch_stun.h> #include <switch_log.h> #include <switch_xml.h> +#include <pcre.h> /** \mainpage FreeSWITCH Modified: freeswitch/branches/stkn/src/include/switch_apr.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_apr.h (original) +++ freeswitch/branches/stkn/src/include/switch_apr.h Tue Aug 1 13:17:53 2006 @@ -656,7 +656,7 @@ apr_int32_t flags, char *buf, apr_size_t *len);) -//#define switch_socket_recvfrom apr_socket_recvfrom +#define switch_socket_recvfrom apr_socket_recvfrom /** * Send a file from an open file descriptor to a socket, along with Modified: freeswitch/branches/stkn/src/include/switch_core.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_core.h (original) +++ freeswitch/branches/stkn/src/include/switch_core.h Tue Aug 1 13:17:53 2006 @@ -206,7 +206,7 @@ \return a void pointer to the allocated memory \note this memory never goes out of scope until the core is destroyed */ -SWITCH_DECLARE(void *) switch_core_permenant_alloc(switch_size_t memory); +SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory); /*! \brief Allocate memory directly from a memory pool @@ -226,11 +226,11 @@ SWITCH_DECLARE(void *) switch_core_session_alloc(switch_core_session_t *session, switch_size_t memory); /*! - \brief Copy a string using permenant memory allocation + \brief Copy a string using permanent memory allocation \param todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_permenant_strdup(char *todup); +SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup); /*! \brief Copy a string using memory allocation from a session's pool @@ -865,6 +865,25 @@ \return SWITCH_STATUS_SUCCESS with cur_pos adjusted to new position */ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, unsigned int *cur_pos, int64_t samples, int whence); + +/*! + \brief Set metadata to the desired string + \param fh the file handle to set data to + \param col the enum of the col name + \param string the string to add + \return SWITCH_STATUS_SUCCESS with cur_pos adjusted to new position +*/ +SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t *fh, switch_audio_col_t col, const char *string); + +/*! + \brief get metadata of the desired string + \param fh the file handle to get data from + \param col the enum of the col name + \param string pointer to the string to fetch + \return SWITCH_STATUS_SUCCESS with cur_pos adjusted to new position +*/ +SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t *fh, switch_audio_col_t col, const char **string); + /*! \brief Close an open file handle Modified: freeswitch/branches/stkn/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_loadable_module.h (original) +++ freeswitch/branches/stkn/src/include/switch_loadable_module.h Tue Aug 1 13:17:53 2006 @@ -191,10 +191,11 @@ \brief Execute a registered API command \param cmd the name of the API command to execute \param arg the optional arguement to the command + \param session an optional session \param stream stream for output \return the status returned by the API call */ -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_stream_handle_t *stream); +SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); Modified: freeswitch/branches/stkn/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_module_interfaces.h (original) +++ freeswitch/branches/stkn/src/include/switch_module_interfaces.h Tue Aug 1 13:17:53 2006 @@ -266,6 +266,10 @@ switch_status_t (*file_write)(switch_file_handle_t *, void *data, switch_size_t *len); /*! function to seek to a certian position in the file */ switch_status_t (*file_seek)(switch_file_handle_t *, unsigned int *cur_pos, int64_t samples, int whence); + /*! function to set meta data */ + switch_status_t (*file_set_string)(switch_file_handle_t *fh, switch_audio_col_t col, const char *string); + /*! function to get meta data */ + switch_status_t (*file_get_string)(switch_file_handle_t *fh, switch_audio_col_t col, const char **string); /*! list of supported file extensions */ char **extens; const struct switch_file_interface *next; Modified: freeswitch/branches/stkn/src/include/switch_types.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_types.h (original) +++ freeswitch/branches/stkn/src/include/switch_types.h Tue Aug 1 13:17:53 2006 @@ -94,7 +94,17 @@ #define SWITCH_FALSE 0 #define SWITCH_CORE_QUEUE_LEN 100000 + typedef enum { + SWITCH_AUDIO_COL_STR_TITLE = 0x01, + SWITCH_AUDIO_COL_STR_COPYRIGHT = 0x02, + SWITCH_AUDIO_COL_STR_SOFTWARE = 0x03, + SWITCH_AUDIO_COL_STR_ARTIST = 0x04, + SWITCH_AUDIO_COL_STR_COMMENT = 0x05, + SWITCH_AUDIO_COL_STR_DATE = 0x06 +} switch_audio_col_t; + +typedef enum { SWITCH_XML_SECTION_RESULT = 0, SWITCH_XML_SECTION_CONFIG = (1 << 0), SWITCH_XML_SECTION_DIRECTORY = (1 << 1), @@ -543,6 +553,7 @@ SWITCH_EVENT_SESSION_CRASH - Session Crashed SWITCH_EVENT_MODULE_LOAD - Module was loaded SWITCH_EVENT_DTMF - DTMF was sent + SWITCH_EVENT_MESSAGE - A Basic Message SWITCH_EVENT_ALL - All events at once </pre> @@ -570,6 +581,7 @@ SWITCH_EVENT_SESSION_CRASH, SWITCH_EVENT_MODULE_LOAD, SWITCH_EVENT_DTMF, + SWITCH_EVENT_MESSAGE, SWITCH_EVENT_ALL } switch_event_types_t; @@ -695,7 +707,7 @@ typedef switch_status_t (*switch_send_dtmf_hook_t)(switch_core_session_t *, char *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t)(switch_stream_handle_t *handle, char *fmt, ...); -typedef switch_status_t (*switch_api_function_t)(char *in, switch_stream_handle_t *stream); +typedef switch_status_t (*switch_api_function_t)(char *in, switch_core_session_t *session, switch_stream_handle_t *stream); typedef switch_status_t (*switch_input_callback_function_t)(switch_core_session_t *session, void *input, switch_input_type_t input_type, Modified: freeswitch/branches/stkn/src/include/switch_utils.h ============================================================================== --- freeswitch/branches/stkn/src/include/switch_utils.h (original) +++ freeswitch/branches/stkn/src/include/switch_utils.h Tue Aug 1 13:17:53 2006 @@ -61,9 +61,6 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE - -SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, switch_size_t *len); - /*! \brief Return a printable name of a switch_priority_t \param priority the priority to get the name of Modified: freeswitch/branches/stkn/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/stkn/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/stkn/src/mod/applications/mod_commands/mod_commands.c Tue Aug 1 13:17:53 2006 @@ -35,10 +35,15 @@ static const char modname[] = "mod_commands"; -static switch_status_t status_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { uint8_t html = 0; switch_core_time_duration_t duration; + + if (session) { + return SWITCH_STATUS_FALSE; + } + switch_core_measure_time(switch_core_uptime(), &duration); if (cmd && strstr(cmd, "html")) { @@ -75,19 +80,27 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t load_function(char *mod, switch_stream_handle_t *stream) +static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { + + if (session) { + return SWITCH_STATUS_FALSE; + } switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(char *mod, switch_stream_handle_t *stream) +static switch_status_t reload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; switch_xml_t xml_root; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((xml_root = switch_xml_open_root(1, &err))) { switch_xml_free(xml_root); } @@ -96,10 +109,14 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(char *dest, switch_stream_handle_t *stream) +static switch_status_t kill_function(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if ((session = switch_core_session_locate(dest))) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_core_session_kill_channel(session, SWITCH_SIG_KILL); @@ -114,11 +131,15 @@ } -static switch_status_t transfer_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; char *argv[4] = {0}; int argc = 0; + + if (isession) { + return SWITCH_STATUS_FALSE; + } argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -151,11 +172,15 @@ -static switch_status_t pause_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; char *argv[4] = {0}; int argc = 0; + + if (isession) { + return SWITCH_STATUS_FALSE; + } argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -230,12 +255,16 @@ return 0; } -static switch_status_t show_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t show_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; switch_core_db_t *db = switch_core_db_handle(); struct holder holder = {0}; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (stream->event) { holder.http = switch_event_get_header(stream->event, "http-host"); Modified: freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/stkn/src/mod/applications/mod_conference/mod_conference.c Tue Aug 1 13:17:53 2006 @@ -188,7 +188,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin); static switch_status_t conference_say(conference_obj_t *conference, char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); -static switch_status_t conf_function(char *buf, switch_stream_handle_t *stream); +static switch_status_t conf_function(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t *conference, switch_core_session_t *session, char *bridgeto, char *cid_name, char *cid_num); static void conference_function(switch_core_session_t *session, char *data); @@ -1232,6 +1232,7 @@ static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim) { conference_member_t *member = NULL; + switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { @@ -1264,7 +1265,7 @@ } /* API Interface Function */ -static switch_status_t conf_function(char *buf, switch_stream_handle_t *stream) +static switch_status_t conf_function(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -1292,6 +1293,10 @@ "conference <confname> dial <endpoint_module_name>/<destination>\n" "conference <confname> transfer <member_id> <conference_name>\n" ; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (stream->event) { http = switch_event_get_header(stream->event, "http-host"); Modified: freeswitch/branches/stkn/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/stkn/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/stkn/src/mod/applications/mod_dptools/mod_dptools.c Tue Aug 1 13:17:53 2006 @@ -71,16 +71,66 @@ } } +static void strftime_function(switch_core_session_t *session, char *data) +{ + char *argv[2]; + int argc; + char *lbuf; + + if ((lbuf = switch_core_session_strdup(session, data))&&(argc = switch_separate_string(lbuf, '=', argv, (sizeof(argv) / sizeof(argv[0])))) > 1) { + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + switch_channel_t *channel; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), argv[1], &tm); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); + switch_channel_set_variable(channel, argv[0], date); + } +} + +static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), fmt, &tm); + stream->write_function(stream, date); + + return SWITCH_STATUS_SUCCESS; +} + +static switch_api_interface_t dptools_api_interface = { + /*.interface_name */ "strftime", + /*.desc */ "strftime", + /*.function */ strftime_api_function, + /*.next */ NULL +}; + static const switch_application_interface_t set_application_interface = { /*.interface_name */ "set", /*.application_function */ set_function }; +static const switch_application_interface_t strftime_application_interface = { + /*.interface_name */ "strftime", + /*.application_function */ strftime_function, + NULL,NULL,NULL, + &set_application_interface + +}; + static const switch_application_interface_t sleep_application_interface = { /*.interface_name */ "sleep", /*.application_function */ sleep_function, NULL,NULL,NULL, - &set_application_interface + &strftime_application_interface }; static const switch_loadable_module_interface_t mod_dptools_module_interface = { @@ -89,7 +139,8 @@ /*.timer_interface = */ NULL, /*.dialplan_interface = */ NULL, /*.codec_interface = */ NULL, - /*.application_interface */ &sleep_application_interface + /*.application_interface */ &sleep_application_interface, + /*.api_interface */ &dptools_api_interface }; SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) Modified: freeswitch/branches/stkn/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/branches/stkn/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/branches/stkn/src/mod/codecs/mod_g711/mod_g711.c Tue Aug 1 13:17:53 2006 @@ -33,7 +33,7 @@ #include "g711.h" -static const char modname[] = "mod_g711codec"; +static const char modname[] = "mod_g711"; static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, Modified: freeswitch/branches/stkn/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/branches/stkn/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/branches/stkn/src/mod/codecs/mod_l16/mod_l16.c Tue Aug 1 13:17:53 2006 @@ -31,7 +31,7 @@ */ #include <switch.h> -static const char modname[] = "mod_rawaudio"; +static const char modname[] = "mod_l16"; static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, Modified: freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/Makefile ============================================================================== --- freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/Makefile (original) +++ freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/Makefile Tue Aug 1 13:17:53 2006 @@ -1,9 +1,8 @@ -LDFLAGS += -lpcre -L/usr/local/lib +LDFLAGS += -L/usr/local/lib all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install pcre-6.4.tar.gz --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/branches/stkn/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Tue Aug 1 13:17:53 2006 @@ -33,8 +33,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <pcre.h> + static const char modname[] = "mod_dialplan_xml"; #define cleanre(re) if (re) {\ @@ -122,6 +122,13 @@ substituted[y++] = '\0'; } +typedef enum { + BREAK_ON_TRUE, + BREAK_ON_FALSE, + BREAK_ALWAYS, + BREAK_NEVER +} break_t; + static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, switch_caller_extension_t **extension) { switch_xml_t xcond, xaction; @@ -135,17 +142,50 @@ for (xcond = switch_xml_child(xexten, "condition"); xcond; xcond = xcond->next) { char *field = NULL; + char *do_break_a = NULL; char *expression = NULL; char *field_data = NULL; + char retbuf[1024] = ""; pcre *re = NULL; int ovector[30]; - + break_t do_break_i = BREAK_ON_FALSE; + field = (char *) switch_xml_attr(xcond, "field"); + expression = (char *) switch_xml_attr_soft(xcond, "expression"); - + + if ((do_break_a = (char *) switch_xml_attr(xcond, "break"))) { + if (!strcasecmp(do_break_a, "on-true")) { + do_break_i = BREAK_ON_TRUE; + } else if (!strcasecmp(do_break_a, "on-false")) { + do_break_i = BREAK_ON_FALSE; + } else if (!strcasecmp(do_break_a, "always")) { + do_break_i = BREAK_ALWAYS; + } else if (!strcasecmp(do_break_a, "never")) { + do_break_i = BREAK_NEVER; + } + } + if (field) { if (*field == '$') { field_data = switch_channel_get_variable(channel, field + 1); + } else if (*field == '%') { + switch_stream_handle_t stream = {0}; + char *cmd = switch_core_session_strdup(session, field + 1); + char *arg; + + if (cmd) { + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + } + stream.data = retbuf; + stream.end = stream.data; + stream.data_size = sizeof(retbuf); + stream.write_function = switch_console_stream_write; + if (switch_api_execute(cmd, arg, session, &stream) == SWITCH_STATUS_SUCCESS) { + field_data = retbuf; + } + } } else { field_data = switch_caller_get_field_by_name(caller_profile, field); } @@ -155,7 +195,27 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "test conditions %s(%s) =~ /%s/\n", field, field_data, expression); if (!(proceed = perform_regex(channel, field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex mismatch\n"); - break; + + for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) { + char *application = (char*) switch_xml_attr_soft(xaction, "application"); + char *data = (char *) switch_xml_attr_soft(xaction, "data"); + + if (!*extension) { + if ((*extension = + switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + return 0; + } + } + + switch_caller_extension_add_application(session, *extension, application, data); + } + + if (do_break_i == BREAK_ON_FALSE || do_break_i == BREAK_ALWAYS) { + break; + } else { + continue; + } } assert(re != NULL); } @@ -186,6 +246,10 @@ } cleanre(re); + + if (do_break_i == BREAK_ON_TRUE || do_break_i == BREAK_ALWAYS) { + break; + } } return proceed; } Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Aug 1 13:17:53 2006 @@ -151,8 +151,8 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string); -static switch_status_t dl_login(char *arg, switch_stream_handle_t *stream); -static switch_status_t dl_logout(char *profile_name, switch_stream_handle_t *stream); +static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -1248,10 +1248,14 @@ } } -static switch_status_t dl_logout(char *profile_name, switch_stream_handle_t *stream) +static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { struct mdl_profile *profile; + if (session) { + return SWITCH_STATUS_FALSE; + } + if (!profile_name) { stream->write_function(stream, "NO PROFILE NAME SPECIFIED\n"); return SWITCH_STATUS_SUCCESS; @@ -1267,13 +1271,17 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(char *arg, switch_stream_handle_t *stream) +static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { char *argv[10] = {0}; int argc = 0; char *var, *val, *myarg; struct mdl_profile *profile = NULL; int x; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (switch_strlen_zero(arg)) { stream->write_function(stream, "FAIL\n"); Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/Makefile ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/Makefile (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/Makefile Tue Aug 1 13:17:53 2006 @@ -2,7 +2,7 @@ LDFLAGS += -leXosip2 OBJS=osip_rfc3264.o ifeq ($(OSARCH),Darwin) - LINKER=g++ + LINKER=$(CC) else LINKER=$(CC) endif Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_exosip/mod_exosip.c Tue Aug 1 13:17:53 2006 @@ -2095,7 +2095,7 @@ char *errmsg; switch_mutex_lock(globals.reg_mutex); - snprintf(sql, sizeof(sql), "select url from sip_registrations where expires > 0 and expires < %ld", now); + snprintf(sql, sizeof(sql), "select url from sip_registrations where expires > 0 and expires < %ld", (long) now); switch_core_db_exec(globals.db, sql, del_callback, NULL, &errmsg); if (errmsg) { @@ -2104,7 +2104,7 @@ errmsg = NULL; } - snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires < %ld", now); + snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires < %ld", (long) now); switch_core_db_persistant_execute(globals.db, sql, 1); switch_mutex_unlock(globals.reg_mutex); } Modified: freeswitch/branches/stkn/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/stkn/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/stkn/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Aug 1 13:17:53 2006 @@ -116,11 +116,11 @@ static int dump_info(void); static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); - static switch_status_t place_call(char *dest, switch_stream_handle_t *stream); - static switch_status_t hup_call(char *callid, switch_stream_handle_t *stream); - static switch_status_t call_info(char *callid, switch_stream_handle_t *stream); - static switch_status_t send_dtmf(char *callid, switch_stream_handle_t *stream); - static switch_status_t answer_call(char *callid, switch_stream_handle_t *stream); + static switch_status_t place_call(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t hup_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t call_info(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t send_dtmf(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t answer_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); /* State methods they get called when the state changes to the specific state @@ -822,11 +822,15 @@ return SWITCH_STATUS_FALSE; } -static switch_status_t place_call(char *dest, switch_stream_handle_t *stream) +static switch_status_t place_call(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session; switch_status_t status = SWITCH_STATUS_FALSE; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if (!dest) { stream->write_function(stream, "Usage: pacall <exten>"); return SWITCH_STATUS_FALSE; @@ -875,12 +879,16 @@ } -static switch_status_t hup_call(char *callid, switch_stream_handle_t *stream) +static switch_status_t hup_call(char *callid, switch_core_session_t *isession, switch_stream_handle_t *stream) { struct private_object *tech_pvt; switch_channel_t *channel = NULL; char tmp[50]; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if (callid && !strcasecmp(callid, "last")) { snprintf(tmp, sizeof(tmp), "%d", globals.call_id - 1); callid = tmp; @@ -919,12 +927,16 @@ } -static switch_status_t send_dtmf(char *callid, switch_stream_handle_t *stream) +static switch_status_t send_dtmf(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; char *dtmf; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((dtmf = strchr(callid, ' ')) != 0) { *dtmf++ = '\0'; } else { @@ -943,11 +955,15 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t answer_call(char *callid, switch_stream_handle_t *stream) +static switch_status_t answer_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid)) != 0) { channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); @@ -975,11 +991,16 @@ } -static switch_status_t call_info(char *callid, switch_stream_handle_t *stream) +static switch_status_t call_info(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt; switch_hash_index_t *hi; void *val; + + if (session) { + return SWITCH_STATUS_FALSE; + } + if (!callid || !strcasecmp(callid, "all")) { for (hi = switch_hash_first(module_pool, globals.call_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/Makefile Tue Aug 1 13:17:53 2006 @@ -1,7 +1,7 @@ LDFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto CFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o +OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/README ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/README (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/README Tue Aug 1 13:17:53 2006 @@ -49,7 +49,7 @@ Class: MysqlCDR, located in mysqlcdr.h and mysqlcdr.cpp Description: This class logs the call detail record to a MySQL 4.1.x or greater database using prepared - statements. This class is a little more complex than the prior two in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the callid of the call. + statements. This class is a little more complex than the prior two in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the callid of the call. Recommended to use at least one other logger in conjuction with this one just to be on the safe side, as failover handling of errors to write to the db are not yet implemented, and therefore there is a risk of data loss if the database connection is lost entirely (it will be limited to only those records created at the time of the loss of connection) or some other fatal error is encountered. Configuration: Section: <mysqlcdr> <param name="hostname" value=""/> value is the hostname or IP of the MySQL server (required) <param name="username" value=""/> value is the username to connect to the MySQL server with (required) Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/basecdr.cpp Tue Aug 1 13:17:53 2006 @@ -59,6 +59,7 @@ { if(newchannel != 0) { + errorstate = 0; memset(clid,0,80); memset(dialplan,0,80); memset(myuuid,0,37); @@ -84,9 +85,10 @@ if(newchannel->callerprofile->caller_id_name != 0) { strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); - strncat(clid," ",1); + strncat(clid," <",2); if(newchannel->callerprofile->caller_id_number != 0 ) strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); + strncat(clid,">",1); } // Get the ANI information if it's set @@ -100,9 +102,7 @@ if(newchannel->callerprofile->network_addr != 0) strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); - - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Channel caller_profile loaded.\n"); - + originated = newchannel->originate; if(newchannel->originateprofile->uuid != 0) @@ -146,8 +146,6 @@ hangupcause = switch_channel_get_cause(newchannel->channel); hangupcause_text = switch_channel_cause2str(hangupcause); - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Call state & length calculated.\n"); - if(newchannel->callerextension != 0) if(newchannel->callerextension->last_application != 0) { @@ -158,8 +156,6 @@ } amaflags=0; - - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Processing completed.\n"); } } Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Tue Aug 1 13:17:53 2006 @@ -83,10 +83,10 @@ std::list<std::string> MysqlCDR::chanvars_supp_list; std::vector<switch_mod_cdr_sql_types_t> MysqlCDR::chanvars_fixed_types; bool MysqlCDR::activated = 0; -char* MysqlCDR::sql_query = 0; +char MysqlCDR::sql_query[1024] = ""; std::string MysqlCDR::tmp_sql_query; char MysqlCDR::sql_query_chanvars[100] = ""; -MYSQL* MysqlCDR:: conn = 0; +MYSQL* MysqlCDR::conn = 0; MYSQL_STMT* MysqlCDR::stmt=0; MYSQL_STMT* MysqlCDR::stmt_chanvars=0; char MysqlCDR::hostname[255] = ""; @@ -208,38 +208,38 @@ } tmp_sql_query.append(")"); - - std::vector<char> tempfirstvector(tmp_sql_query.begin(), tmp_sql_query.end()); - tempfirstvector.push_back('\0'); - sql_query = &tempfirstvector[0]; char tempsql_query_chanvars[] = "INSERT INTO chanvars (callid,varname,varvalue) VALUES(?,?,?)"; memset(sql_query_chanvars,0,100); strncpy(sql_query_chanvars,tempsql_query_chanvars,strlen(tempsql_query_chanvars)); - conn = mysql_init(NULL); - mysql_options(conn, MYSQL_READ_DEFAULT_FILE, ""); - if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) - { - char *error1 = "Cannot connect to MySQL Server. The error was: "; - const char *error2 = mysql_error(conn); - strncat(error1,error2,strlen(error2)); - switch_console_printf(SWITCH_CHANNEL_LOG,error1); - } - else - connectionstate = 1; + strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); + connect_to_database(); + } + } +} + +void MysqlCDR::connect_to_database() +{ + conn = mysql_init(NULL); + mysql_options(conn, MYSQL_READ_DEFAULT_FILE, ""); + if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) + { + const char *error1 = mysql_error(conn); + switch_console_printf(SWITCH_CHANNEL_LOG,"Cannot connect to MySQL Server. The error was: %s\n",error1); + } + else + connectionstate = 1; - mysql_autocommit(conn,0); - stmt = mysql_stmt_init(conn); + mysql_autocommit(conn,0); + stmt = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); + mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); - if(logchanvars) - { - stmt_chanvars = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); - } - } + if(logchanvars) + { + stmt_chanvars = mysql_stmt_init(conn); + mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); } } @@ -390,10 +390,8 @@ *x = 0; bool* is_null = new bool; *is_null = 0; - std::cout << "CDR_TINY: " << iItr->second << " and its size is " << iItr->second.size() << " bytes." << std::endl << std::endl; if(iItr->second.size() > 0) { - std::cout << "Converting iItr->second to type char." << std::endl; std::istringstream istring(iItr->second); istring >> *x; } @@ -433,75 +431,93 @@ bindmetemp = new MYSQL_BIND[bindme.size()]; copy(bindme.begin(), bindme.end(), bindmetemp); - mysql_stmt_bind_param(stmt,bindmetemp); - int bah = mysql_stmt_execute(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",bah); - - const char* bah2 = mysql_stmt_error(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",bah2); - - if(logchanvars && chanvars_supp.size() > 0) + for(int mysql_ping_result = -1, count = 0, mysql_stmt_error_code = -1; mysql_ping_result != 0 && count < 5 && mysql_stmt_error_code != 0 ; count++) { - long long insertid = mysql_stmt_insert_id(stmt); - - std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; - iEnd = chanvars_supp.end(); - for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + mysql_ping_result = mysql_ping(conn); + if(mysql_ping_result) { - MYSQL_BIND bindme_chanvars[3]; - memset(bindme_chanvars,0,sizeof(bindme_chanvars)); + switch(mysql_ping_result) + { + case CR_SERVER_GONE_ERROR: + case CR_SERVER_LOST: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); + connect_to_database(); + break; + } + default: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); + connect_to_database(); + } + } + } + else + { + mysql_stmt_bind_param(stmt,bindmetemp); + mysql_stmt_error_code = mysql_stmt_execute(stmt); - bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; - bindme_chanvars[0].buffer = &insertid; + if(mysql_stmt_error_code != 0) + { + errorstate = 1; + switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); - std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); - tempfirstvector.push_back('\0'); - char* varname_temp = &tempfirstvector[0]; + const char* mysql_stmt_error_string = mysql_stmt_error(stmt); + switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); + } + else + errorstate = 0; + + if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) + { + long long insertid = mysql_stmt_insert_id(stmt); - bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; - long unsigned int varname_length = (long unsigned int)(iItr->first.size()); - bindme_chanvars[1].length = &varname_length; - bindme_chanvars[1].buffer_length = varname_length; - bindme_chanvars[1].buffer = varname_temp; + std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; + iEnd = chanvars_supp.end(); + for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + { + MYSQL_BIND bindme_chanvars[3]; + memset(bindme_chanvars,0,sizeof(bindme_chanvars)); - std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); - tempsecondvector.push_back('\0'); - char* varvalue_temp = &tempsecondvector[0]; + bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; + bindme_chanvars[0].buffer = &insertid; - bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; - if(iItr->second.size() == 0) - bindme_chanvars[2].is_null = (my_bool*)1; - else - { - long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); - bindme_chanvars[2].length = &varvalue_length; - bindme_chanvars[2].buffer_length = varvalue_length; - bindme_chanvars[2].buffer = varvalue_temp; + std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); + tempfirstvector.push_back('\0'); + char* varname_temp = &tempfirstvector[0]; + + bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; + long unsigned int varname_length = (long unsigned int)(iItr->first.size()); + bindme_chanvars[1].length = &varname_length; + bindme_chanvars[1].buffer_length = varname_length; + bindme_chanvars[1].buffer = varname_temp; + + std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); + tempsecondvector.push_back('\0'); + char* varvalue_temp = &tempsecondvector[0]; + + bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; + if(iItr->second.size() == 0) + bindme_chanvars[2].is_null = (my_bool*)1; + else + { + long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); + bindme_chanvars[2].length = &varvalue_length; + bindme_chanvars[2].buffer_length = varvalue_length; + bindme_chanvars[2].buffer = varvalue_temp; + } + + mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); + mysql_stmt_execute(stmt_chanvars); + } } - mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); - mysql_stmt_execute(stmt_chanvars); + if(errorstate == 0) + mysql_commit(conn); + else + mysql_rollback(conn); } } - - - mysql_commit(conn); - - /* For future use - if(!mysql_stmt_execute(stmt)) - { - if(errorstate == TRUE) - reprocess_tempdumped_data(); - mysql_commit(conn); - errorstate=FALSE(); - } - else - { - errorstate = TRUE; - mysql_rollback(conn); - tempdump_data(); - } - */ delete [] bindmetemp; if(temp_chanvars_holder.size() > 0) Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_cdr/mysqlcdr.h Tue Aug 1 13:17:53 2006 @@ -36,6 +36,7 @@ #include <list> #include <sstream> #include <mysql.h> +#include <errmsg.h> #ifndef MYSQLCDR #define MYSQLCDR @@ -55,7 +56,7 @@ private: static bool activated; - static char *sql_query; + static char sql_query[1024]; static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql static char sql_query_chanvars[100]; static MYSQL *conn; @@ -94,6 +95,7 @@ template <typename T> void add_parameter(T& param, enum_field_types type, bool *is_null=0); void add_string_parameter(char* param, long unsigned int& param_length, enum_field_types type, bool* is_null=0); void set_mysql_time(switch_time_exp_t& param, MYSQL_TIME& destination); + void connect_to_database(); }; #endif Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Aug 1 13:17:53 2006 @@ -114,15 +114,28 @@ switch_mutex_lock(listen_list.mutex); for (l = listen_list.listeners; l; l = l->next) { - if (switch_test_flag(l, LFLAG_EVENTS) && (l->event_list[(uint8_t)event->event_id] || l->event_list[(uint8_t)SWITCH_EVENT_ALL])) { + uint8_t send = 0; + + if (!switch_test_flag(l, LFLAG_EVENTS)) { + continue; + } + + if (l->event_list[(uint8_t)SWITCH_EVENT_ALL]) { + send = 1; + } else if ((l->event_list[(uint8_t)event->event_id])) { if (event->event_id != SWITCH_EVENT_CUSTOM || (event->subclass && switch_core_hash_find(l->event_hash, event->subclass->name))) { - if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { - switch_queue_push(l->event_queue, clone); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); - } + send = 1; } } + + if (send) { + if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { + switch_queue_push(l->event_queue, clone); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + } + } + } switch_mutex_unlock(listen_list.mutex); } @@ -149,7 +162,14 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { + listener_t *l; + switch_mutex_lock(listen_list.mutex); + for (l = listen_list.listeners; l; l = l->next) { + close_socket(&l->sock); + } + switch_mutex_unlock(listen_list.mutex); + close_socket(&listen_list.sock); return SWITCH_STATUS_SUCCESS; @@ -201,8 +221,165 @@ } } -static void parse_command(listener_t *listener, char *cmd, char *reply, uint32_t reply_len) +static switch_status_t read_packet(listener_t *listener, switch_event_t **event, uint32_t timeout) { + switch_size_t mlen; + char mbuf[1024] = ""; + char buf[1024] = ""; + switch_size_t len; + switch_status_t status = SWITCH_STATUS_SUCCESS; + int count = 0, bytes = 0; + uint32_t elapsed = 0; + time_t start = 0; + void *pop; + char *ptr; + uint8_t crcount = 0; + + *event = NULL; + start = time(NULL); + ptr = mbuf; + + while(listener->sock) { + uint8_t do_sleep = 1; + mlen = 1; + status = switch_socket_recv(listener->sock, ptr, &mlen); + + if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) { + return status; + } + + if (status != SWITCH_STATUS_BREAK && mlen) { + bytes++; + + if (*mbuf == '\r' || *mbuf == '\n') { /* bah */ + ptr = mbuf; + continue; + } + + if (*ptr == '\n') { + crcount++; + } else if (*ptr != '\r') { + crcount = 0; + } + ptr++; + if (crcount == 2) { + char *next; + char *cur = mbuf; + + while(cur) { + if ((next = strchr(cur, '\r')) || (next = strchr(cur, '\n'))) { + while (*next == '\r' || *next == '\n') { + next++; + } + } + count++; + if (count == 1) { + switch_event_create(event, SWITCH_EVENT_MESSAGE); + switch_event_add_header(*event, SWITCH_STACK_BOTTOM, "Command", mbuf); + } else { + char *var, *val; + var = mbuf; + if ((val = strchr(var, ':'))) { + *val++ = '\0'; + while(*val == ' ') { + val++; + } + } + if (var && val) { + switch_event_add_header(*event, SWITCH_STACK_BOTTOM, var, val); + } + } + + cur = next; + } + break; + } + } + + if (timeout) { + elapsed = (uint32_t)(time(NULL) - start); + if (elapsed >= timeout) { + switch_clear_flag_locked(listener, LFLAG_RUNNING); + return SWITCH_STATUS_FALSE; + } + } + + if (!*mbuf) { + if (switch_test_flag(listener, LFLAG_LOG)) { + if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + char *data = (char *) pop; + + + if (data) { + snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", strlen(data)); + len = strlen(buf) + 1; + switch_socket_send(listener->sock, buf, &len); + len = strlen(data) + 1; + switch_socket_send(listener->sock, data, &len); + + free(data); + } + do_sleep = 0; + } + } + + if (switch_test_flag(listener, LFLAG_EVENTS)) { + if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + char hbuf[512]; + switch_event_t *event = (switch_event_t *) pop; + char *etype, *packet, *xmlstr = NULL; + + do_sleep = 0; + if (listener->format == EVENT_FORMAT_PLAIN) { + etype = "plain"; + switch_event_serialize(event, buf, sizeof(buf), NULL); + packet = buf; + } else { + switch_xml_t xml; + etype = "xml"; + + if ((xml = switch_event_xmlize(event, NULL))) { + xmlstr = switch_xml_toxml(xml); + packet = xmlstr; + switch_xml_free(xml); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML ERROR!\n"); + continue; + } + } + + len = strlen(packet) + 1; + + snprintf(hbuf, sizeof(hbuf), "Content-Length: %"APR_SSIZE_T_FMT"\n" + "Content-Type: text/event-%s\n" + "\n", len, etype); + + len = strlen(hbuf) + 1; + switch_socket_send(listener->sock, hbuf, &len); + + len = strlen(packet) + 1; + switch_socket_send(listener->sock, packet, &len); + + if (xmlstr) { + free(xmlstr); + } + } + } + } + if (do_sleep) { + switch_yield(1000); + } + } + + return status; + +} + +static switch_status_t parse_command(listener_t *listener, switch_event_t *event, char *reply, uint32_t reply_len) +{ + switch_status_t status = SWITCH_STATUS_SUCCESS; + char *cmd = switch_event_get_header(event, "command"); + *reply = '\0'; if (!strncasecmp(cmd, "exit", 4)) { @@ -252,7 +429,7 @@ *arg++ = '\0'; } - if (switch_api_execute(api_cmd, arg, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(api_cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { switch_size_t len; char buf[1024]; @@ -262,7 +439,7 @@ switch_socket_send(listener->sock, buf, &len); len = strlen(listener->retbuf) + 1; switch_socket_send(listener->sock, listener->retbuf, &len); - return; + return SWITCH_STATUS_SUCCESS; } } else if (!strncasecmp(cmd, "log", 3)) { @@ -356,10 +533,15 @@ } done: + if (event) { + switch_event_destroy(&event); + } + if (switch_strlen_zero(reply)) { snprintf(reply, reply_len, "-ERR command not found"); } + return status; } static void *SWITCH_THREAD_FUNC listener_run(switch_thread_t *thread, void *obj) @@ -368,9 +550,7 @@ char buf[1024]; switch_size_t len; switch_status_t status; - void *pop; - uint32_t elapsed; - time_t start = 0; + switch_event_t *event; char reply[512] = ""; assert(listener != NULL); @@ -386,126 +566,59 @@ len = strlen(buf) + 1; switch_socket_send(listener->sock, buf, &len); - start = time(NULL); - while(!switch_test_flag(listener, LFLAG_AUTHED)) { - len = sizeof(buf); - memset(buf, 0, len); - status = switch_socket_recv(listener->sock, buf, &len); - if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - break; - } - - if (len) { - parse_command(listener, buf, reply, sizeof(reply)); - if (!switch_strlen_zero(reply)) { - snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); - len = strlen(buf) + 1; - switch_socket_send(listener->sock, buf, &len); - } + while (!switch_test_flag(listener, LFLAG_AUTHED)) { + + status = read_packet(listener, &event, 25); + if (status != SWITCH_STATUS_SUCCESS) { goto done; } - - if (status == SWITCH_STATUS_BREAK) { - elapsed = (uint32_t)(time(NULL) - start); - if (elapsed >= 15) { - switch_clear_flag_locked(listener, LFLAG_RUNNING); - break; - } - - //switch_yield(1000); + if (!event) { continue; } - + if (parse_command(listener, event, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { + switch_clear_flag_locked(listener, LFLAG_RUNNING); + goto done; + } + if (!switch_strlen_zero(reply)) { + snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + len = strlen(buf) + 1; + switch_socket_send(listener->sock, buf, &len); + } + break; } - done: while(switch_test_flag(listener, LFLAG_RUNNING) && listen_list.ready) { - uint8_t do_sleep = 1; + switch_event_t *event; + len = sizeof(buf); memset(buf, 0, len); - status = switch_socket_recv(listener->sock, buf, &len); + status = read_packet(listener, &event, 0); - if (!len && status != SWITCH_STATUS_BREAK) { + if (status != SWITCH_STATUS_SUCCESS) { break; } - - if (len) { - parse_command(listener, buf, reply, sizeof(reply)); - if (!switch_strlen_zero(reply)) { - snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); - len = strlen(buf) + 1; - switch_socket_send(listener->sock, buf, &len); - } + + if (!event) { continue; } - if (switch_test_flag(listener, LFLAG_LOG)) { - if (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { - char *data = (char *) pop; - if (data) { - snprintf(buf, sizeof(buf), "Content-Type: log/data\nContent-Length: %"APR_SSIZE_T_FMT"\n\n", strlen(data)); - len = strlen(buf) + 1; - switch_socket_send(listener->sock, buf, &len); - len = strlen(data) + 1; - switch_socket_send(listener->sock, data, &len); - - free(data); - } - do_sleep = 0; - } + if (parse_command(listener, event, reply, sizeof(reply)) != SWITCH_STATUS_SUCCESS) { + switch_clear_flag_locked(listener, LFLAG_RUNNING); + break; } - if (switch_test_flag(listener, LFLAG_EVENTS)) { - if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - char hbuf[512]; - switch_event_t *event = (switch_event_t *) pop; - char *etype, *packet, *xmlstr = NULL; - do_sleep = 0; - if (listener->format == EVENT_FORMAT_PLAIN) { - etype = "plain"; - switch_event_serialize(event, buf, sizeof(buf), NULL); - packet = buf; - } else { - switch_xml_t xml; - etype = "xml"; - - if ((xml = switch_event_xmlize(event, NULL))) { - xmlstr = switch_xml_toxml(xml); - packet = xmlstr; - switch_xml_free(xml); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML ERROR!\n"); - continue; - } - } - - len = strlen(packet) + 1; - - snprintf(hbuf, sizeof(hbuf), "Content-Length: %"APR_SSIZE_T_FMT"\n" - "Content-Type: text/event-%s\n" - "\n", len, etype); - - len = strlen(hbuf) + 1; - switch_socket_send(listener->sock, hbuf, &len); - - len = strlen(packet) + 1; - switch_socket_send(listener->sock, packet, &len); - - switch_event_destroy(&event); - - if (xmlstr) { - free(xmlstr); - } - } + if (!switch_strlen_zero(reply)) { + snprintf(buf, sizeof(buf), "Content-Type: command/reply\nReply-Text: %s\n\n", reply); + len = strlen(buf) + 1; + switch_socket_send(listener->sock, buf, &len); } - - if (do_sleep) { - switch_yield(1000); - } + } + + done: remove_listener(listener); close_socket(&listener->sock); Modified: freeswitch/branches/stkn/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/branches/stkn/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/branches/stkn/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Tue Aug 1 13:17:53 2006 @@ -240,7 +240,7 @@ stream.end = stream.data; stream.data_size = sizeof(retbuf); stream.write_function = switch_console_stream_write; - switch_api_execute(cmd, arg, &stream); + switch_api_execute(cmd, arg, NULL, &stream); return 0; } Modified: freeswitch/branches/stkn/src/mod/formats/mod_sndfile/Makefile ============================================================================== --- freeswitch/branches/stkn/src/mod/formats/mod_sndfile/Makefile (original) +++ freeswitch/branches/stkn/src/mod/formats/mod_sndfile/Makefile Tue Aug 1 13:17:53 2006 @@ -3,7 +3,7 @@ all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.12.tar.gz --prefix=$(PREFIX) + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsndfile-1.0.16.tar.gz --prefix=$(PREFIX) $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o Modified: freeswitch/branches/stkn/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/branches/stkn/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/branches/stkn/src/mod/formats/mod_sndfile/mod_sndfile.c Tue Aug 1 13:17:53 2006 @@ -213,6 +213,26 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t sndfile_file_set_string(switch_file_handle_t *handle, switch_audio_col_t col, const char *string) +{ + sndfile_context *context = handle->private_info; + + return sf_set_string(context->handle, (int)col, string) ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; +} + +static switch_status_t sndfile_file_get_string(switch_file_handle_t *handle, switch_audio_col_t col, const char **string) +{ + sndfile_context *context = handle->private_info; + const char *s; + + if ((s = sf_get_string(context->handle, (int)col))) { + *string = s; + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + /* Registration */ static char **supported_formats; @@ -224,6 +244,8 @@ /*.file_read */ sndfile_file_read, /*.file_write */ sndfile_file_write, /*.file_seek */ sndfile_file_seek, + /*.file_set_string */ sndfile_file_set_string, + /*.file_get_string */ sndfile_file_get_string, /*.extens */ NULL, /*.next */ NULL, }; @@ -265,7 +287,7 @@ sfinfo.channels = 1; len = ((major_count + (exlen + 2)) * sizeof(char *)); - supported_formats = switch_core_permenant_alloc(len); + supported_formats = switch_core_permanent_alloc(len); len = 0; for (m = 0; m < major_count; m++) { Modified: freeswitch/branches/stkn/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/stkn/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/stkn/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Aug 1 13:17:53 2006 @@ -1705,12 +1705,15 @@ } } else { - if (switch_core_session_read_frame(session, &read_frame, -1, 0) != SWITCH_STATUS_SUCCESS) { + switch_status_t status; + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } } if ((write_frame.datalen = (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { - if (loops > 0) { + if (loops) { switch_buffer_t *tmp; /* Switcharoo*/ @@ -1719,11 +1722,12 @@ tto->loop_buffer = tmp; loops--; /* try again */ - if ((write_frame.datalen = (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { + if ((write_frame.datalen = + (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { break; } } else { - continue; + break; } } @@ -1838,13 +1842,25 @@ if (argc > 1) { char *cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_core_session_t *session = NULL; switch_stream_handle_t stream = {0}; char retbuf[2048] = ""; + if (argc > 2) { + JSObject *session_obj; + struct js_session *jss; + if (JS_ValueToObject(cx, argv[2], &session_obj)) { + if ((jss = JS_GetPrivate(cx, session_obj))) { + session = jss->session; + } + } + } + + stream.data = retbuf; stream.end = stream.data; stream.data_size = sizeof(retbuf); - switch_api_execute(cmd, arg, &stream); + switch_api_execute(cmd, arg, session, &stream); stream.write_function = switch_console_stream_write; *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, retbuf)); @@ -2203,7 +2219,7 @@ } -static switch_status_t launch_async(char *text, switch_stream_handle_t *stream) +static switch_status_t launch_async(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { if (switch_strlen_zero(text)) { Modified: freeswitch/branches/stkn/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/stkn/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/stkn/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Aug 1 13:17:53 2006 @@ -272,7 +272,7 @@ ResponseStatus(r,200); ResponseContentType(r, m); ResponseWrite(r); - switch_api_execute(command, r->query, &stream); + switch_api_execute(command, r->query, NULL, &stream); HTTPWriteEnd(r); return TRUE; } @@ -296,7 +296,7 @@ stream.end = stream.data; stream.data_size = CMDLEN; stream.write_function = switch_console_stream_write; - switch_api_execute(command, arg, &stream); + switch_api_execute(command, arg, NULL, &stream); /* Return our result. */ val = xmlrpc_build_value(envP, "s", retbuf); Modified: freeswitch/branches/stkn/src/switch_console.c ============================================================================== --- freeswitch/branches/stkn/src/switch_console.c (original) +++ freeswitch/branches/stkn/src/switch_console.c Tue Aug 1 13:17:53 2006 @@ -108,7 +108,7 @@ stream.end = stream.data; stream.data_size = retlen; stream.write_function = switch_console_stream_write; - if (switch_api_execute(cmd, arg, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", retbuf); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Unknown Command: %s\n", cmd); Modified: freeswitch/branches/stkn/src/switch_core.c ============================================================================== --- freeswitch/branches/stkn/src/switch_core.c (original) +++ freeswitch/branches/stkn/src/switch_core.c Tue Aug 1 13:17:53 2006 @@ -543,9 +543,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_seek(switch_file_handle_t *fh, unsigned int *cur_pos, int64_t samples, int whence) { + assert(fh != NULL); return fh->file_interface->file_seek(fh, cur_pos, samples, whence); } +SWITCH_DECLARE(switch_status_t) switch_core_file_set_string(switch_file_handle_t *fh, switch_audio_col_t col, const char *string) +{ + assert(fh != NULL); + + return fh->file_interface->file_set_string(fh, col, string); +} + +SWITCH_DECLARE(switch_status_t) switch_core_file_get_string(switch_file_handle_t *fh, switch_audio_col_t col, const char **string) +{ + assert(fh != NULL); + + return fh->file_interface->file_get_string(fh, col, string); + +} + + SWITCH_DECLARE(switch_status_t) switch_core_file_close(switch_file_handle_t *fh) { return fh->file_interface->file_close(fh); @@ -840,9 +857,9 @@ } /* **ONLY** alloc things with these functions that **WILL NOT** need - to be freed *EVER* ie this is for *PERMENANT* memory allocation */ + to be freed *EVER* ie this is for *PERMANENT* memory allocation */ -SWITCH_DECLARE(void *) switch_core_permenant_alloc(switch_size_t memory) +SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory) { void *ptr = NULL; assert(runtime.memory_pool != NULL); @@ -857,7 +874,7 @@ return ptr; } -SWITCH_DECLARE(char *) switch_core_permenant_strdup(char *todup) +SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup) { char *duped = NULL; switch_size_t len; Modified: freeswitch/branches/stkn/src/switch_event.c ============================================================================== --- freeswitch/branches/stkn/src/switch_event.c (original) +++ freeswitch/branches/stkn/src/switch_event.c Tue Aug 1 13:17:53 2006 @@ -112,6 +112,7 @@ "SESSION_CRASH", "MODULE_LOAD", "DTMF", + "MESSAGE", "ALL" }; Modified: freeswitch/branches/stkn/src/switch_ivr.c ============================================================================== --- freeswitch/branches/stkn/src/switch_ivr.c (original) +++ freeswitch/branches/stkn/src/switch_ivr.c Tue Aug 1 13:17:53 2006 @@ -214,6 +214,8 @@ switch_codec_t codec, *read_codec; char *codec_name; switch_status_t status = SWITCH_STATUS_SUCCESS; + char *p; + const char *vval; if (!fh) { fh = &lfh; @@ -241,6 +243,41 @@ switch_channel_answer(channel); + if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_TITLE, vval); + switch_channel_set_variable(channel, "RECORD_TITLE", NULL); + } + + if ((p = switch_channel_get_variable(channel, "RECORD_COPYRIGHT"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_COPYRIGHT, vval); + switch_channel_set_variable(channel, "RECORD_COPYRIGHT", NULL); + } + + if ((p = switch_channel_get_variable(channel, "RECORD_SOFTWARE"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_SOFTWARE, vval); + switch_channel_set_variable(channel, "RECORD_SOFTWARE", NULL); + } + + if ((p = switch_channel_get_variable(channel, "RECORD_ARTIST"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_ARTIST, vval); + switch_channel_set_variable(channel, "RECORD_ARTIST", NULL); + } + + if ((p = switch_channel_get_variable(channel, "RECORD_COMMENT"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_COMMENT, vval); + switch_channel_set_variable(channel, "RECORD_COMMENT", NULL); + } + + if ((p = switch_channel_get_variable(channel, "RECORD_DATE"))) { + vval = (const char *) switch_core_session_strdup(session, p); + switch_core_file_set_string(fh, SWITCH_AUDIO_COL_STR_DATE, vval); + switch_channel_set_variable(channel, "RECORD_DATE", NULL); + } codec_name = "L16"; if (switch_core_codec_init(&codec, @@ -333,7 +370,9 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; switch_file_handle_t lfh; switch_codec_t *read_codec = switch_core_session_get_read_codec(session); - + const char *p; + char *title = "", *copyright = "", *software = "", *artist = "", *comment = "", *date = ""; + if (!fh) { fh = &lfh; memset(fh, 0, sizeof(lfh)); @@ -354,8 +393,52 @@ write_frame.data = abuf; write_frame.buflen = sizeof(abuf); + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_TITLE, &p) == SWITCH_STATUS_SUCCESS) { + title = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_TITLE", (char *)p); + } + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_COPYRIGHT, &p) == SWITCH_STATUS_SUCCESS) { + copyright = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_COPYRIGHT", (char *)p); + } + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_SOFTWARE, &p) == SWITCH_STATUS_SUCCESS) { + software = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_SOFTWARE", (char *)p); + } + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_ARTIST, &p) == SWITCH_STATUS_SUCCESS) { + artist = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_ARTIST", (char *)p); + } + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_COMMENT, &p) == SWITCH_STATUS_SUCCESS) { + comment = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_COMMENT", (char *)p); + } + + if (switch_core_file_get_string(fh, SWITCH_AUDIO_COL_STR_DATE, &p) == SWITCH_STATUS_SUCCESS) { + date = (char *) switch_core_session_strdup(session, (char *)p); + switch_channel_set_variable(channel, "RECORD_DATE", (char *)p); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "OPEN FILE %s %uhz %u channels\n" + "TITLE=%s\n" + "COPYRIGHT=%s\n" + "SOFTWARE=%s\n" + "ARTIST=%s\n" + "COMMENT=%s\n" + "DATE=%s\n", file, fh->samplerate, fh->channels, + title, + copyright, + software, + artist, + comment, + date); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN FILE %s %uhz %u channels\n", file, fh->samplerate, fh->channels); interval = read_codec->implementation->microseconds_per_frame / 1000; Modified: freeswitch/branches/stkn/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/stkn/src/switch_loadable_module.c (original) +++ freeswitch/branches/stkn/src/switch_loadable_module.c Tue Aug 1 13:17:53 2006 @@ -270,7 +270,7 @@ break; } - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { err = "Could not allocate memory\n"; break; } @@ -283,7 +283,7 @@ return SWITCH_STATUS_GENERR; } - module->filename = switch_core_permenant_strdup(filename); + module->filename = switch_core_permanent_strdup(filename); module->module_interface = module_interface; module->switch_module_load = load_func_ptr; @@ -365,7 +365,7 @@ const char *err = NULL; switch_loadable_module_interface_t *module_interface = NULL; - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Couldn't allocate memory\n"); return SWITCH_STATUS_GENERR; } @@ -384,7 +384,7 @@ break; } - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { err = "Could not allocate memory\n"; break; } @@ -397,7 +397,7 @@ return SWITCH_STATUS_GENERR; } - module->filename = switch_core_permenant_strdup(filename); + module->filename = switch_core_permanent_strdup(filename); module->module_interface = module_interface; module->switch_module_load = load_func_ptr; @@ -711,7 +711,7 @@ return i; } -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_stream_handle_t *stream) +SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_api_interface_t *api; switch_status_t status; @@ -734,7 +734,7 @@ } if ((api = switch_loadable_module_get_api_interface(cmd)) != 0) { - status = api->function(arg, stream); + status = api->function(arg, session, stream); } else { status = SWITCH_STATUS_FALSE; stream->write_function(stream, "INVALID COMMAND [%s]", cmd); Modified: freeswitch/branches/stkn/src/switch_utils.c ============================================================================== --- freeswitch/branches/stkn/src/switch_utils.c (original) +++ freeswitch/branches/stkn/src/switch_utils.c Tue Aug 1 13:17:53 2006 @@ -34,16 +34,6 @@ #include <string.h> #include <stdlib.h> -SWITCH_DECLARE(switch_status_t) switch_socket_recvfrom(switch_sockaddr_t *from, switch_socket_t *sock, int32_t flags, char *buf, switch_size_t *len) -{ - switch_status_t status; - - if ((status = apr_socket_recvfrom(from, sock, flags, buf, len)) == SWITCH_STATUS_SUCCESS) { - from->port = ntohs(from->sa.sin.sin_port); - } - return status; -} - SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority) { switch(priority) { /*lol*/ Modified: freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln ============================================================================== --- freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln (original) +++ freeswitch/branches/stkn/w32/vsnet/Freeswitch.sln Tue Aug 1 13:17:53 2006 @@ -384,8 +384,8 @@ {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug with MySql|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug with MySql|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.ActiveCfg = Release|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection Modified: freeswitch/branches/stkn/w32/vsnet/GetLibs.vbs ============================================================================== --- freeswitch/branches/stkn/w32/vsnet/GetLibs.vbs (original) +++ freeswitch/branches/stkn/w32/vsnet/GetLibs.vbs Tue Aug 1 13:17:53 2006 @@ -248,16 +248,13 @@ ' Lib Build Sectiton ' ****************** Sub BuildLibs_aprutil(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "apr-util") Then -' WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-util-1.2.6.tar.gz", LibDestDir - If Not FSO.FolderExists(LibDestDir & "apr-util-1.2.6") Then - Wscript.echo "Unable to get apr-util from default download location, Trying backup location:" - WgetUnCompress LibsBase & "apr-util-1.2.6.tar.gz", LibDestDir - End If - RenameFolder LibDestDir & "apr-util-1.2.6", "apr-util" - FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True - FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True - End If + If Not FSO.FolderExists(LibDestDir & "apr-util") Then + Wscript.echo "Unable to get apr-util from default download location, Trying backup location:" + WgetUnCompress LibsBase & "apr-util-1.2.7.tar.gz", LibDestDir + End If + RenameFolder LibDestDir & "apr-util-1.2.7", "apr-util" + FSO.CopyFile Utilsdir & "apr\xml.vcproj", LibDestDir & "apr-util\xml\expat\lib\", True + FSO.CopyFile Utilsdir & "apr\libaprutil.vcproj", LibDestDir & "apr-util\", True If FSO.FolderExists(LibDestDir & "apr-util") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr-util\xml\expat\lib\LibD\xml.lib") Then @@ -285,15 +282,12 @@ End Sub Sub BuildLibs_apriconv(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "apr-iconv") Then -' WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-iconv-1.1.1.tar.gz", LibDestDir - If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then - Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:" - WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir - End If - RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv" - FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True - End If + If Not FSO.FolderExists(LibDestDir & "apr-iconv-1.1.1") Then + Wscript.echo "Unable to get apr-iconv from default download location, Trying backup location:" + WgetUnCompress LibsBase & "apr-iconv-1.1.1.tar.gz", LibDestDir + End If + RenameFolder LibDestDir & "apr-iconv-1.1.1", "apr-iconv" + FSO.CopyFile Utilsdir & "apr\libapriconv.vcproj", LibDestDir & "apr-iconv\", True If FSO.FolderExists(LibDestDir & "apr-iconv") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr-iconv\Debug\libapriconv-1.lib") Then @@ -315,16 +309,13 @@ End Sub Sub BuildLibs_apr(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "apr") Then -' WgetUnCompress "ftp://ftp.wayne.edu/apache/apr/apr-1.2.6.tar.gz", LibDestDir - If Not FSO.FolderExists(LibDestDir & "apr-1.2.6") Then - Wscript.echo "Unable to get apr from default download location, Trying backup location:" - WgetUnCompress LibsBase & "apr-1.2.6.tar.gz", LibDestDir - End If - RenameFolder LibDestDir & "apr-1.2.6", "apr" - FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True - FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True - End If + If Not FSO.FolderExists(LibDestDir & "apr") Then + Wscript.echo "Unable to get apr from default download location, Trying backup location:" + WgetUnCompress LibsBase & "apr-1.2.7.tar.gz", LibDestDir + End If + RenameFolder LibDestDir & "apr-1.2.7", "apr" + FSO.CopyFile Utilsdir & "apr\libapr.vcproj", LibDestDir & "apr\", True + FSO.CopyFile Utilsdir & "apr\apr.hw", LibDestDir & "apr\include\", True If FSO.FolderExists(LibDestDir & "apr") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "apr\Debug\libapr-1.lib") Then @@ -421,16 +412,13 @@ End Sub Sub BuildLibs_sqlite(BuildDebug, BuildRelease) - If Not FSO.FolderExists(LibDestDir & "sqlite") Then - WgetUnCompress "http://www.sqlite.org/sqlite-source-3_3_5.zip", LibDestDir - If Not FSO.FolderExists(LibDestDir & "sqlite-source-3_3_5") Then + If Not FSO.FolderExists(LibDestDir & "sqlite") Then Wscript.echo "Unable to get SQLite from default download location, Trying backup location:" - WgetUnCompress LibsBase & "sqlite-source-3_3_5.zip", LibDestDir + WgetUnCompress LibsBase & "sqlite-source-3_3_6.zip", LibDestDir End If - RenameFolder LibDestDir & "sqlite-source-3_3_5", "sqlite" + RenameFolder LibDestDir & "sqlite-source-3_3_6", "sqlite" FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;" - End If If FSO.FolderExists(LibDestDir & "sqlite") Then If BuildDebug Then If Not FSO.FileExists(LibDestDir & "sqlite\Debug DLL\sqlite.lib") Then @@ -629,9 +617,10 @@ Sub BuildLibs_libsndfile(BuildDebug, BuildRelease) If Not FSO.FolderExists(LibDestDir & "libsndfile") Then - WgetUnCompress LibsBase & "libsndfile-1.0.12.tar.gz", LibDestDir - RenameFolder LibDestDir & "libsndfile-1.0.12", "libsndfile" - FSO.CopyFile Utilsdir & "libsndfile.vcproj", LibDestDir & "libsndfile\Win32\", True + WgetUnCompress LibsBase & "libsndfile-1.0.16.tar.gz", LibDestDir + RenameFolder LibDestDir & "libsndfile-1.0.16", "libsndfile" + FSO.CopyFile Utilsdir & "libsndfile\*.*", LibDestDir & "libsndfile\Win32\", True + FindReplaceInFile LibDestDir & "libsndfile\src\common.c", "memset (ptr + most,", "memset ((char *)ptr + most," End If If FSO.FolderExists(LibDestDir & "libsndfile") Then If BuildDebug Then

1 0

[commit] r2217 - in freeswitch/branches/cypromis/trunk: . conf libs/srtp mac/xcode mac/xcode/FreeSWITCH.xcodeproj src src/include src/mod/applications/mod_commands src/mod/applications/mod_conference src/mod/applications/mod_dptools src/mod/codecs/mod_g711 src/mod/codecs/mod_l16 src/mod/dialplans/mod_dialplan_xml src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_exosip src/mod/endpoints/mod_portaudio src/mod/event_handlers/mod_cdr src/mod/event_handlers/mod_event_socket src/mod/eve
by Freeswitch SVN 01 Aug '06

01 Aug '06

Author: cypromis Date: Tue Aug 1 03:49:17 2006 New Revision: 2217 Added: freeswitch/branches/cypromis/trunk/libs/srtp/configure.ac freeswitch/branches/cypromis/trunk/mac/xcode/exosip2.plist freeswitch/branches/cypromis/trunk/mac/xcode/osip2.plist freeswitch/branches/cypromis/trunk/mac/xcode/osipparser2.plist Modified: freeswitch/branches/cypromis/trunk/ (props changed) freeswitch/branches/cypromis/trunk/Makefile.am freeswitch/branches/cypromis/trunk/Makefile.in freeswitch/branches/cypromis/trunk/conf/freeswitch.xml freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4 freeswitch/branches/cypromis/trunk/libs/srtp/config_in.h freeswitch/branches/cypromis/trunk/libs/srtp/configure freeswitch/branches/cypromis/trunk/libs/srtp/configure.in freeswitch/branches/cypromis/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj freeswitch/branches/cypromis/trunk/mac/xcode/libfreeswitch.plist freeswitch/branches/cypromis/trunk/src/include/switch.h freeswitch/branches/cypromis/trunk/src/include/switch_core.h freeswitch/branches/cypromis/trunk/src/include/switch_loadable_module.h freeswitch/branches/cypromis/trunk/src/include/switch_types.h freeswitch/branches/cypromis/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/branches/cypromis/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/branches/cypromis/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/Makefile freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/README freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c freeswitch/branches/cypromis/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/branches/cypromis/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/branches/cypromis/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/branches/cypromis/trunk/src/switch_console.c freeswitch/branches/cypromis/trunk/src/switch_core.c freeswitch/branches/cypromis/trunk/src/switch_loadable_module.c freeswitch/branches/cypromis/trunk/w32/vsnet/Freeswitch.sln freeswitch/branches/cypromis/trunk/w32/vsnet/Tools/ (props changed) Log: upgrade to main Modified: freeswitch/branches/cypromis/trunk/Makefile.am ============================================================================== --- freeswitch/branches/cypromis/trunk/Makefile.am (original) +++ freeswitch/branches/cypromis/trunk/Makefile.am Tue Aug 1 03:49:17 2006 @@ -130,7 +130,7 @@ lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_PROGRAMS = freeswitch @@ -171,6 +171,7 @@ ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX) rm build/freeswitch.env Modified: freeswitch/branches/cypromis/trunk/Makefile.in ============================================================================== --- freeswitch/branches/cypromis/trunk/Makefile.in (original) +++ freeswitch/branches/cypromis/trunk/Makefile.in Tue Aug 1 03:49:17 2006 @@ -366,7 +366,7 @@ lib_LTLIBRARIES = libfreeswitch.la libfreeswitch_la_CFLAGS = $(AM_CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -std=c99 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 -libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup +libfreeswitch_la_LIBADD = -lteletone -lresample -lsrtp -lsqlite3 -lspeakup -lpcre nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h bin_SCRIPTS = scripts/fsxs freeswitch_SOURCES = src/switch.c\ @@ -823,7 +823,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir -p $(distdir) + mkdir $(distdir) $(mkdir_p) $(distdir)/build/config $(distdir)/src/include @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ @@ -1109,6 +1109,7 @@ ./build/buildlib.sh . install libteletone --prefix=$(PREFIX) ./build/buildlib.sh . install srtp --prefix=$(PREFIX) ./build/buildlib.sh . install libspeakup --prefix=$(PREFIX) + ./build/buildlib.sh . install pcre-6.4.tar.gz --prefix=$(PREFIX) rm build/freeswitch.env modules: $(NAME) Modified: freeswitch/branches/cypromis/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/cypromis/trunk/conf/freeswitch.xml (original) +++ freeswitch/branches/cypromis/trunk/conf/freeswitch.xml Tue Aug 1 03:49:17 2006 @@ -356,7 +356,7 @@  <context name="default"> <extension name="tollfree"> - <condition field="destination_number" expression="^(18[0{2}8{2}7{2}6{2}]\d{7})"> + <condition field="destination_number" expression="^(18(0{2}|8{2}|7{2}|6{2})\d{7})$"> <action application="bridge" data="exosip/$1-freeswitch(a)voip.trxtel.com"/> </condition> </extension> Modified: freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4 ============================================================================== --- freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4 (original) +++ freeswitch/branches/cypromis/trunk/libs/srtp/acsite.m4 Tue Aug 1 03:49:17 2006 @@ -1 +1 @@ -m4_include([../../build/config/compiler.m4]) +m4_include([build/compiler.m4]) Modified: freeswitch/branches/cypromis/trunk/libs/srtp/config_in.h ============================================================================== --- freeswitch/branches/cypromis/trunk/libs/srtp/config_in.h (original) +++ freeswitch/branches/cypromis/trunk/libs/srtp/config_in.h Tue Aug 1 03:49:17 2006 @@ -160,11 +160,8 @@ /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus +/* inline seems whacked on solaris */ #undef inline -#endif /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/branches/cypromis/trunk/libs/srtp/configure ============================================================================== --- freeswitch/branches/cypromis/trunk/libs/srtp/configure (original) +++ freeswitch/branches/cypromis/trunk/libs/srtp/configure Tue Aug 1 03:49:17 2006 @@ -309,7 +309,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RNG_OBJS CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EXE GDOI_OBJS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PRTDIAG RNG_OBJS CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EXE GDOI_OBJS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -844,7 +844,9 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-pic build with PIC + --enable-portable-binary + disable compiler optimizations that would produce + unportable binaries --enable-kernel-linux build library to run in Linux kernel context --disable-debug do not compile in dynamic debugging system --enable-generic-aesicm compile in changes for ISMAcryp @@ -853,6 +855,12 @@ --enable-console use /dev/console for error reporting --enable-gdoi enable GDOI key management +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-gcc-arch=<arch> use architecture <arch> for gcc -march/-mtune, + instead of guessing + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1301,10 +1309,7 @@ -if test -z "$CFLAGS"; then - CFLAGS="-Wall -O4 -fexpensive-optimizations -funroll-loops" -fi - +#Set main language if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -2420,12 +2425,1098 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Check whether --enable-pic or --disable-pic was given. -if test "${enable_pic+set}" = set; then - enableval="$enable_pic" - CFLAGS="-fPIC $CFLAGS" +#check compiler vendor + + +echo "$as_me:$LINENO: checking for C compiler vendor" >&5 +echo $ECHO_N "checking for C compiler vendor... $ECHO_C" >&6 +if test "${ax_cv_c_compiler_vendor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ax_cv_c_compiler_vendor=unknown + # note: don't check for gcc first since some other compilers define __GNUC__ + for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do + vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + +#if !($vencpp) + thisisanerror; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_compiler_vendor=`echo $ventest | cut -d: -f1`; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done + +fi +echo "$as_me:$LINENO: result: $ax_cv_c_compiler_vendor" >&5 +echo "${ECHO_T}$ax_cv_c_compiler_vendor" >&6 + + + + + +# Check whether --enable-portable-binary or --disable-portable-binary was given. +if test "${enable_portable_binary+set}" = set; then + enableval="$enable_portable_binary" + acx_maxopt_portable=$withval +else + acx_maxopt_portable=no fi; +# Try to determine "good" native compiler flags if none specified via CFLAGS +if test "$ac_test_CFLAGS" != "set"; then + CFLAGS="" + case $ax_cv_c_compiler_vendor in + dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host" + if test "x$acx_maxopt_portable" = xno; then + CFLAGS="$CFLAGS -arch host" + fi;; + + sun) CFLAGS="-native -fast -xO5 -dalign -xc99=all" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS -xarch=generic" + fi;; + + hp) CFLAGS="+Oall +Optrs_ansi +DSnative" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS +DAportable" + fi;; + + intel) CFLAGS="-O3 -ansi_alias" + if test "x$acx_maxopt_portable" = xno; then + icc_archflag=unknown + icc_flags="" + case $host_cpu in + i686*|x86_64*) + # icc accepts gcc assembly syntax, so these should work: + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 +echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_1=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 1, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG + *:756e6547:*:*) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *6a?:*[234]:*:*|*6[789b]?:*:*:*) icc_flags="-xK";; + *f3[347]:*:*:*|*f41347:*:*:*) icc_flags="-xP -xN -xW -xK";; + *f??:*:*:*) icc_flags="-xN -xW -xK";; + esac ;; + esac ;; + esac + if test "x$icc_flags" != x; then + for flag in $icc_flags; do + echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + icc_archflag=$flag; break +else + : +fi + + done + fi + echo "$as_me:$LINENO: checking for icc architecture flag" >&5 +echo $ECHO_N "checking for icc architecture flag... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $icc_archflag" >&5 +echo "${ECHO_T}$icc_archflag" >&6 + if test "x$icc_archflag" != xunknown; then + CFLAGS="$CFLAGS $icc_archflag" + fi + fi + ;; + + gnu) + # default optimization flags for gcc on all systems + CFLAGS="-O3 -fomit-frame-pointer" + + # -malign-double for x86 systems + echo "$as_me:$LINENO: checking whether C compiler accepts -malign-double" >&5 +echo $ECHO_N "checking whether C compiler accepts -malign-double... $ECHO_C" >&6 +if test "${ax_cv_c_flags__malign_double+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-malign-double" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__malign_double=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__malign_double=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__malign_double +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -malign-double" +else + : +fi + + + # -fstrict-aliasing for gcc-2.95+ + echo "$as_me:$LINENO: checking whether C compiler accepts -fstrict-aliasing" >&5 +echo $ECHO_N "checking whether C compiler accepts -fstrict-aliasing... $ECHO_C" >&6 +if test "${ax_cv_c_flags__fstrict_aliasing+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-fstrict-aliasing" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__fstrict_aliasing=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__fstrict_aliasing=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__fstrict_aliasing +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -fstrict-aliasing" +else + : +fi + + + # note that we enable "unsafe" fp optimization with other compilers, too + echo "$as_me:$LINENO: checking whether C compiler accepts -ffast-math" >&5 +echo $ECHO_N "checking whether C compiler accepts -ffast-math... $ECHO_C" >&6 +if test "${ax_cv_c_flags__ffast_math+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ax_save_FLAGS=$CFLAGS + CFLAGS="-ffast-math" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_c_flags__ffast_math=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ax_cv_c_flags__ffast_math=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +fi + +eval ax_check_compiler_flags=$ax_cv_c_flags__ffast_math +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + CFLAGS="$CFLAGS -ffast-math" +else + : +fi + + + + + +# Check whether --with-gcc-arch or --without-gcc-arch was given. +if test "${with_gcc_arch+set}" = set; then + withval="$with_gcc_arch" + ax_gcc_arch=$withval +else + ax_gcc_arch=yes +fi; + +echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 +echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: " >&5 +echo "${ECHO_T}" >&6 +if test "${ax_cv_gcc_archflag+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +ax_cv_gcc_archflag="unknown" + +if test "$GCC" = yes; then + +if test "x$ax_gcc_arch" = xyes; then +ax_gcc_arch="" +if test "$cross_compiling" = no; then +case $host_cpu in + i[3456]86*|x86_64*) # use cpuid codes, in part from x86info-1.7 by D. Jones + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 1 output" >&5 +echo $ECHO_N "checking for x86 cpuid 1 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_1+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_1=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 1, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_1=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_1=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_1" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_1" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + case $ax_cv_gcc_x86_cpuid_0 in + *:756e6547:*:*) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *5[48]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; + *5??:*:*:*) ax_gcc_arch=pentium ;; + *6[3456]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; + *6a?:*[01]:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; + *6a?:*[234]:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; + *6[9d]?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; + *6[78b]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; + *6??:*:*:*) ax_gcc_arch=pentiumpro ;; + *f3[347]:*:*:*|*f41347:*:*:*) + case $host_cpu in + x86_64*) ax_gcc_arch="nocona pentium4 pentiumpro" ;; + *) ax_gcc_arch="prescott pentium4 pentiumpro" ;; + esac ;; + *f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro";; + esac ;; + *:68747541:*:*) # AMD + case $ax_cv_gcc_x86_cpuid_1 in + *5[67]?:*:*:*) ax_gcc_arch=k6 ;; + *5[8d]?:*:*:*) ax_gcc_arch="k6-2 k6" ;; + *5[9]?:*:*:*) ax_gcc_arch="k6-3 k6" ;; + *60?:*:*:*) ax_gcc_arch=k7 ;; + *6[12]?:*:*:*) ax_gcc_arch="athlon k7" ;; + *6[34]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;; + *67?:*:*:*) ax_gcc_arch="athlon-4 athlon k7" ;; + *6[68a]?:*:*:*) + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +echo "$as_me:$LINENO: checking for x86 cpuid 0x80000006 output" >&5 +echo $ECHO_N "checking for x86 cpuid 0x80000006 output... $ECHO_C" >&6 +if test "${ax_cv_gcc_x86_cpuid_0x80000006+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + ax_cv_gcc_x86_cpuid_0x80000006=unknown +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <stdio.h> +int +main () +{ + + int op = 0x80000006, eax, ebx, ecx, edx; + FILE *f; + __asm__("cpuid" + : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op)); + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; + + ; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ax_cv_gcc_x86_cpuid_0x80000006=`cat conftest_cpuid`; rm -f conftest_cpuid +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ax_cv_gcc_x86_cpuid_0x80000006=unknown; rm -f conftest_cpuid +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi +echo "$as_me:$LINENO: result: $ax_cv_gcc_x86_cpuid_0x80000006" >&5 +echo "${ECHO_T}$ax_cv_gcc_x86_cpuid_0x80000006" >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + # L2 cache size + case $ax_cv_gcc_x86_cpuid_0x80000006 in + *:*:*[1-9a-f]??????:*) # (L2 = ecx >> 16) >= 256 + ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; + *) ax_gcc_arch="athlon-4 athlon k7" ;; + esac ;; + *f[4cef8b]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; + *f5?:*:*:*) ax_gcc_arch="opteron k8" ;; + *f7?:*:*:*) ax_gcc_arch="athlon-fx opteron k8" ;; + *f??:*:*:*) ax_gcc_arch="k8" ;; + esac ;; + *:746e6543:*:*) # IDT + case $ax_cv_gcc_x86_cpuid_1 in + *54?:*:*:*) ax_gcc_arch=winchip-c6 ;; + *58?:*:*:*) ax_gcc_arch=winchip2 ;; + *6[78]?:*:*:*) ax_gcc_arch=c3 ;; + *69?:*:*:*) ax_gcc_arch="c3-2 c3" ;; + esac ;; + esac + if test x"$ax_gcc_arch" = x; then # fallback + case $host_cpu in + i586*) ax_gcc_arch=pentium ;; + i686*) ax_gcc_arch=pentiumpro ;; + esac + fi + ;; + + sparc*) + # Extract the first word of "prtdiag", so it can be a program name with args. +set dummy prtdiag; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PRTDIAG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PRTDIAG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PRTDIAG="$PRTDIAG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PRTDIAG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_PRTDIAG" && ac_cv_path_PRTDIAG="prtdiag" + ;; +esac +fi +PRTDIAG=$ac_cv_path_PRTDIAG + +if test -n "$PRTDIAG"; then + echo "$as_me:$LINENO: result: $PRTDIAG" >&5 +echo "${ECHO_T}$PRTDIAG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` + cputype=`echo "$cputype" | tr -d ' -' |tr $as_cr_LETTERS $as_cr_letters` + case $cputype in + *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; + *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; + *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;; + *supersparc*|*tms390z5[05]*) ax_gcc_arch="supersparc v8" ;; + *hypersparc*|*rt62[056]*) ax_gcc_arch="hypersparc v8" ;; + *cypress*) ax_gcc_arch=cypress ;; + esac ;; + + alphaev5) ax_gcc_arch=ev5 ;; + alphaev56) ax_gcc_arch=ev56 ;; + alphapca56) ax_gcc_arch="pca56 ev56" ;; + alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;; + alphaev6) ax_gcc_arch=ev6 ;; + alphaev67) ax_gcc_arch=ev67 ;; + alphaev68) ax_gcc_arch="ev68 ev67" ;; + alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;; + alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;; + alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;; + + powerpc*) + cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | sed 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null` + cputype=`echo $cputype | sed -e 's/ppc//g;s/ *//g'` + case $cputype in + *750*) ax_gcc_arch="750 G3" ;; + *740[0-9]*) ax_gcc_arch="$cputype 7400 G4" ;; + *74[4-5][0-9]*) ax_gcc_arch="$cputype 7450 G4" ;; + *74[0-9][0-9]*) ax_gcc_arch="$cputype G4" ;; + *970*) ax_gcc_arch="970 G5 power4";; + *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; + *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; + 603ev|8240) ax_gcc_arch="$cputype 603e 603";; + *) ax_gcc_arch=$cputype ;; + esac + ax_gcc_arch="$ax_gcc_arch powerpc" + ;; +esac +fi # not cross-compiling +fi # guess arch + +if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then +for arch in $ax_gcc_arch; do + if test "x$acx_maxopt_portable" = xyes; then # if we require portable code + flags="-mtune=$arch" + # -mcpu=$arch and m$arch generate nonportable code on every arch except + # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. + case $host_cpu in i*86|x86_64*) flags="$flags -mcpu=$arch -m$arch";; esac + else + flags="-march=$arch -mcpu=$arch -m$arch" + fi + for flag in $flags; do + echo "$as_me:$LINENO: checking whether C compiler accepts $flag" >&5 +echo $ECHO_N "checking whether C compiler accepts $flag... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$flag" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$flag" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$flag" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + ax_cv_gcc_archflag=$flag; break +else + : +fi + + done + test "x$ax_cv_gcc_archflag" = xunknown || break +done +fi + +fi # $GCC=yes + +fi + +echo "$as_me:$LINENO: checking for gcc architecture flag" >&5 +echo $ECHO_N "checking for gcc architecture flag... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $ax_cv_gcc_archflag" >&5 +echo "${ECHO_T}$ax_cv_gcc_archflag" >&6 +if test "x$ax_cv_gcc_archflag" = xunknown; then + : +else + CFLAGS="$CFLAGS $ax_cv_gcc_archflag" +fi + + ;; + esac + + if test -z "$CFLAGS"; then + echo "" + echo "********************************************************" + echo "* WARNING: Don't know the best CFLAGS for this system *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "* (otherwise, a default of CFLAGS=-O3 will be used) *" + echo "********************************************************" + echo "" + CFLAGS="-O3" + fi + + echo "$as_me:$LINENO: checking whether C compiler accepts $CFLAGS" >&5 +echo $ECHO_N "checking whether C compiler accepts $CFLAGS... $ECHO_C" >&6 +ax_save_FLAGS=$CFLAGS + CFLAGS="$CFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval `echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh`=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_save_FLAGS +eval ax_check_compiler_flags=$`echo "ax_cv_c_flags_$CFLAGS" | $as_tr_sh` +echo "$as_me:$LINENO: result: $ax_check_compiler_flags" >&5 +echo "${ECHO_T}$ax_check_compiler_flags" >&6 +if test "x$ax_check_compiler_flags" = xyes; then + : +else + + echo "" + echo "********************************************************" + echo "* WARNING: The guessed CFLAGS don't seem to work with *" + echo "* your compiler. *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "********************************************************" + echo "" + CFLAGS="" + +fi + + +fi + + # Check whether --enable-kernel-linux or --disable-kernel-linux was given. if test "${enable_kernel_linux+set}" = set; then enableval="$enable_kernel_linux" @@ -2520,7 +3611,6 @@ - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6590,7 +7680,132 @@ fi done +echo "$as_me:$LINENO: checking for library containing inet_addr" >&5 +echo $ECHO_N "checking for library containing inet_addr... $ECHO_C" >&6 +if test "${ac_cv_search_inet_addr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_inet_addr=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inet_addr (); +int +main () +{ +inet_addr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_inet_addr="none required" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_inet_addr" = no; then + for ac_lib in nsl; do + LIBS="-l$ac_lib -lsocket $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inet_addr (); +int +main () +{ +inet_addr (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_inet_addr="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_inet_addr" >&5 +echo "${ECHO_T}$ac_cv_search_inet_addr" >&6 +if test "$ac_cv_search_inet_addr" != no; then + test "$ac_cv_search_inet_addr" = "none required" || LIBS="$ac_cv_search_inet_addr $LIBS" + +fi + if test "x$ac_cv_func_socket" = "xno"; then echo "$as_me:$LINENO: checking for socket in -lsocket" >&5 @@ -7023,8 +8238,9 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_X86 1 _ACEOF -;; - * ) + + ;; + *) # CPU_RISC is only supported for big endian machines. if test "$ac_cv_c_bigendian" = "yes"; then @@ -7040,7 +8256,39 @@ fi ;; esac +case "$host" in + *-solaris2* ) + IN_LINE="" + ;; + x86_64*linux-gnu ) + IN_LINE=inline + if test "x${ax_cv_c_compiler_vendor}" = xgnu ; then + CFLAGS="$CFLAGS -fPIC" + fi + if test "x${ax_cv_c_compiler_vendor}" = xsun ; then + CFLAGS="$CFLAGS -DPIC -KPIC" + fi + ;; + *) + IN_LINE=inline + ;; +esac + +cat >>confdefs.h <<_ACEOF +#define inline $IN_LINE +_ACEOF + + +case $ax_cv_c_compiler_vendor in + sun ) + CFLAGS="$CFLAGS -v -mt" + ;; + gnu ) + CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops" + ;; +esac + case $host_os in *cygwin*|*mingw* ) EXE=.exe;; @@ -7799,6 +9047,7 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@PRTDIAG@,$PRTDIAG,;t t s,@RNG_OBJS@,$RNG_OBJS,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t Added: freeswitch/branches/cypromis/trunk/libs/srtp/configure.ac ============================================================================== --- (empty file) +++ freeswitch/branches/cypromis/trunk/libs/srtp/configure.ac Tue Aug 1 03:49:17 2006 @@ -0,0 +1,232 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT(srtp) + +#Set main language +dnl Checks for programs. +AC_PROG_RANLIB +AC_PROG_CC +AC_PROG_INSTALL + +#check compiler vendor +AX_COMPILER_VENDOR +AX_CC_MAXOPT + +AC_ARG_ENABLE(kernel-linux, + [AS_HELP_STRING([--enable-kernel-linux], + [build library to run in Linux kernel context])], + [], enable_kernel_linux=no) +AC_MSG_CHECKING(whether to build for Linux kernel context) +if test "$enable_kernel_linux" = "yes"; then + AC_DEFINE(SRTP_KERNEL, 1, + [Define to compile for kernel contexts.]) + AC_DEFINE(SRTP_KERNEL_LINUX, 1, + [Define to compile for Linux kernel context.]) +fi +AC_MSG_RESULT($enable_kernel_linux) + +if test "$cross_compiling" != yes; then + dnl Check for /dev/urandom + AC_CHECK_FILE(/dev/urandom, DEV_URANDOM=/dev/urandom, + [AC_CHECK_FILE(/dev/random, DEV_URANDOM=/dev/random)]) +fi + +AC_MSG_CHECKING(which random device to use) +if test "$enable_kernel_linux" = "yes"; then + RNG_OBJS=rand_linux_kernel.o + AC_MSG_RESULT([Linux kernel builtin]) +else + RNG_OBJS=rand_source.o + if test -n "$DEV_URANDOM"; then + AC_DEFINE_UNQUOTED(DEV_URANDOM, "$DEV_URANDOM",[Path to random device]) + AC_MSG_RESULT([$DEV_URANDOM]) + else + AC_MSG_RESULT([standard rand() function...]) + fi +fi +AC_SUBST(RNG_OBJS) + + +dnl Checks for header files. +AC_HEADER_STDC +AC_CHECK_HEADERS(stdlib.h) +AC_CHECK_HEADERS(unistd.h) +AC_CHECK_HEADERS(byteswap.h) +AC_CHECK_HEADERS(stdint.h) +AC_CHECK_HEADERS(sys/uio.h) +AC_CHECK_HEADERS(inttypes.h) +AC_CHECK_HEADERS(sys/types.h) +AC_CHECK_HEADERS(machine/types.h) +AC_CHECK_HEADERS(sys/int_types.h) + +dnl socket() and friends +AC_CHECK_HEADERS(sys/socket.h netinet/in.h arpa/inet.h) +AC_CHECK_HEADERS(windows.h, [AC_CHECK_HEADERS(winsock2.h)]) + +AC_CHECK_HEADERS(syslog.h) + +AC_CHECK_TYPES([int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,uint64_t]) +AC_CHECK_SIZEOF(unsigned long) +AC_CHECK_SIZEOF(unsigned long long) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_TYPE_SIZE_T + +dnl Checks for library functions. +AC_CHECK_FUNCS(socket inet_aton usleep) +AC_SEARCH_LIBS([inet_addr], [nsl],,,[-lsocket]) +dnl Find socket function if not found yet. +if test "x$ac_cv_func_socket" = "xno"; then + AC_CHECK_LIB(socket, socket) + AC_MSG_CHECKING([for socket in -lwsock32]) + SAVELIBS="$LIBS" + LIBS="$LIBS -lwsock32" + AC_TRY_LINK([ +#include <winsock2.h> +],[ +socket(0, 0, 0); +], + ac_cv_func_socket=yes + AC_MSG_RESULT(yes), + LIBS="$SAVELIBS" + AC_MSG_RESULT(no)) +fi + +dnl Check the byte order +AC_C_BIGENDIAN + +AC_CANONICAL_HOST + +dnl check host_cpu type, set defines appropriately +case $host_cpu in + i*86 ) + AC_DEFINE(CPU_CISC, 1, + [Define if building for a CISC machine (e.g. Intel).]) + AC_DEFINE(HAVE_X86, 1, + [Define to use X86 inlined assembly code]);; + * ) + # CPU_RISC is only supported for big endian machines. + if test "$ac_cv_c_bigendian" = "yes"; then + AC_DEFINE(CPU_RISC, 1, + [Define if building for a RISC machine (assume slow byte access).]) + else + AC_DEFINE(CPU_CISC, 1) + fi + ;; +esac +case "$host" in + *-solaris2* ) + IN_LINE="" + ;; + x86_64*linux-gnu ) + IN_LINE=inline + if test "x${ax_cv_c_compiler_vendor}" = xgnu ; then + CFLAGS="$CFLAGS -fPIC" + fi + if test "x${ax_cv_c_compiler_vendor}" = xsun ; then + CFLAGS="$CFLAGS -DPIC -KPIC" + fi + + * ) + IN_LINE=inline + ;; +esac +AC_DEFINE_UNQUOTED([inline],[$IN_LINE],[inline seems whacked on solaris]) + +dnl Compiler specifics ... +case $ax_cv_c_compiler_vendor in + sun ) + CFLAGS="$CFLAGS -v -mt" + ;; + gnu ) + CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops" + ;; +esac + +dnl Check if we're on a Windows platform. +case $host_os in + *cygwin*|*mingw* ) + EXE=.exe;; + * ) EXE="";; +esac + +AC_SUBST(EXE) # define executable suffix; this is needed for `make clean' + +AC_MSG_CHECKING(whether to compile in debugging) +AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--disable-debug], + [do not compile in dynamic debugging system])], + [], enable_debug=yes) +if test "$enable_debug" = "yes"; then + AC_DEFINE(ENABLE_DEBUGGING, 1, + [Define to compile in dynamic debugging system.]) +fi +AC_MSG_RESULT($enable_debug) + +AC_MSG_CHECKING(whether to use ISMAcryp code) +AC_ARG_ENABLE(generic-aesicm, + [AS_HELP_STRING([--enable-generic-aesicm], + [compile in changes for ISMAcryp])], + [], enable_generic_aesicm=no) +if test "$enable_generic_aesicm" = "yes"; then + AC_DEFINE(GENERIC_AESICM, 1, [Define this to use ISMAcryp code.]) +fi +AC_MSG_RESULT($enable_generic_aesicm) + +AC_MSG_CHECKING(whether to use syslog for error reporting) +AC_ARG_ENABLE(syslog, + [AS_HELP_STRING([--enable-syslog], [use syslog for error reporting])], + [], enable_syslog=no) +if test "$enable_syslog" = "yes"; then + AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog logging.]) +fi +AC_MSG_RESULT($enable_syslog) + +AC_MSG_CHECKING(whether to use stdout for error reporting) +AC_ARG_ENABLE(stdout, + [AS_HELP_STRING([--disable-stdout], [don't use stdout for error reporting])], + [], enable_stdout=yes) +if test "$enable_stdout" = "yes"; then + AC_DEFINE(ERR_REPORTING_STDOUT, 1, [Define to use logging to stdout.]) +fi +AC_MSG_RESULT($enable_stdout) + +AC_MSG_CHECKING(whether to use /dev/console for error reporting) +AC_ARG_ENABLE(console, + [AS_HELP_STRING([--enable-console], [use /dev/console for error reporting])], + [], enable_console=no) +if test "$enable_console" = "yes"; then + AC_DEFINE(USE_ERR_REPORTING_FILE, 1, [Write errors to this file]) + AC_DEFINE(ERR_REPORTING_FILE, "/dev/console", [Report errors to this file.]) +fi +AC_MSG_RESULT($enable_console) + +AC_MSG_CHECKING(whether to use GDOI key management) +AC_ARG_ENABLE(gdoi, + [AS_HELP_STRING([--enable-gdoi], [enable GDOI key management])], + [], enable_gdoi=no) +if test "$enable_gdoi" = "yes"; then + AC_DEFINE(SRTP_GDOI, 1, [Define to use GDOI.]) + GDOI_OBJS=gdoi/srtp+gdoi.o + AC_SUBST(GDOI_OBJS) +fi +AC_MSG_RESULT($enable_gdoi) + +AC_CONFIG_HEADER(crypto/include/config.h:config_in.h) + +AC_OUTPUT(Makefile crypto/Makefile doc/Makefile) + +# This is needed when building outside the source dir. +AS_MKDIR_P(crypto/ae_xfm) +AS_MKDIR_P(crypto/cipher) +AS_MKDIR_P(crypto/hash) +AS_MKDIR_P(crypto/kernel) +AS_MKDIR_P(crypto/math) +AS_MKDIR_P(crypto/replay) +AS_MKDIR_P(crypto/rng) +AS_MKDIR_P(crypto/test) +AS_MKDIR_P(doc) +AS_MKDIR_P(srtp) +AS_MKDIR_P(tables) +AS_MKDIR_P(test) Modified: freeswitch/branches/cypromis/trunk/libs/srtp/configure.in ============================================================================== Modified: freeswitch/branches/cypromis/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj ============================================================================== --- freeswitch/branches/cypromis/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj (original) +++ freeswitch/branches/cypromis/trunk/mac/xcode/FreeSWITCH.xcodeproj/project.pbxproj Tue Aug 1 03:49:17 2006 @@ -33,6 +33,11 @@ D33DFADC0A76E0A200E49B16 /* PBXTargetDependency */, D3B407500A76EEE9000AF6D4 /* PBXTargetDependency */, D315301B0A76F28800549119 /* PBXTargetDependency */, + D3AA5D760A77D61E008F105E /* PBXTargetDependency */, + D3E66AE70A77E65800D04E25 /* PBXTargetDependency */, + D3E66AFA0A77E70500D04E25 /* PBXTargetDependency */, + D3E66B330A77E82600D04E25 /* PBXTargetDependency */, + D3E66B350A77E82B00D04E25 /* PBXTargetDependency */, ); name = "Build Modules"; productName = Modules; @@ -145,6 +150,7 @@ D301521E0A76ECFC00117F59 /* vq_sse.h in Headers */ = {isa = PBXBuildFile; fileRef = D30151CE0A76ECFC00117F59 /* vq_sse.h */; }; D301521F0A76ECFC00117F59 /* vq.c in Sources */ = {isa = PBXBuildFile; fileRef = D30151CF0A76ECFC00117F59 /* vq.c */; }; D30152200A76ECFC00117F59 /* vq.h in Headers */ = {isa = PBXBuildFile; fileRef = D30151D00A76ECFC00117F59 /* vq.h */; }; + D30DE7670A7819B300C8AAD5 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; D3152F8E0A76F19900549119 /* pa_mac_core.c in Sources */ = {isa = PBXBuildFile; fileRef = D3152F8D0A76F19900549119 /* pa_mac_core.c */; }; D3152F950A76F1C300549119 /* pa_convert.c in Sources */ = {isa = PBXBuildFile; fileRef = D3152F8F0A76F1C300549119 /* pa_convert.c */; }; D3152F960A76F1C300549119 /* pa_host.h in Headers */ = {isa = PBXBuildFile; fileRef = D3152F900A76F1C300549119 /* pa_host.h */; }; @@ -492,6 +498,16 @@ D38DD5590A768CC700FEDB19 /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; D38DD55A0A768CCB00FEDB19 /* speakup.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5400A768C0900FEDB19 /* speakup.framework */; }; D38DD55C0A768CD600FEDB19 /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3AA5D200A77D53D008F105E /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3AA5D210A77D53D008F105E /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3AA5D220A77D53D008F105E /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; + D3AA5D230A77D53D008F105E /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; + D3AA5D240A77D53D008F105E /* libfreeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37671650A75F0DC00ACC1FB /* libfreeswitch.framework */; }; + D3AA5D250A77D53D008F105E /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3AA5D260A77D53D008F105E /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; + D3AA5D290A77D54A008F105E /* exosip2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F692020A77C51B007E38CA /* exosip2.framework */; }; + D3AA5D2A0A77D54A008F105E /* osip2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F690FD0A77C002007E38CA /* osip2.framework */; }; + D3AA5D2B0A77D54A008F105E /* osipparser2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F6914C0A77C203007E38CA /* osipparser2.framework */; }; D3AD47610A76D0D5002A2191 /* au.c in Sources */ = {isa = PBXBuildFile; fileRef = D3AD475E0A76D0D5002A2191 /* au.c */; }; D3AD47620A76D0D5002A2191 /* broadcast.c in Sources */ = {isa = PBXBuildFile; fileRef = D3AD475F0A76D0D5002A2191 /* broadcast.c */; }; D3AD47630A76D0D5002A2191 /* g72x.c in Sources */ = {isa = PBXBuildFile; fileRef = D3AD47600A76D0D5002A2191 /* g72x.c */; }; @@ -674,6 +690,31 @@ D3BC34F10A76B17800DE971E /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; D3BC34F20A76B17800DE971E /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; D3BC34F30A76B17800DE971E /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3BF925D0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF925E0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF925F0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92600A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92610A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92620A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92630A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92640A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92650A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92660A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92670A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92680A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92690A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926A0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926B0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926C0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926D0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926E0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF926F0A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92700A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92710A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92720A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92730A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92740A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; + D3BF92750A77F7FA00BEDBC8 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3BF925C0A77F7FA00BEDBC8 /* System.framework */; }; D3DEC5F60A75D048002001CF /* apr_cpystrn.c in Sources */ = {isa = PBXBuildFile; fileRef = D3DEC5BB0A75CFB7002001CF /* apr_cpystrn.c */; }; D3DEC5F70A75D048002001CF /* apr_fnmatch.c in Sources */ = {isa = PBXBuildFile; fileRef = D3DEC5BC0A75CFB7002001CF /* apr_fnmatch.c */; }; D3DEC5F80A75D048002001CF /* apr_getpass.c in Sources */ = {isa = PBXBuildFile; fileRef = D3DEC5A00A75CFB7002001CF /* apr_getpass.c */; }; @@ -891,6 +932,214 @@ D3DEC9D50A75E409002001CF /* iksemel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8A50A75DFDE002001CF /* iksemel.framework */; }; D3DEC9DC0A75E424002001CF /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; D3DECA120A75E429002001CF /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3E3E9BC0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9BD0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9BE0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9BF0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C00A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C10A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C20A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C30A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C40A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C50A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C60A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C70A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C80A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9C90A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CA0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CB0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CC0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CD0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CE0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9CF0A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9D00A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9D10A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9D20A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9D30A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E3E9D40A786E4600DBE6EB /* bundle1.o in Frameworks */ = {isa = PBXBuildFile; fileRef = D3E3E9BB0A786E4600DBE6EB /* bundle1.o */; }; + D3E66A360A77D9DC00D04E25 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691440A77C199007E38CA /* config.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3E66A800A77E63C00D04E25 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; + D3E66A810A77E63C00D04E25 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3E66A820A77E63C00D04E25 /* libfreeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37671650A75F0DC00ACC1FB /* libfreeswitch.framework */; }; + D3E66A830A77E63C00D04E25 /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; + D3E66A840A77E63C00D04E25 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; + D3E66A850A77E63C00D04E25 /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3E66A860A77E63C00D04E25 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3E66AE40A77E64A00D04E25 /* mod_woomera.c in Sources */ = {isa = PBXBuildFile; fileRef = D3E66A7B0A77E61E00D04E25 /* mod_woomera.c */; }; + D3E66AF70A77E6ED00D04E25 /* mod_syslog.c in Sources */ = {isa = PBXBuildFile; fileRef = D3E66AF60A77E6ED00D04E25 /* mod_syslog.c */; }; + D3E66B160A77E7B300D04E25 /* mod_event_multicast.c in Sources */ = {isa = PBXBuildFile; fileRef = D3E66B150A77E7B300D04E25 /* mod_event_multicast.c */; }; + D3E66B180A77E7C600D04E25 /* mod_event_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = D3E66B170A77E7C600D04E25 /* mod_event_socket.c */; }; + D3E66B190A77E7F400D04E25 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; + D3E66B1A0A77E7F400D04E25 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3E66B1B0A77E7F400D04E25 /* libfreeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37671650A75F0DC00ACC1FB /* libfreeswitch.framework */; }; + D3E66B1C0A77E7F400D04E25 /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; + D3E66B1D0A77E7F400D04E25 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; + D3E66B1E0A77E7F400D04E25 /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3E66B1F0A77E7F400D04E25 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3E66B200A77E7FC00D04E25 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; + D3E66B210A77E7FC00D04E25 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3E66B220A77E7FC00D04E25 /* libfreeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37671650A75F0DC00ACC1FB /* libfreeswitch.framework */; }; + D3E66B230A77E7FC00D04E25 /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; + D3E66B240A77E7FC00D04E25 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; + D3E66B250A77E7FC00D04E25 /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3E66B260A77E7FC00D04E25 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3E66B270A77E80400D04E25 /* apr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC21D0A75CB06002001CF /* apr.framework */; }; + D3E66B280A77E80400D04E25 /* aprutil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC6CF0A75D4E9002001CF /* aprutil.framework */; }; + D3E66B290A77E80400D04E25 /* libfreeswitch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37671650A75F0DC00ACC1FB /* libfreeswitch.framework */; }; + D3E66B2A0A77E80400D04E25 /* resample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD5260A768B6100FEDB19 /* resample.framework */; }; + D3E66B2B0A77E80400D04E25 /* sqlite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37670C50A75ECD400ACC1FB /* sqlite.framework */; }; + D3E66B2C0A77E80400D04E25 /* srtp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D38DD4DF0A768AC500FEDB19 /* srtp.framework */; }; + D3E66B2D0A77E80400D04E25 /* teletone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3DEC8310A75DA10002001CF /* teletone.framework */; }; + D3F691200A77C12E007E38CA /* fsm_misc.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6910C0A77C12E007E38CA /* fsm_misc.c */; }; + D3F691210A77C12E007E38CA /* fsm.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6910D0A77C12E007E38CA /* fsm.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691220A77C12E007E38CA /* ict_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6910E0A77C12E007E38CA /* ict_fsm.c */; }; + D3F691230A77C12E007E38CA /* ict.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6910F0A77C12E007E38CA /* ict.c */; }; + D3F691240A77C12E007E38CA /* ist_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691100A77C12E007E38CA /* ist_fsm.c */; }; + D3F691250A77C12E007E38CA /* ist.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691110A77C12E007E38CA /* ist.c */; }; + D3F691260A77C12E007E38CA /* nict_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691120A77C12E007E38CA /* nict_fsm.c */; }; + D3F691270A77C12E007E38CA /* nict.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691130A77C12E007E38CA /* nict.c */; }; + D3F691280A77C12E007E38CA /* nist_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691140A77C12E007E38CA /* nist_fsm.c */; }; + D3F691290A77C12E007E38CA /* nist.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691150A77C12E007E38CA /* nist.c */; }; + D3F6912A0A77C12E007E38CA /* osip_dialog.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691160A77C12E007E38CA /* osip_dialog.c */; }; + D3F6912B0A77C12E007E38CA /* osip_event.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691170A77C12E007E38CA /* osip_event.c */; }; + D3F6912C0A77C12E007E38CA /* osip_time.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691180A77C12E007E38CA /* osip_time.c */; }; + D3F6912D0A77C12E007E38CA /* osip_transaction.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691190A77C12E007E38CA /* osip_transaction.c */; }; + D3F6912E0A77C12E007E38CA /* osip.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6911A0A77C12E007E38CA /* osip.c */; }; + D3F6912F0A77C12E007E38CA /* port_condv.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6911B0A77C12E007E38CA /* port_condv.c */; }; + D3F691300A77C12E007E38CA /* port_fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6911C0A77C12E007E38CA /* port_fifo.c */; }; + D3F691310A77C12E007E38CA /* port_sema.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6911D0A77C12E007E38CA /* port_sema.c */; }; + D3F691320A77C12E007E38CA /* port_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6911E0A77C12E007E38CA /* port_thread.c */; }; + D3F691330A77C12E007E38CA /* xixt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6911F0A77C12E007E38CA /* xixt.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6913B0A77C15A007E38CA /* internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691340A77C15A007E38CA /* internal.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6913C0A77C15A007E38CA /* osip_condv.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691350A77C15A007E38CA /* osip_condv.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6913D0A77C15A007E38CA /* osip_dialog.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691360A77C15A007E38CA /* osip_dialog.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6913E0A77C15A007E38CA /* osip_fifo.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691370A77C15A007E38CA /* osip_fifo.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6913F0A77C15A007E38CA /* osip_mt.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691380A77C15A007E38CA /* osip_mt.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691400A77C15A007E38CA /* osip_time.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691390A77C15A007E38CA /* osip_time.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691410A77C15A007E38CA /* osip.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6913A0A77C15A007E38CA /* osip.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691450A77C199007E38CA /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691440A77C199007E38CA /* config.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691820A77C3E3007E38CA /* osip_accept_encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6915B0A77C3E3007E38CA /* osip_accept_encoding.c */; }; + D3F691830A77C3E3007E38CA /* osip_accept_language.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6915C0A77C3E3007E38CA /* osip_accept_language.c */; }; + D3F691840A77C3E3007E38CA /* osip_accept.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6915D0A77C3E3007E38CA /* osip_accept.c */; }; + D3F691850A77C3E3007E38CA /* osip_alert_info.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6915E0A77C3E3007E38CA /* osip_alert_info.c */; }; + D3F691860A77C3E3007E38CA /* osip_allow.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6915F0A77C3E3007E38CA /* osip_allow.c */; }; + D3F691870A77C3E3007E38CA /* osip_authentication_info.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691600A77C3E3007E38CA /* osip_authentication_info.c */; }; + D3F691880A77C3E3007E38CA /* osip_authorization.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691610A77C3E3007E38CA /* osip_authorization.c */; }; + D3F691890A77C3E3007E38CA /* osip_body.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691620A77C3E3007E38CA /* osip_body.c */; }; + D3F6918A0A77C3E3007E38CA /* osip_call_id.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691630A77C3E3007E38CA /* osip_call_id.c */; }; + D3F6918B0A77C3E3007E38CA /* osip_call_info.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691640A77C3E3007E38CA /* osip_call_info.c */; }; + D3F6918C0A77C3E3007E38CA /* osip_contact.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691650A77C3E3007E38CA /* osip_contact.c */; }; + D3F6918D0A77C3E3007E38CA /* osip_content_disposition.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691660A77C3E3007E38CA /* osip_content_disposition.c */; }; + D3F6918E0A77C3E3007E38CA /* osip_content_encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691670A77C3E3007E38CA /* osip_content_encoding.c */; }; + D3F6918F0A77C3E3007E38CA /* osip_content_length.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691680A77C3E3007E38CA /* osip_content_length.c */; }; + D3F691900A77C3E3007E38CA /* osip_content_type.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691690A77C3E3007E38CA /* osip_content_type.c */; }; + D3F691910A77C3E3007E38CA /* osip_cseq.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916A0A77C3E3007E38CA /* osip_cseq.c */; }; + D3F691920A77C3E3007E38CA /* osip_error_info.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916B0A77C3E3007E38CA /* osip_error_info.c */; }; + D3F691930A77C3E3007E38CA /* osip_from.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916C0A77C3E3007E38CA /* osip_from.c */; }; + D3F691940A77C3E3007E38CA /* osip_header.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916D0A77C3E3007E38CA /* osip_header.c */; }; + D3F691950A77C3E3007E38CA /* osip_list.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916E0A77C3E3007E38CA /* osip_list.c */; }; + D3F691960A77C3E3007E38CA /* osip_md5c.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6916F0A77C3E3007E38CA /* osip_md5c.c */; }; + D3F691970A77C3E3007E38CA /* osip_message_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691700A77C3E3007E38CA /* osip_message_parse.c */; }; + D3F691980A77C3E3007E38CA /* osip_message_to_str.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691710A77C3E3007E38CA /* osip_message_to_str.c */; }; + D3F691990A77C3E3007E38CA /* osip_message.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691720A77C3E3007E38CA /* osip_message.c */; }; + D3F6919A0A77C3E3007E38CA /* osip_mime_version.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691730A77C3E3007E38CA /* osip_mime_version.c */; }; + D3F6919B0A77C3E3007E38CA /* osip_parser_cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691740A77C3E3007E38CA /* osip_parser_cfg.c */; }; + D3F6919C0A77C3E3007E38CA /* osip_port.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691750A77C3E3007E38CA /* osip_port.c */; }; + D3F6919D0A77C3E3007E38CA /* osip_proxy_authenticate.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691760A77C3E3007E38CA /* osip_proxy_authenticate.c */; }; + D3F6919E0A77C3E3007E38CA /* osip_proxy_authentication_info.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691770A77C3E3007E38CA /* osip_proxy_authentication_info.c */; }; + D3F6919F0A77C3E3007E38CA /* osip_proxy_authorization.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691780A77C3E3007E38CA /* osip_proxy_authorization.c */; }; + D3F691A00A77C3E3007E38CA /* osip_record_route.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691790A77C3E3007E38CA /* osip_record_route.c */; }; + D3F691A10A77C3E3007E38CA /* osip_route.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6917A0A77C3E3007E38CA /* osip_route.c */; }; + D3F691A20A77C3E3007E38CA /* osip_to.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6917B0A77C3E3007E38CA /* osip_to.c */; }; + D3F691A30A77C3E3007E38CA /* osip_uri.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6917C0A77C3E3007E38CA /* osip_uri.c */; }; + D3F691A40A77C3E3007E38CA /* osip_via.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6917D0A77C3E3007E38CA /* osip_via.c */; }; + D3F691A50A77C3E3007E38CA /* osip_www_authenticate.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6917E0A77C3E3007E38CA /* osip_www_authenticate.c */; }; + D3F691A60A77C3E3007E38CA /* parser.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6917F0A77C3E3007E38CA /* parser.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691A70A77C3E3007E38CA /* sdp_accessor.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691800A77C3E3007E38CA /* sdp_accessor.c */; }; + D3F691A80A77C3E3007E38CA /* sdp_message.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F691810A77C3E3007E38CA /* sdp_message.c */; }; + D3F691B30A77C442007E38CA /* osip_body.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691A90A77C442007E38CA /* osip_body.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B40A77C442007E38CA /* osip_const.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AA0A77C442007E38CA /* osip_const.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B50A77C442007E38CA /* osip_headers.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AB0A77C442007E38CA /* osip_headers.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B60A77C442007E38CA /* osip_list.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AC0A77C442007E38CA /* osip_list.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B70A77C442007E38CA /* osip_md5.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AD0A77C442007E38CA /* osip_md5.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B80A77C442007E38CA /* osip_message.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AE0A77C442007E38CA /* osip_message.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691B90A77C442007E38CA /* osip_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691AF0A77C442007E38CA /* osip_parser.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691BA0A77C442007E38CA /* osip_port.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691B00A77C442007E38CA /* osip_port.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691BB0A77C442007E38CA /* osip_uri.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691B10A77C442007E38CA /* osip_uri.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691BC0A77C442007E38CA /* sdp_message.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691B20A77C442007E38CA /* sdp_message.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691DA0A77C45F007E38CA /* osip_accept_encoding.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691BF0A77C45F007E38CA /* osip_accept_encoding.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691DB0A77C45F007E38CA /* osip_accept_language.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C00A77C45F007E38CA /* osip_accept_language.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691DC0A77C45F007E38CA /* osip_accept.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C10A77C45F007E38CA /* osip_accept.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F691DD0A77C45F007E38CA /* osip_alert_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C20A77C45F007E38CA /* osip_alert_info.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691DE0A77C45F007E38CA /* osip_allow.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C30A77C45F007E38CA /* osip_allow.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691DF0A77C45F007E38CA /* osip_authentication_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C40A77C45F007E38CA /* osip_authentication_info.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E00A77C45F007E38CA /* osip_authorization.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C50A77C45F007E38CA /* osip_authorization.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E10A77C45F007E38CA /* osip_call_id.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C60A77C45F007E38CA /* osip_call_id.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E20A77C45F007E38CA /* osip_call_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C70A77C45F007E38CA /* osip_call_info.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E30A77C45F007E38CA /* osip_contact.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C80A77C45F007E38CA /* osip_contact.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E40A77C45F007E38CA /* osip_content_disposition.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691C90A77C45F007E38CA /* osip_content_disposition.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E50A77C45F007E38CA /* osip_content_encoding.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CA0A77C45F007E38CA /* osip_content_encoding.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E60A77C45F007E38CA /* osip_content_length.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CB0A77C45F007E38CA /* osip_content_length.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E70A77C45F007E38CA /* osip_content_type.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CC0A77C45F007E38CA /* osip_content_type.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E80A77C45F007E38CA /* osip_cseq.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CD0A77C45F007E38CA /* osip_cseq.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691E90A77C45F007E38CA /* osip_error_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CE0A77C45F007E38CA /* osip_error_info.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691EA0A77C45F007E38CA /* osip_from.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691CF0A77C45F007E38CA /* osip_from.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691EB0A77C45F007E38CA /* osip_header.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D00A77C45F007E38CA /* osip_header.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691EC0A77C45F007E38CA /* osip_mime_version.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D10A77C45F007E38CA /* osip_mime_version.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691ED0A77C45F007E38CA /* osip_proxy_authenticate.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D20A77C45F007E38CA /* osip_proxy_authenticate.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691EE0A77C45F007E38CA /* osip_proxy_authentication_info.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D30A77C45F007E38CA /* osip_proxy_authentication_info.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691EF0A77C45F007E38CA /* osip_proxy_authorization.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D40A77C45F007E38CA /* osip_proxy_authorization.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F00A77C45F007E38CA /* osip_record_route.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D50A77C45F007E38CA /* osip_record_route.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F10A77C45F007E38CA /* osip_route.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D60A77C45F007E38CA /* osip_route.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F20A77C45F007E38CA /* osip_to.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D70A77C45F007E38CA /* osip_to.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F30A77C45F007E38CA /* osip_via.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D80A77C45F007E38CA /* osip_via.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F40A77C45F007E38CA /* osip_www_authenticate.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F691D90A77C45F007E38CA /* osip_www_authenticate.h */; settings = {ATTRIBUTES = (Private, ); }; }; + D3F691F90A77C4E4007E38CA /* osipparser2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F6914C0A77C203007E38CA /* osipparser2.framework */; }; + D3F6923A0A77C79F007E38CA /* eXcall_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6921B0A77C79E007E38CA /* eXcall_api.c */; }; + D3F6923B0A77C79F007E38CA /* eXconf.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6921C0A77C79E007E38CA /* eXconf.c */; }; + D3F6923C0A77C79F007E38CA /* eXinsubscription_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6921D0A77C79E007E38CA /* eXinsubscription_api.c */; }; + D3F6923D0A77C79F007E38CA /* eXmessage_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6921E0A77C79F007E38CA /* eXmessage_api.c */; }; + D3F6923E0A77C79F007E38CA /* eXoptions_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6921F0A77C79F007E38CA /* eXoptions_api.c */; }; + D3F6923F0A77C79F007E38CA /* eXosip.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692200A77C79F007E38CA /* eXosip.c */; }; + D3F692400A77C79F007E38CA /* eXosip2.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692210A77C79F007E38CA /* eXosip2.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692410A77C79F007E38CA /* eXpublish_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692220A77C79F007E38CA /* eXpublish_api.c */; }; + D3F692420A77C79F007E38CA /* eXrefer_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692230A77C79F007E38CA /* eXrefer_api.c */; }; + D3F692430A77C79F007E38CA /* eXregister_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692240A77C79F007E38CA /* eXregister_api.c */; }; + D3F692440A77C79F007E38CA /* eXsubscription_api.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692250A77C79F007E38CA /* eXsubscription_api.c */; }; + D3F692450A77C79F007E38CA /* eXtransport.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692260A77C79F007E38CA /* eXtransport.c */; }; + D3F692460A77C79F007E38CA /* eXutils.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692270A77C79F007E38CA /* eXutils.c */; }; + D3F692470A77C79F007E38CA /* inet_ntop.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692280A77C79F007E38CA /* inet_ntop.c */; }; + D3F692480A77C79F007E38CA /* inet_ntop.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692290A77C79F007E38CA /* inet_ntop.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692490A77C79F007E38CA /* jauth.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922A0A77C79F007E38CA /* jauth.c */; }; + D3F6924A0A77C79F007E38CA /* jcall.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922B0A77C79F007E38CA /* jcall.c */; }; + D3F6924B0A77C79F007E38CA /* jcallback.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922C0A77C79F007E38CA /* jcallback.c */; }; + D3F6924C0A77C79F007E38CA /* jdialog.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922D0A77C79F007E38CA /* jdialog.c */; }; + D3F6924D0A77C79F007E38CA /* jevents.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922E0A77C79F007E38CA /* jevents.c */; }; + D3F6924E0A77C79F007E38CA /* jnotify.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F6922F0A77C79F007E38CA /* jnotify.c */; }; + D3F6924F0A77C79F007E38CA /* jpipe.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692300A77C79F007E38CA /* jpipe.c */; }; + D3F692500A77C79F007E38CA /* jpipe.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692310A77C79F007E38CA /* jpipe.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692510A77C79F007E38CA /* jpublish.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692320A77C79F007E38CA /* jpublish.c */; }; + D3F692520A77C79F007E38CA /* jreg.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692330A77C79F007E38CA /* jreg.c */; }; + D3F692530A77C79F007E38CA /* jrequest.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692340A77C79F007E38CA /* jrequest.c */; }; + D3F692540A77C79F007E38CA /* jresponse.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692350A77C79F007E38CA /* jresponse.c */; }; + D3F692550A77C79F007E38CA /* jsubscribe.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692360A77C79F007E38CA /* jsubscribe.c */; }; + D3F692560A77C79F007E38CA /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692370A77C79F007E38CA /* misc.c */; }; + D3F692570A77C79F007E38CA /* sdp_offans.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692380A77C79F007E38CA /* sdp_offans.c */; }; + D3F692580A77C79F007E38CA /* udp.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F692390A77C79F007E38CA /* udp.c */; }; + D3F692620A77C7BE007E38CA /* eX_call.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692590A77C7BE007E38CA /* eX_call.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692630A77C7BE007E38CA /* eX_message.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925A0A77C7BE007E38CA /* eX_message.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692640A77C7BE007E38CA /* eX_options.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925B0A77C7BE007E38CA /* eX_options.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692650A77C7BE007E38CA /* eX_publish.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925C0A77C7BE007E38CA /* eX_publish.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692660A77C7BE007E38CA /* eX_refer.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925D0A77C7BE007E38CA /* eX_refer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692670A77C7BE007E38CA /* eX_register.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925E0A77C7BE007E38CA /* eX_register.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692680A77C7BE007E38CA /* eX_setup.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F6925F0A77C7BE007E38CA /* eX_setup.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692690A77C7BE007E38CA /* eX_subscribe.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692600A77C7BE007E38CA /* eX_subscribe.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F6926A0A77C7BE007E38CA /* eXosip.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692610A77C7BE007E38CA /* eXosip.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F692720A77C8A8007E38CA /* osip2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F690FD0A77C002007E38CA /* osip2.framework */; }; + D3F6927D0A77C8AE007E38CA /* osipparser2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3F6914C0A77C203007E38CA /* osipparser2.framework */; }; + D3F692B10A77CE99007E38CA /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D3F692B00A77CE99007E38CA /* config.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D3F693150A77D4D6007E38CA /* mod_exosip.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F693110A77D4D6007E38CA /* mod_exosip.c */; }; + D3F693160A77D4D6007E38CA /* osip_rfc3264.c in Sources */ = {isa = PBXBuildFile; fileRef = D3F693120A77D4D6007E38CA /* osip_rfc3264.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -1104,6 +1353,20 @@ remoteGlobalIDString = D38DD4400A7687A700FEDB19; remoteInfo = freeswitch; }; + D3AA5D750A77D61E008F105E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3F693060A77D473007E38CA; + remoteInfo = mod_exosip; + }; + D3AA5D770A77D62B008F105E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3F692010A77C51B007E38CA; + remoteInfo = exosip2; + }; D3B4074F0A76EEE9000AF6D4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -1223,6 +1486,34 @@ remoteGlobalIDString = D3DEC8300A75DA10002001CF; remoteInfo = teletone.framework; }; + D3E66AE60A77E65800D04E25 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3E66A7E0A77E62D00D04E25; + remoteInfo = mod_woomera; + }; + D3E66AF90A77E70500D04E25 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3E66AF10A77E6B400D04E25; + remoteInfo = mod_syslog; + }; + D3E66B320A77E82600D04E25 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3E66B070A77E73100D04E25; + remoteInfo = mod_event_multicast; + }; + D3E66B340A77E82B00D04E25 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3E66B0F0A77E76200D04E25; + remoteInfo = mod_event_socket; + }; D3EDD2A00A76D3C900AC4900 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; @@ -1230,6 +1521,27 @@ remoteGlobalIDString = D37671640A75F0DC00ACC1FB; remoteInfo = libfreeswitch; }; + D3F6927E0A77C8B0007E38CA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3F690FC0A77C002007E38CA; + remoteInfo = osip2; + }; + D3F692800A77C8B2007E38CA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3F6914B0A77C203007E38CA; + remoteInfo = osipparser2; + }; + D3F6928B0A77C979007E38CA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = D3F6914B0A77C203007E38CA; + remoteInfo = osipparser2; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1683,6 +1995,7 @@ D3BC34D20A76B03800DE971E /* mod_sndfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_sndfile.c; path = ../../src/mod/formats/mod_sndfile/mod_sndfile.c; sourceTree = SOURCE_ROOT; }; D3BC34E60A76B0FC00DE971E /* mod_console.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_console.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; D3BC34EA0A76B15900DE971E /* mod_console.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_console.c; path = ../../src/mod/loggers/mod_console/mod_console.c; sourceTree = SOURCE_ROOT; }; + D3BF925C0A77F7FA00BEDBC8 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; }; D3DEC21D0A75CB06002001CF /* apr.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = apr.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D3DEC21E0A75CB06002001CF /* apr.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = apr.plist; sourceTree = "<group>"; }; D3DEC48D0A75CF62002001CF /* apr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = apr.h; sourceTree = "<group>"; }; @@ -1988,6 +2301,171 @@ D3DECBA30A75E76E002001CF /* rand_gen.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rand_gen.c; sourceTree = "<group>"; }; D3DECBA50A75E76E002001CF /* sha1_driver.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sha1_driver.c; sourceTree = "<group>"; }; D3DECBA70A75E76E002001CF /* stat_driver.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = stat_driver.c; sourceTree = "<group>"; }; + D3E3E9BB0A786E4600DBE6EB /* bundle1.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; name = bundle1.o; path = /Developer/SDKs/MacOSX10.4u.sdk/usr/lib/bundle1.o; sourceTree = "<absolute>"; }; + D3E66A7B0A77E61E00D04E25 /* mod_woomera.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_woomera.c; path = ../../src/mod/endpoints/mod_woomera/mod_woomera.c; sourceTree = SOURCE_ROOT; }; + D3E66A7F0A77E62D00D04E25 /* mod_woomera.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_woomera.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + D3E66AF20A77E6B400D04E25 /* mod_syslog.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_syslog.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + D3E66AF60A77E6ED00D04E25 /* mod_syslog.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_syslog.c; path = ../../src/mod/loggers/mod_syslog/mod_syslog.c; sourceTree = SOURCE_ROOT; }; + D3E66B080A77E73100D04E25 /* mod_event_multicast.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_event_multicast.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + D3E66B100A77E76200D04E25 /* mod_event_socket.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_event_socket.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + D3E66B150A77E7B300D04E25 /* mod_event_multicast.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_event_multicast.c; path = ../../src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c; sourceTree = SOURCE_ROOT; }; + D3E66B170A77E7C600D04E25 /* mod_event_socket.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_event_socket.c; path = ../../src/mod/event_handlers/mod_event_socket/mod_event_socket.c; sourceTree = SOURCE_ROOT; }; + D3F690FD0A77C002007E38CA /* osip2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = osip2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D3F690FE0A77C002007E38CA /* osip2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = osip2.plist; sourceTree = "<group>"; }; + D3F6910C0A77C12E007E38CA /* fsm_misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fsm_misc.c; path = "../../libs/libosip2-2.2.3/src/osip2/fsm_misc.c"; sourceTree = SOURCE_ROOT; }; + D3F6910D0A77C12E007E38CA /* fsm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fsm.h; path = "../../libs/libosip2-2.2.3/src/osip2/fsm.h"; sourceTree = SOURCE_ROOT; }; + D3F6910E0A77C12E007E38CA /* ict_fsm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ict_fsm.c; path = "../../libs/libosip2-2.2.3/src/osip2/ict_fsm.c"; sourceTree = SOURCE_ROOT; }; + D3F6910F0A77C12E007E38CA /* ict.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ict.c; path = "../../libs/libosip2-2.2.3/src/osip2/ict.c"; sourceTree = SOURCE_ROOT; }; + D3F691100A77C12E007E38CA /* ist_fsm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ist_fsm.c; path = "../../libs/libosip2-2.2.3/src/osip2/ist_fsm.c"; sourceTree = SOURCE_ROOT; }; + D3F691110A77C12E007E38CA /* ist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ist.c; path = "../../libs/libosip2-2.2.3/src/osip2/ist.c"; sourceTree = SOURCE_ROOT; }; + D3F691120A77C12E007E38CA /* nict_fsm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = nict_fsm.c; path = "../../libs/libosip2-2.2.3/src/osip2/nict_fsm.c"; sourceTree = SOURCE_ROOT; }; + D3F691130A77C12E007E38CA /* nict.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = nict.c; path = "../../libs/libosip2-2.2.3/src/osip2/nict.c"; sourceTree = SOURCE_ROOT; }; + D3F691140A77C12E007E38CA /* nist_fsm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = nist_fsm.c; path = "../../libs/libosip2-2.2.3/src/osip2/nist_fsm.c"; sourceTree = SOURCE_ROOT; }; + D3F691150A77C12E007E38CA /* nist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = nist.c; path = "../../libs/libosip2-2.2.3/src/osip2/nist.c"; sourceTree = SOURCE_ROOT; }; + D3F691160A77C12E007E38CA /* osip_dialog.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_dialog.c; path = "../../libs/libosip2-2.2.3/src/osip2/osip_dialog.c"; sourceTree = SOURCE_ROOT; }; + D3F691170A77C12E007E38CA /* osip_event.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_event.c; path = "../../libs/libosip2-2.2.3/src/osip2/osip_event.c"; sourceTree = SOURCE_ROOT; }; + D3F691180A77C12E007E38CA /* osip_time.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_time.c; path = "../../libs/libosip2-2.2.3/src/osip2/osip_time.c"; sourceTree = SOURCE_ROOT; }; + D3F691190A77C12E007E38CA /* osip_transaction.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_transaction.c; path = "../../libs/libosip2-2.2.3/src/osip2/osip_transaction.c"; sourceTree = SOURCE_ROOT; }; + D3F6911A0A77C12E007E38CA /* osip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip.c; path = "../../libs/libosip2-2.2.3/src/osip2/osip.c"; sourceTree = SOURCE_ROOT; }; + D3F6911B0A77C12E007E38CA /* port_condv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = port_condv.c; path = "../../libs/libosip2-2.2.3/src/osip2/port_condv.c"; sourceTree = SOURCE_ROOT; }; + D3F6911C0A77C12E007E38CA /* port_fifo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = port_fifo.c; path = "../../libs/libosip2-2.2.3/src/osip2/port_fifo.c"; sourceTree = SOURCE_ROOT; }; + D3F6911D0A77C12E007E38CA /* port_sema.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = port_sema.c; path = "../../libs/libosip2-2.2.3/src/osip2/port_sema.c"; sourceTree = SOURCE_ROOT; }; + D3F6911E0A77C12E007E38CA /* port_thread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = port_thread.c; path = "../../libs/libosip2-2.2.3/src/osip2/port_thread.c"; sourceTree = SOURCE_ROOT; }; + D3F6911F0A77C12E007E38CA /* xixt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = xixt.h; path = "../../libs/libosip2-2.2.3/src/osip2/xixt.h"; sourceTree = SOURCE_ROOT; }; + D3F691340A77C15A007E38CA /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = internal.h; path = "../../libs/libosip2-2.2.3/include/osip2/internal.h"; sourceTree = SOURCE_ROOT; }; + D3F691350A77C15A007E38CA /* osip_condv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_condv.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip_condv.h"; sourceTree = SOURCE_ROOT; }; + D3F691360A77C15A007E38CA /* osip_dialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_dialog.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip_dialog.h"; sourceTree = SOURCE_ROOT; }; + D3F691370A77C15A007E38CA /* osip_fifo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_fifo.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip_fifo.h"; sourceTree = SOURCE_ROOT; }; + D3F691380A77C15A007E38CA /* osip_mt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_mt.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip_mt.h"; sourceTree = SOURCE_ROOT; }; + D3F691390A77C15A007E38CA /* osip_time.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_time.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip_time.h"; sourceTree = SOURCE_ROOT; }; + D3F6913A0A77C15A007E38CA /* osip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip.h; path = "../../libs/libosip2-2.2.3/include/osip2/osip.h"; sourceTree = SOURCE_ROOT; }; + D3F691440A77C199007E38CA /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../libs/libosip2-2.2.3/config.h"; sourceTree = SOURCE_ROOT; }; + D3F6914C0A77C203007E38CA /* osipparser2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = osipparser2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D3F6914D0A77C203007E38CA /* osipparser2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = osipparser2.plist; sourceTree = "<group>"; }; + D3F6915B0A77C3E3007E38CA /* osip_accept_encoding.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_accept_encoding.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_accept_encoding.c"; sourceTree = SOURCE_ROOT; }; + D3F6915C0A77C3E3007E38CA /* osip_accept_language.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_accept_language.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_accept_language.c"; sourceTree = SOURCE_ROOT; }; + D3F6915D0A77C3E3007E38CA /* osip_accept.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_accept.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_accept.c"; sourceTree = SOURCE_ROOT; }; + D3F6915E0A77C3E3007E38CA /* osip_alert_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_alert_info.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_alert_info.c"; sourceTree = SOURCE_ROOT; }; + D3F6915F0A77C3E3007E38CA /* osip_allow.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_allow.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_allow.c"; sourceTree = SOURCE_ROOT; }; + D3F691600A77C3E3007E38CA /* osip_authentication_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_authentication_info.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_authentication_info.c"; sourceTree = SOURCE_ROOT; }; + D3F691610A77C3E3007E38CA /* osip_authorization.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_authorization.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_authorization.c"; sourceTree = SOURCE_ROOT; }; + D3F691620A77C3E3007E38CA /* osip_body.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_body.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_body.c"; sourceTree = SOURCE_ROOT; }; + D3F691630A77C3E3007E38CA /* osip_call_id.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_call_id.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_call_id.c"; sourceTree = SOURCE_ROOT; }; + D3F691640A77C3E3007E38CA /* osip_call_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_call_info.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_call_info.c"; sourceTree = SOURCE_ROOT; }; + D3F691650A77C3E3007E38CA /* osip_contact.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_contact.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_contact.c"; sourceTree = SOURCE_ROOT; }; + D3F691660A77C3E3007E38CA /* osip_content_disposition.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_content_disposition.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_content_disposition.c"; sourceTree = SOURCE_ROOT; }; + D3F691670A77C3E3007E38CA /* osip_content_encoding.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_content_encoding.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_content_encoding.c"; sourceTree = SOURCE_ROOT; }; + D3F691680A77C3E3007E38CA /* osip_content_length.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_content_length.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_content_length.c"; sourceTree = SOURCE_ROOT; }; + D3F691690A77C3E3007E38CA /* osip_content_type.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_content_type.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_content_type.c"; sourceTree = SOURCE_ROOT; }; + D3F6916A0A77C3E3007E38CA /* osip_cseq.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_cseq.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_cseq.c"; sourceTree = SOURCE_ROOT; }; + D3F6916B0A77C3E3007E38CA /* osip_error_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_error_info.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_error_info.c"; sourceTree = SOURCE_ROOT; }; + D3F6916C0A77C3E3007E38CA /* osip_from.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_from.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_from.c"; sourceTree = SOURCE_ROOT; }; + D3F6916D0A77C3E3007E38CA /* osip_header.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_header.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_header.c"; sourceTree = SOURCE_ROOT; }; + D3F6916E0A77C3E3007E38CA /* osip_list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_list.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_list.c"; sourceTree = SOURCE_ROOT; }; + D3F6916F0A77C3E3007E38CA /* osip_md5c.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_md5c.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_md5c.c"; sourceTree = SOURCE_ROOT; }; + D3F691700A77C3E3007E38CA /* osip_message_parse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_message_parse.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_message_parse.c"; sourceTree = SOURCE_ROOT; }; + D3F691710A77C3E3007E38CA /* osip_message_to_str.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_message_to_str.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_message_to_str.c"; sourceTree = SOURCE_ROOT; }; + D3F691720A77C3E3007E38CA /* osip_message.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_message.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_message.c"; sourceTree = SOURCE_ROOT; }; + D3F691730A77C3E3007E38CA /* osip_mime_version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_mime_version.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_mime_version.c"; sourceTree = SOURCE_ROOT; }; + D3F691740A77C3E3007E38CA /* osip_parser_cfg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_parser_cfg.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_parser_cfg.c"; sourceTree = SOURCE_ROOT; }; + D3F691750A77C3E3007E38CA /* osip_port.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_port.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_port.c"; sourceTree = SOURCE_ROOT; }; + D3F691760A77C3E3007E38CA /* osip_proxy_authenticate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_proxy_authenticate.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_proxy_authenticate.c"; sourceTree = SOURCE_ROOT; }; + D3F691770A77C3E3007E38CA /* osip_proxy_authentication_info.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_proxy_authentication_info.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_proxy_authentication_info.c"; sourceTree = SOURCE_ROOT; }; + D3F691780A77C3E3007E38CA /* osip_proxy_authorization.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_proxy_authorization.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_proxy_authorization.c"; sourceTree = SOURCE_ROOT; }; + D3F691790A77C3E3007E38CA /* osip_record_route.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_record_route.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_record_route.c"; sourceTree = SOURCE_ROOT; }; + D3F6917A0A77C3E3007E38CA /* osip_route.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_route.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_route.c"; sourceTree = SOURCE_ROOT; }; + D3F6917B0A77C3E3007E38CA /* osip_to.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_to.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_to.c"; sourceTree = SOURCE_ROOT; }; + D3F6917C0A77C3E3007E38CA /* osip_uri.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_uri.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_uri.c"; sourceTree = SOURCE_ROOT; }; + D3F6917D0A77C3E3007E38CA /* osip_via.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_via.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_via.c"; sourceTree = SOURCE_ROOT; }; + D3F6917E0A77C3E3007E38CA /* osip_www_authenticate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_www_authenticate.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/osip_www_authenticate.c"; sourceTree = SOURCE_ROOT; }; + D3F6917F0A77C3E3007E38CA /* parser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = parser.h; path = "../../libs/libosip2-2.2.3/src/osipparser2/parser.h"; sourceTree = SOURCE_ROOT; }; + D3F691800A77C3E3007E38CA /* sdp_accessor.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdp_accessor.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/sdp_accessor.c"; sourceTree = SOURCE_ROOT; }; + D3F691810A77C3E3007E38CA /* sdp_message.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdp_message.c; path = "../../libs/libosip2-2.2.3/src/osipparser2/sdp_message.c"; sourceTree = SOURCE_ROOT; }; + D3F691A90A77C442007E38CA /* osip_body.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_body.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_body.h"; sourceTree = SOURCE_ROOT; }; + D3F691AA0A77C442007E38CA /* osip_const.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_const.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_const.h"; sourceTree = SOURCE_ROOT; }; + D3F691AB0A77C442007E38CA /* osip_headers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_headers.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_headers.h"; sourceTree = SOURCE_ROOT; }; + D3F691AC0A77C442007E38CA /* osip_list.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_list.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_list.h"; sourceTree = SOURCE_ROOT; }; + D3F691AD0A77C442007E38CA /* osip_md5.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_md5.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_md5.h"; sourceTree = SOURCE_ROOT; }; + D3F691AE0A77C442007E38CA /* osip_message.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_message.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_message.h"; sourceTree = SOURCE_ROOT; }; + D3F691AF0A77C442007E38CA /* osip_parser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_parser.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_parser.h"; sourceTree = SOURCE_ROOT; }; + D3F691B00A77C442007E38CA /* osip_port.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_port.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_port.h"; sourceTree = SOURCE_ROOT; }; + D3F691B10A77C442007E38CA /* osip_uri.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_uri.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/osip_uri.h"; sourceTree = SOURCE_ROOT; }; + D3F691B20A77C442007E38CA /* sdp_message.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sdp_message.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/sdp_message.h"; sourceTree = SOURCE_ROOT; }; + D3F691BF0A77C45F007E38CA /* osip_accept_encoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_accept_encoding.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_accept_encoding.h"; sourceTree = SOURCE_ROOT; }; + D3F691C00A77C45F007E38CA /* osip_accept_language.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_accept_language.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_accept_language.h"; sourceTree = SOURCE_ROOT; }; + D3F691C10A77C45F007E38CA /* osip_accept.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_accept.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_accept.h"; sourceTree = SOURCE_ROOT; }; + D3F691C20A77C45F007E38CA /* osip_alert_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_alert_info.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_alert_info.h"; sourceTree = SOURCE_ROOT; }; + D3F691C30A77C45F007E38CA /* osip_allow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_allow.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_allow.h"; sourceTree = SOURCE_ROOT; }; + D3F691C40A77C45F007E38CA /* osip_authentication_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_authentication_info.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_authentication_info.h"; sourceTree = SOURCE_ROOT; }; + D3F691C50A77C45F007E38CA /* osip_authorization.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_authorization.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_authorization.h"; sourceTree = SOURCE_ROOT; }; + D3F691C60A77C45F007E38CA /* osip_call_id.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_call_id.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_call_id.h"; sourceTree = SOURCE_ROOT; }; + D3F691C70A77C45F007E38CA /* osip_call_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_call_info.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_call_info.h"; sourceTree = SOURCE_ROOT; }; + D3F691C80A77C45F007E38CA /* osip_contact.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_contact.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_contact.h"; sourceTree = SOURCE_ROOT; }; + D3F691C90A77C45F007E38CA /* osip_content_disposition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_content_disposition.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_content_disposition.h"; sourceTree = SOURCE_ROOT; }; + D3F691CA0A77C45F007E38CA /* osip_content_encoding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_content_encoding.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_content_encoding.h"; sourceTree = SOURCE_ROOT; }; + D3F691CB0A77C45F007E38CA /* osip_content_length.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_content_length.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_content_length.h"; sourceTree = SOURCE_ROOT; }; + D3F691CC0A77C45F007E38CA /* osip_content_type.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_content_type.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_content_type.h"; sourceTree = SOURCE_ROOT; }; + D3F691CD0A77C45F007E38CA /* osip_cseq.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_cseq.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_cseq.h"; sourceTree = SOURCE_ROOT; }; + D3F691CE0A77C45F007E38CA /* osip_error_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_error_info.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_error_info.h"; sourceTree = SOURCE_ROOT; }; + D3F691CF0A77C45F007E38CA /* osip_from.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_from.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_from.h"; sourceTree = SOURCE_ROOT; }; + D3F691D00A77C45F007E38CA /* osip_header.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_header.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_header.h"; sourceTree = SOURCE_ROOT; }; + D3F691D10A77C45F007E38CA /* osip_mime_version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_mime_version.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_mime_version.h"; sourceTree = SOURCE_ROOT; }; + D3F691D20A77C45F007E38CA /* osip_proxy_authenticate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_proxy_authenticate.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_proxy_authenticate.h"; sourceTree = SOURCE_ROOT; }; + D3F691D30A77C45F007E38CA /* osip_proxy_authentication_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_proxy_authentication_info.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_proxy_authentication_info.h"; sourceTree = SOURCE_ROOT; }; + D3F691D40A77C45F007E38CA /* osip_proxy_authorization.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_proxy_authorization.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_proxy_authorization.h"; sourceTree = SOURCE_ROOT; }; + D3F691D50A77C45F007E38CA /* osip_record_route.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_record_route.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_record_route.h"; sourceTree = SOURCE_ROOT; }; + D3F691D60A77C45F007E38CA /* osip_route.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_route.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_route.h"; sourceTree = SOURCE_ROOT; }; + D3F691D70A77C45F007E38CA /* osip_to.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_to.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_to.h"; sourceTree = SOURCE_ROOT; }; + D3F691D80A77C45F007E38CA /* osip_via.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_via.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_via.h"; sourceTree = SOURCE_ROOT; }; + D3F691D90A77C45F007E38CA /* osip_www_authenticate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_www_authenticate.h; path = "../../libs/libosip2-2.2.3/include/osipparser2/headers/osip_www_authenticate.h"; sourceTree = SOURCE_ROOT; }; + D3F692020A77C51B007E38CA /* exosip2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = exosip2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D3F692030A77C51B007E38CA /* exosip2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = exosip2.plist; sourceTree = "<group>"; }; + D3F6921B0A77C79E007E38CA /* eXcall_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXcall_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXcall_api.c"; sourceTree = SOURCE_ROOT; }; + D3F6921C0A77C79E007E38CA /* eXconf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXconf.c; path = "../../libs/libeXosip2-2.2.3/src/eXconf.c"; sourceTree = SOURCE_ROOT; }; + D3F6921D0A77C79E007E38CA /* eXinsubscription_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXinsubscription_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXinsubscription_api.c"; sourceTree = SOURCE_ROOT; }; + D3F6921E0A77C79F007E38CA /* eXmessage_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXmessage_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXmessage_api.c"; sourceTree = SOURCE_ROOT; }; + D3F6921F0A77C79F007E38CA /* eXoptions_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXoptions_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXoptions_api.c"; sourceTree = SOURCE_ROOT; }; + D3F692200A77C79F007E38CA /* eXosip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXosip.c; path = "../../libs/libeXosip2-2.2.3/src/eXosip.c"; sourceTree = SOURCE_ROOT; }; + D3F692210A77C79F007E38CA /* eXosip2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eXosip2.h; path = "../../libs/libeXosip2-2.2.3/src/eXosip2.h"; sourceTree = SOURCE_ROOT; }; + D3F692220A77C79F007E38CA /* eXpublish_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXpublish_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXpublish_api.c"; sourceTree = SOURCE_ROOT; }; + D3F692230A77C79F007E38CA /* eXrefer_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXrefer_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXrefer_api.c"; sourceTree = SOURCE_ROOT; }; + D3F692240A77C79F007E38CA /* eXregister_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXregister_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXregister_api.c"; sourceTree = SOURCE_ROOT; }; + D3F692250A77C79F007E38CA /* eXsubscription_api.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXsubscription_api.c; path = "../../libs/libeXosip2-2.2.3/src/eXsubscription_api.c"; sourceTree = SOURCE_ROOT; }; + D3F692260A77C79F007E38CA /* eXtransport.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXtransport.c; path = "../../libs/libeXosip2-2.2.3/src/eXtransport.c"; sourceTree = SOURCE_ROOT; }; + D3F692270A77C79F007E38CA /* eXutils.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eXutils.c; path = "../../libs/libeXosip2-2.2.3/src/eXutils.c"; sourceTree = SOURCE_ROOT; }; + D3F692280A77C79F007E38CA /* inet_ntop.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = inet_ntop.c; path = "../../libs/libeXosip2-2.2.3/src/inet_ntop.c"; sourceTree = SOURCE_ROOT; }; + D3F692290A77C79F007E38CA /* inet_ntop.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inet_ntop.h; path = "../../libs/libeXosip2-2.2.3/src/inet_ntop.h"; sourceTree = SOURCE_ROOT; }; + D3F6922A0A77C79F007E38CA /* jauth.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jauth.c; path = "../../libs/libeXosip2-2.2.3/src/jauth.c"; sourceTree = SOURCE_ROOT; }; + D3F6922B0A77C79F007E38CA /* jcall.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jcall.c; path = "../../libs/libeXosip2-2.2.3/src/jcall.c"; sourceTree = SOURCE_ROOT; }; + D3F6922C0A77C79F007E38CA /* jcallback.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jcallback.c; path = "../../libs/libeXosip2-2.2.3/src/jcallback.c"; sourceTree = SOURCE_ROOT; }; + D3F6922D0A77C79F007E38CA /* jdialog.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jdialog.c; path = "../../libs/libeXosip2-2.2.3/src/jdialog.c"; sourceTree = SOURCE_ROOT; }; + D3F6922E0A77C79F007E38CA /* jevents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jevents.c; path = "../../libs/libeXosip2-2.2.3/src/jevents.c"; sourceTree = SOURCE_ROOT; }; + D3F6922F0A77C79F007E38CA /* jnotify.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jnotify.c; path = "../../libs/libeXosip2-2.2.3/src/jnotify.c"; sourceTree = SOURCE_ROOT; }; + D3F692300A77C79F007E38CA /* jpipe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jpipe.c; path = "../../libs/libeXosip2-2.2.3/src/jpipe.c"; sourceTree = SOURCE_ROOT; }; + D3F692310A77C79F007E38CA /* jpipe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jpipe.h; path = "../../libs/libeXosip2-2.2.3/src/jpipe.h"; sourceTree = SOURCE_ROOT; }; + D3F692320A77C79F007E38CA /* jpublish.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jpublish.c; path = "../../libs/libeXosip2-2.2.3/src/jpublish.c"; sourceTree = SOURCE_ROOT; }; + D3F692330A77C79F007E38CA /* jreg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jreg.c; path = "../../libs/libeXosip2-2.2.3/src/jreg.c"; sourceTree = SOURCE_ROOT; }; + D3F692340A77C79F007E38CA /* jrequest.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jrequest.c; path = "../../libs/libeXosip2-2.2.3/src/jrequest.c"; sourceTree = SOURCE_ROOT; }; + D3F692350A77C79F007E38CA /* jresponse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jresponse.c; path = "../../libs/libeXosip2-2.2.3/src/jresponse.c"; sourceTree = SOURCE_ROOT; }; + D3F692360A77C79F007E38CA /* jsubscribe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jsubscribe.c; path = "../../libs/libeXosip2-2.2.3/src/jsubscribe.c"; sourceTree = SOURCE_ROOT; }; + D3F692370A77C79F007E38CA /* misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = misc.c; path = "../../libs/libeXosip2-2.2.3/src/misc.c"; sourceTree = SOURCE_ROOT; }; + D3F692380A77C79F007E38CA /* sdp_offans.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sdp_offans.c; path = "../../libs/libeXosip2-2.2.3/src/sdp_offans.c"; sourceTree = SOURCE_ROOT; }; + D3F692390A77C79F007E38CA /* udp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = udp.c; path = "../../libs/libeXosip2-2.2.3/src/udp.c"; sourceTree = SOURCE_ROOT; }; + D3F692590A77C7BE007E38CA /* eX_call.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_call.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_call.h"; sourceTree = SOURCE_ROOT; }; + D3F6925A0A77C7BE007E38CA /* eX_message.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_message.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_message.h"; sourceTree = SOURCE_ROOT; }; + D3F6925B0A77C7BE007E38CA /* eX_options.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_options.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_options.h"; sourceTree = SOURCE_ROOT; }; + D3F6925C0A77C7BE007E38CA /* eX_publish.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_publish.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_publish.h"; sourceTree = SOURCE_ROOT; }; + D3F6925D0A77C7BE007E38CA /* eX_refer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_refer.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_refer.h"; sourceTree = SOURCE_ROOT; }; + D3F6925E0A77C7BE007E38CA /* eX_register.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_register.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_register.h"; sourceTree = SOURCE_ROOT; }; + D3F6925F0A77C7BE007E38CA /* eX_setup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_setup.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_setup.h"; sourceTree = SOURCE_ROOT; }; + D3F692600A77C7BE007E38CA /* eX_subscribe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eX_subscribe.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eX_subscribe.h"; sourceTree = SOURCE_ROOT; }; + D3F692610A77C7BE007E38CA /* eXosip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = eXosip.h; path = "../../libs/libeXosip2-2.2.3/include/eXosip2/eXosip.h"; sourceTree = SOURCE_ROOT; }; + D3F692B00A77CE99007E38CA /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../libs/libeXosip2-2.2.3/config.h"; sourceTree = SOURCE_ROOT; }; + D3F693070A77D473007E38CA /* mod_exosip.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = mod_exosip.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + D3F693110A77D4D6007E38CA /* mod_exosip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mod_exosip.c; path = ../../src/mod/endpoints/mod_exosip/mod_exosip.c; sourceTree = SOURCE_ROOT; }; + D3F693120A77D4D6007E38CA /* osip_rfc3264.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = osip_rfc3264.c; path = ../../src/mod/endpoints/mod_exosip/osip_rfc3264.c; sourceTree = SOURCE_ROOT; }; + D3F693130A77D4D6007E38CA /* osip_rfc3264.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_rfc3264.h; path = ../../src/mod/endpoints/mod_exosip/osip_rfc3264.h; sourceTree = SOURCE_ROOT; }; + D3F693140A77D4D6007E38CA /* osip_rfc3264i.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = osip_rfc3264i.h; path = ../../src/mod/endpoints/mod_exosip/osip_rfc3264i.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -2011,6 +2489,8 @@ D3152FBA0A76F27000549119 /* srtp.framework in Frameworks */, D3152FBB0A76F27000549119 /* teletone.framework in Frameworks */, D3152FB40A76F26700549119 /* portaudio.framework in Frameworks */, + D3BF92700A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CF0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2026,6 +2506,8 @@ D347255F0A76D91E001C8ED7 /* libfreeswitch.framework in Frameworks */, D34725600A76D91E001C8ED7 /* aprutil.framework in Frameworks */, D34725610A76D91E001C8ED7 /* apr.framework in Frameworks */, + D3BF926E0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CD0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2041,6 +2523,8 @@ D365008B0A76BE5A00C47A76 /* sqlite.framework in Frameworks */, D365008C0A76BE5A00C47A76 /* srtp.framework in Frameworks */, D365008D0A76BE5A00C47A76 /* teletone.framework in Frameworks */, + D3BF92680A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C70A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2062,6 +2546,8 @@ D36501F50A76C64200C47A76 /* sqlite.framework in Frameworks */, D36501F60A76C64200C47A76 /* srtp.framework in Frameworks */, D36501F70A76C64200C47A76 /* teletone.framework in Frameworks */, + D3BF92690A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C80A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2076,6 +2562,8 @@ D36501FC0A76C64A00C47A76 /* sqlite.framework in Frameworks */, D36501FD0A76C64A00C47A76 /* srtp.framework in Frameworks */, D36501FE0A76C64A00C47A76 /* teletone.framework in Frameworks */, + D3BF926A0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C90A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2090,6 +2578,8 @@ D36502030A76C65300C47A76 /* sqlite.framework in Frameworks */, D36502040A76C65300C47A76 /* srtp.framework in Frameworks */, D36502050A76C65300C47A76 /* teletone.framework in Frameworks */, + D3BF926B0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CA0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2112,6 +2602,8 @@ D365025B0A76C90700C47A76 /* sqlite.framework in Frameworks */, D365025C0A76C90700C47A76 /* srtp.framework in Frameworks */, D365025D0A76C90700C47A76 /* teletone.framework in Frameworks */, + D3BF926C0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CB0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2134,6 +2626,8 @@ D36502E10A76CB1000C47A76 /* sqlite.framework in Frameworks */, D36502E20A76CB1000C47A76 /* srtp.framework in Frameworks */, D36502E30A76CB1000C47A76 /* teletone.framework in Frameworks */, + D3BF926D0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CC0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2148,6 +2642,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D30DE7670A7819B300C8AAD5 /* System.framework in Frameworks */, D38DD5540A768CB100FEDB19 /* resample.framework in Frameworks */, D38DD51F0A768B4700FEDB19 /* srtp.framework in Frameworks */, D38DD3770A76836E00FEDB19 /* sqlite.framework in Frameworks */, @@ -2184,6 +2679,8 @@ D3B406CE0A76EED0000AF6D4 /* sqlite.framework in Frameworks */, D3B406CF0A76EED0000AF6D4 /* srtp.framework in Frameworks */, D3B406D00A76EED0000AF6D4 /* teletone.framework in Frameworks */, + D3BF926F0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9CE0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2198,6 +2695,8 @@ D3BC32410A769B7600DE971E /* apr.framework in Frameworks */, D3BC32420A769B7600DE971E /* aprutil.framework in Frameworks */, D3BC31E20A769B4300DE971E /* libfreeswitch.framework in Frameworks */, + D3BF925D0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9BC0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2214,6 +2713,8 @@ D3BC32700A769D7700DE971E /* libfreeswitch.framework in Frameworks */, D3BC32690A769D6F00DE971E /* iksemel.framework in Frameworks */, D3BC32680A769D6B00DE971E /* dingaling.framework in Frameworks */, + D3BF925E0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9BD0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2228,6 +2729,8 @@ D3BC32890A769E2700DE971E /* apr.framework in Frameworks */, D3BC328A0A769E2700DE971E /* aprutil.framework in Frameworks */, D3BC328B0A769E2700DE971E /* libfreeswitch.framework in Frameworks */, + D3BF925F0A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9BE0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2242,6 +2745,8 @@ D3BC32D10A76A68400DE971E /* apr.framework in Frameworks */, D3BC32D20A76A68400DE971E /* aprutil.framework in Frameworks */, D3BC32D30A76A68400DE971E /* libfreeswitch.framework in Frameworks */, + D3BF92600A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9BF0A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2256,6 +2761,8 @@ D3BC32F10A76A75B00DE971E /* apr.framework in Frameworks */, D3BC32F20A76A75B00DE971E /* aprutil.framework in Frameworks */, D3BC32F30A76A75B00DE971E /* libfreeswitch.framework in Frameworks */, + D3BF92610A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C00A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2270,6 +2777,8 @@ D3BC33040A76A7EB00DE971E /* apr.framework in Frameworks */, D3BC33050A76A7EB00DE971E /* aprutil.framework in Frameworks */, D3BC33060A76A7EB00DE971E /* libfreeswitch.framework in Frameworks */, + D3BF92620A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C20A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2284,6 +2793,8 @@ D3BC33170A76A86A00DE971E /* sqlite.framework in Frameworks */, D3BC33180A76A86A00DE971E /* srtp.framework in Frameworks */, D3BC33190A76A86A00DE971E /* teletone.framework in Frameworks */, + D3BF92630A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C10A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2298,6 +2809,8 @@ D3BC332E0A76A8BC00DE971E /* sqlite.framework in Frameworks */, D3BC332F0A76A8BC00DE971E /* srtp.framework in Frameworks */, D3BC33300A76A8BC00DE971E /* teletone.framework in Frameworks */, + D3BF92640A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C30A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2312,6 +2825,8 @@ D3BC33490A76AA0D00DE971E /* sqlite.framework in Frameworks */, D3BC334A0A76AA0D00DE971E /* srtp.framework in Frameworks */, D3BC334B0A76AA0D00DE971E /* teletone.framework in Frameworks */, + D3BF92650A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C40A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2335,6 +2850,8 @@ D3BC34D80A76B04600DE971E /* sqlite.framework in Frameworks */, D3BC34D90A76B04600DE971E /* srtp.framework in Frameworks */, D3BC34DA0A76B04600DE971E /* teletone.framework in Frameworks */, + D3BF92660A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C50A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2349,6 +2866,8 @@ D3BC34F10A76B17800DE971E /* sqlite.framework in Frameworks */, D3BC34F20A76B17800DE971E /* srtp.framework in Frameworks */, D3BC34F30A76B17800DE971E /* teletone.framework in Frameworks */, + D3BF92670A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9C60A786E4600DBE6EB /* bundle1.o in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2370,13 +2889,122 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D3E66A7D0A77E62D00D04E25 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66A800A77E63C00D04E25 /* apr.framework in Frameworks */, + D3E66A810A77E63C00D04E25 /* aprutil.framework in Frameworks */, + D3E66A820A77E63C00D04E25 /* libfreeswitch.framework in Frameworks */, + D3E66A830A77E63C00D04E25 /* resample.framework in Frameworks */, + D3E66A840A77E63C00D04E25 /* sqlite.framework in Frameworks */, + D3E66A850A77E63C00D04E25 /* srtp.framework in Frameworks */, + D3E66A860A77E63C00D04E25 /* teletone.framework in Frameworks */, + D3BF92720A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9D10A786E4600DBE6EB /* bundle1.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66AF00A77E6B400D04E25 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66B190A77E7F400D04E25 /* apr.framework in Frameworks */, + D3E66B1A0A77E7F400D04E25 /* aprutil.framework in Frameworks */, + D3E66B1B0A77E7F400D04E25 /* libfreeswitch.framework in Frameworks */, + D3E66B1C0A77E7F400D04E25 /* resample.framework in Frameworks */, + D3E66B1D0A77E7F400D04E25 /* sqlite.framework in Frameworks */, + D3E66B1E0A77E7F400D04E25 /* srtp.framework in Frameworks */, + D3E66B1F0A77E7F400D04E25 /* teletone.framework in Frameworks */, + D3BF92730A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9D20A786E4600DBE6EB /* bundle1.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66B060A77E73100D04E25 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66B200A77E7FC00D04E25 /* apr.framework in Frameworks */, + D3E66B210A77E7FC00D04E25 /* aprutil.framework in Frameworks */, + D3E66B220A77E7FC00D04E25 /* libfreeswitch.framework in Frameworks */, + D3E66B230A77E7FC00D04E25 /* resample.framework in Frameworks */, + D3E66B240A77E7FC00D04E25 /* sqlite.framework in Frameworks */, + D3E66B250A77E7FC00D04E25 /* srtp.framework in Frameworks */, + D3E66B260A77E7FC00D04E25 /* teletone.framework in Frameworks */, + D3BF92740A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9D30A786E4600DBE6EB /* bundle1.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66B0E0A77E76200D04E25 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66B270A77E80400D04E25 /* apr.framework in Frameworks */, + D3E66B280A77E80400D04E25 /* aprutil.framework in Frameworks */, + D3E66B290A77E80400D04E25 /* libfreeswitch.framework in Frameworks */, + D3E66B2A0A77E80400D04E25 /* resample.framework in Frameworks */, + D3E66B2B0A77E80400D04E25 /* sqlite.framework in Frameworks */, + D3E66B2C0A77E80400D04E25 /* srtp.framework in Frameworks */, + D3E66B2D0A77E80400D04E25 /* teletone.framework in Frameworks */, + D3BF92750A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9D40A786E4600DBE6EB /* bundle1.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F690FB0A77C002007E38CA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F691F90A77C4E4007E38CA /* osipparser2.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F6914A0A77C203007E38CA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F692000A77C51B007E38CA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F692720A77C8A8007E38CA /* osip2.framework in Frameworks */, + D3F6927D0A77C8AE007E38CA /* osipparser2.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F693050A77D473007E38CA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D3AA5D290A77D54A008F105E /* exosip2.framework in Frameworks */, + D3AA5D2A0A77D54A008F105E /* osip2.framework in Frameworks */, + D3AA5D2B0A77D54A008F105E /* osipparser2.framework in Frameworks */, + D3AA5D200A77D53D008F105E /* teletone.framework in Frameworks */, + D3AA5D210A77D53D008F105E /* srtp.framework in Frameworks */, + D3AA5D220A77D53D008F105E /* sqlite.framework in Frameworks */, + D3AA5D230A77D53D008F105E /* resample.framework in Frameworks */, + D3AA5D240A77D53D008F105E /* libfreeswitch.framework in Frameworks */, + D3AA5D250A77D53D008F105E /* aprutil.framework in Frameworks */, + D3AA5D260A77D53D008F105E /* apr.framework in Frameworks */, + D3BF92710A77F7FA00BEDBC8 /* System.framework in Frameworks */, + D3E3E9D00A786E4600DBE6EB /* bundle1.o in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* FreeSWITCH */ = { isa = PBXGroup; children = ( + D3E3E9BB0A786E4600DBE6EB /* bundle1.o */, D3BC34180A76ADF400DE971E /* CoreAudio.framework */, + D3BF925C0A77F7FA00BEDBC8 /* System.framework */, 08FB7795FE84155DC02AAC07 /* Sources */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); @@ -2386,6 +3014,9 @@ 08FB7795FE84155DC02AAC07 /* Sources */ = { isa = PBXGroup; children = ( + D3F692110A77C58E007E38CA /* exosip2 */, + D3F691580A77C3B1007E38CA /* osipparser2 */, + D3F691090A77C0C3007E38CA /* osip2 */, D3152F820A76F0B500549119 /* portaudio */, D30151640A76EC5300117F59 /* speex */, D34725140A76D712001C8ED7 /* iax2 */, @@ -2410,6 +3041,9 @@ 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( + D3F692030A77C51B007E38CA /* exosip2.plist */, + D3F6914D0A77C203007E38CA /* osipparser2.plist */, + D3F690FE0A77C002007E38CA /* osip2.plist */, D3152F7E0A76F0A100549119 /* portaudio.plist */, D30151500A76EB5D00117F59 /* speex.plist */, D34725360A76D7B1001C8ED7 /* iax.plist */, @@ -2465,6 +3099,14 @@ D3B406C20A76EE4D000AF6D4 /* mod_speex.dylib */, D3152F7D0A76F0A100549119 /* portaudio.framework */, D3152FA80A76F21400549119 /* mod_portaudio.dylib */, + D3F690FD0A77C002007E38CA /* osip2.framework */, + D3F6914C0A77C203007E38CA /* osipparser2.framework */, + D3F692020A77C51B007E38CA /* exosip2.framework */, + D3F693070A77D473007E38CA /* mod_exosip.dylib */, + D3E66A7F0A77E62D00D04E25 /* mod_woomera.dylib */, + D3E66AF20A77E6B400D04E25 /* mod_syslog.dylib */, + D3E66B080A77E73100D04E25 /* mod_event_multicast.dylib */, + D3E66B100A77E76200D04E25 /* mod_event_socket.dylib */, ); name = Products; sourceTree = "<group>"; @@ -2963,6 +3605,7 @@ D3BC31DE0A769B0E00DE971E /* modules */ = { isa = PBXGroup; children = ( + D3E66B110A77E78E00D04E25 /* event_handlers */, D36500810A76BE2000C47A76 /* dialplans */, D3BC34EC0A76B15D00DE971E /* loggers */, D3BC34CE0A76B01E00DE971E /* formats */, @@ -2992,6 +3635,11 @@ D3BC32600A769D2B00DE971E /* endpoints */ = { isa = PBXGroup; children = ( + D3E66A7B0A77E61E00D04E25 /* mod_woomera.c */, + D3F693110A77D4D6007E38CA /* mod_exosip.c */, + D3F693120A77D4D6007E38CA /* osip_rfc3264.c */, + D3F693130A77D4D6007E38CA /* osip_rfc3264.h */, + D3F693140A77D4D6007E38CA /* osip_rfc3264i.h */, D3152FAC0A76F24B00549119 /* mod_portaudio.c */, D3152FAD0A76F24B00549119 /* pablio.c */, D3152FAE0A76F24B00549119 /* pablio.h */, @@ -3139,6 +3787,7 @@ D3BC34EC0A76B15D00DE971E /* loggers */ = { isa = PBXGroup; children = ( + D3E66AF60A77E6ED00D04E25 /* mod_syslog.c */, D3BC34EA0A76B15900DE971E /* mod_console.c */, ); name = loggers; @@ -4119,6 +4768,229 @@ path = test; sourceTree = "<group>"; }; + D3E66B110A77E78E00D04E25 /* event_handlers */ = { + isa = PBXGroup; + children = ( + D3E66B170A77E7C600D04E25 /* mod_event_socket.c */, + D3E66B150A77E7B300D04E25 /* mod_event_multicast.c */, + ); + name = event_handlers; + sourceTree = "<group>"; + }; + D3F691090A77C0C3007E38CA /* osip2 */ = { + isa = PBXGroup; + children = ( + D3F6910B0A77C0D6007E38CA /* include */, + D3F6910A0A77C0CA007E38CA /* src */, + ); + name = osip2; + sourceTree = "<group>"; + }; + D3F6910A0A77C0CA007E38CA /* src */ = { + isa = PBXGroup; + children = ( + D3F6910C0A77C12E007E38CA /* fsm_misc.c */, + D3F6910D0A77C12E007E38CA /* fsm.h */, + D3F6910E0A77C12E007E38CA /* ict_fsm.c */, + D3F6910F0A77C12E007E38CA /* ict.c */, + D3F691100A77C12E007E38CA /* ist_fsm.c */, + D3F691110A77C12E007E38CA /* ist.c */, + D3F691120A77C12E007E38CA /* nict_fsm.c */, + D3F691130A77C12E007E38CA /* nict.c */, + D3F691140A77C12E007E38CA /* nist_fsm.c */, + D3F691150A77C12E007E38CA /* nist.c */, + D3F691160A77C12E007E38CA /* osip_dialog.c */, + D3F691170A77C12E007E38CA /* osip_event.c */, + D3F691180A77C12E007E38CA /* osip_time.c */, + D3F691190A77C12E007E38CA /* osip_transaction.c */, + D3F6911A0A77C12E007E38CA /* osip.c */, + D3F6911B0A77C12E007E38CA /* port_condv.c */, + D3F6911C0A77C12E007E38CA /* port_fifo.c */, + D3F6911D0A77C12E007E38CA /* port_sema.c */, + D3F6911E0A77C12E007E38CA /* port_thread.c */, + D3F6911F0A77C12E007E38CA /* xixt.h */, + ); + name = src; + sourceTree = "<group>"; + }; + D3F6910B0A77C0D6007E38CA /* include */ = { + isa = PBXGroup; + children = ( + D3F691340A77C15A007E38CA /* internal.h */, + D3F691350A77C15A007E38CA /* osip_condv.h */, + D3F691360A77C15A007E38CA /* osip_dialog.h */, + D3F691370A77C15A007E38CA /* osip_fifo.h */, + D3F691380A77C15A007E38CA /* osip_mt.h */, + D3F691390A77C15A007E38CA /* osip_time.h */, + D3F6913A0A77C15A007E38CA /* osip.h */, + ); + name = include; + sourceTree = "<group>"; + }; + D3F691580A77C3B1007E38CA /* osipparser2 */ = { + isa = PBXGroup; + children = ( + D3F6915A0A77C3C4007E38CA /* include */, + D3F691590A77C3BD007E38CA /* src */, + ); + name = osipparser2; + sourceTree = "<group>"; + }; + D3F691590A77C3BD007E38CA /* src */ = { + isa = PBXGroup; + children = ( + D3F6915B0A77C3E3007E38CA /* osip_accept_encoding.c */, + D3F6915C0A77C3E3007E38CA /* osip_accept_language.c */, + D3F6915D0A77C3E3007E38CA /* osip_accept.c */, + D3F6915E0A77C3E3007E38CA /* osip_alert_info.c */, + D3F6915F0A77C3E3007E38CA /* osip_allow.c */, + D3F691600A77C3E3007E38CA /* osip_authentication_info.c */, + D3F691610A77C3E3007E38CA /* osip_authorization.c */, + D3F691620A77C3E3007E38CA /* osip_body.c */, + D3F691630A77C3E3007E38CA /* osip_call_id.c */, + D3F691640A77C3E3007E38CA /* osip_call_info.c */, + D3F691650A77C3E3007E38CA /* osip_contact.c */, + D3F691660A77C3E3007E38CA /* osip_content_disposition.c */, + D3F691670A77C3E3007E38CA /* osip_content_encoding.c */, + D3F691680A77C3E3007E38CA /* osip_content_length.c */, + D3F691690A77C3E3007E38CA /* osip_content_type.c */, + D3F6916A0A77C3E3007E38CA /* osip_cseq.c */, + D3F6916B0A77C3E3007E38CA /* osip_error_info.c */, + D3F6916C0A77C3E3007E38CA /* osip_from.c */, + D3F6916D0A77C3E3007E38CA /* osip_header.c */, + D3F6916E0A77C3E3007E38CA /* osip_list.c */, + D3F6916F0A77C3E3007E38CA /* osip_md5c.c */, + D3F691700A77C3E3007E38CA /* osip_message_parse.c */, + D3F691710A77C3E3007E38CA /* osip_message_to_str.c */, + D3F691720A77C3E3007E38CA /* osip_message.c */, + D3F691730A77C3E3007E38CA /* osip_mime_version.c */, + D3F691740A77C3E3007E38CA /* osip_parser_cfg.c */, + D3F691750A77C3E3007E38CA /* osip_port.c */, + D3F691760A77C3E3007E38CA /* osip_proxy_authenticate.c */, + D3F691770A77C3E3007E38CA /* osip_proxy_authentication_info.c */, + D3F691780A77C3E3007E38CA /* osip_proxy_authorization.c */, + D3F691790A77C3E3007E38CA /* osip_record_route.c */, + D3F6917A0A77C3E3007E38CA /* osip_route.c */, + D3F6917B0A77C3E3007E38CA /* osip_to.c */, + D3F6917C0A77C3E3007E38CA /* osip_uri.c */, + D3F6917D0A77C3E3007E38CA /* osip_via.c */, + D3F6917E0A77C3E3007E38CA /* osip_www_authenticate.c */, + D3F6917F0A77C3E3007E38CA /* parser.h */, + D3F691800A77C3E3007E38CA /* sdp_accessor.c */, + D3F691810A77C3E3007E38CA /* sdp_message.c */, + ); + name = src; + sourceTree = "<group>"; + }; + D3F6915A0A77C3C4007E38CA /* include */ = { + isa = PBXGroup; + children = ( + D3F691440A77C199007E38CA /* config.h */, + D3F691BF0A77C45F007E38CA /* osip_accept_encoding.h */, + D3F691C00A77C45F007E38CA /* osip_accept_language.h */, + D3F691C10A77C45F007E38CA /* osip_accept.h */, + D3F691C20A77C45F007E38CA /* osip_alert_info.h */, + D3F691C30A77C45F007E38CA /* osip_allow.h */, + D3F691C40A77C45F007E38CA /* osip_authentication_info.h */, + D3F691C50A77C45F007E38CA /* osip_authorization.h */, + D3F691C60A77C45F007E38CA /* osip_call_id.h */, + D3F691C70A77C45F007E38CA /* osip_call_info.h */, + D3F691C80A77C45F007E38CA /* osip_contact.h */, + D3F691C90A77C45F007E38CA /* osip_content_disposition.h */, + D3F691CA0A77C45F007E38CA /* osip_content_encoding.h */, + D3F691CB0A77C45F007E38CA /* osip_content_length.h */, + D3F691CC0A77C45F007E38CA /* osip_content_type.h */, + D3F691CD0A77C45F007E38CA /* osip_cseq.h */, + D3F691CE0A77C45F007E38CA /* osip_error_info.h */, + D3F691CF0A77C45F007E38CA /* osip_from.h */, + D3F691D00A77C45F007E38CA /* osip_header.h */, + D3F691D10A77C45F007E38CA /* osip_mime_version.h */, + D3F691D20A77C45F007E38CA /* osip_proxy_authenticate.h */, + D3F691D30A77C45F007E38CA /* osip_proxy_authentication_info.h */, + D3F691D40A77C45F007E38CA /* osip_proxy_authorization.h */, + D3F691D50A77C45F007E38CA /* osip_record_route.h */, + D3F691D60A77C45F007E38CA /* osip_route.h */, + D3F691D70A77C45F007E38CA /* osip_to.h */, + D3F691D80A77C45F007E38CA /* osip_via.h */, + D3F691D90A77C45F007E38CA /* osip_www_authenticate.h */, + D3F691A90A77C442007E38CA /* osip_body.h */, + D3F691AA0A77C442007E38CA /* osip_const.h */, + D3F691AB0A77C442007E38CA /* osip_headers.h */, + D3F691AC0A77C442007E38CA /* osip_list.h */, + D3F691AD0A77C442007E38CA /* osip_md5.h */, + D3F691AE0A77C442007E38CA /* osip_message.h */, + D3F691AF0A77C442007E38CA /* osip_parser.h */, + D3F691B00A77C442007E38CA /* osip_port.h */, + D3F691B10A77C442007E38CA /* osip_uri.h */, + D3F691B20A77C442007E38CA /* sdp_message.h */, + ); + name = include; + sourceTree = "<group>"; + }; + D3F692110A77C58E007E38CA /* exosip2 */ = { + isa = PBXGroup; + children = ( + D3F692130A77C5A3007E38CA /* include */, + D3F692120A77C59A007E38CA /* src */, + ); + name = exosip2; + sourceTree = "<group>"; + }; + D3F692120A77C59A007E38CA /* src */ = { + isa = PBXGroup; + children = ( + D3F6921B0A77C79E007E38CA /* eXcall_api.c */, + D3F6921C0A77C79E007E38CA /* eXconf.c */, + D3F6921D0A77C79E007E38CA /* eXinsubscription_api.c */, + D3F6921E0A77C79F007E38CA /* eXmessage_api.c */, + D3F6921F0A77C79F007E38CA /* eXoptions_api.c */, + D3F692200A77C79F007E38CA /* eXosip.c */, + D3F692210A77C79F007E38CA /* eXosip2.h */, + D3F692220A77C79F007E38CA /* eXpublish_api.c */, + D3F692230A77C79F007E38CA /* eXrefer_api.c */, + D3F692240A77C79F007E38CA /* eXregister_api.c */, + D3F692250A77C79F007E38CA /* eXsubscription_api.c */, + D3F692260A77C79F007E38CA /* eXtransport.c */, + D3F692270A77C79F007E38CA /* eXutils.c */, + D3F692280A77C79F007E38CA /* inet_ntop.c */, + D3F692290A77C79F007E38CA /* inet_ntop.h */, + D3F6922A0A77C79F007E38CA /* jauth.c */, + D3F6922B0A77C79F007E38CA /* jcall.c */, + D3F6922C0A77C79F007E38CA /* jcallback.c */, + D3F6922D0A77C79F007E38CA /* jdialog.c */, + D3F6922E0A77C79F007E38CA /* jevents.c */, + D3F6922F0A77C79F007E38CA /* jnotify.c */, + D3F692300A77C79F007E38CA /* jpipe.c */, + D3F692310A77C79F007E38CA /* jpipe.h */, + D3F692320A77C79F007E38CA /* jpublish.c */, + D3F692330A77C79F007E38CA /* jreg.c */, + D3F692340A77C79F007E38CA /* jrequest.c */, + D3F692350A77C79F007E38CA /* jresponse.c */, + D3F692360A77C79F007E38CA /* jsubscribe.c */, + D3F692370A77C79F007E38CA /* misc.c */, + D3F692380A77C79F007E38CA /* sdp_offans.c */, + D3F692390A77C79F007E38CA /* udp.c */, + ); + name = src; + sourceTree = "<group>"; + }; + D3F692130A77C5A3007E38CA /* include */ = { + isa = PBXGroup; + children = ( + D3F692B00A77CE99007E38CA /* config.h */, + D3F692590A77C7BE007E38CA /* eX_call.h */, + D3F6925A0A77C7BE007E38CA /* eX_message.h */, + D3F6925B0A77C7BE007E38CA /* eX_options.h */, + D3F6925C0A77C7BE007E38CA /* eX_publish.h */, + D3F6925D0A77C7BE007E38CA /* eX_refer.h */, + D3F6925E0A77C7BE007E38CA /* eX_register.h */, + D3F6925F0A77C7BE007E38CA /* eX_setup.h */, + D3F692600A77C7BE007E38CA /* eX_subscribe.h */, + D3F692610A77C7BE007E38CA /* eXosip.h */, + ); + name = include; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -4513,6 +5385,89 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D3F690F80A77C002007E38CA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F691210A77C12E007E38CA /* fsm.h in Headers */, + D3F691330A77C12E007E38CA /* xixt.h in Headers */, + D3F6913B0A77C15A007E38CA /* internal.h in Headers */, + D3F6913C0A77C15A007E38CA /* osip_condv.h in Headers */, + D3F6913D0A77C15A007E38CA /* osip_dialog.h in Headers */, + D3F6913E0A77C15A007E38CA /* osip_fifo.h in Headers */, + D3F6913F0A77C15A007E38CA /* osip_mt.h in Headers */, + D3F691400A77C15A007E38CA /* osip_time.h in Headers */, + D3F691410A77C15A007E38CA /* osip.h in Headers */, + D3F691450A77C199007E38CA /* config.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F691470A77C203007E38CA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66A360A77D9DC00D04E25 /* config.h in Headers */, + D3F691A60A77C3E3007E38CA /* parser.h in Headers */, + D3F691B30A77C442007E38CA /* osip_body.h in Headers */, + D3F691B40A77C442007E38CA /* osip_const.h in Headers */, + D3F691B50A77C442007E38CA /* osip_headers.h in Headers */, + D3F691B60A77C442007E38CA /* osip_list.h in Headers */, + D3F691B70A77C442007E38CA /* osip_md5.h in Headers */, + D3F691B80A77C442007E38CA /* osip_message.h in Headers */, + D3F691B90A77C442007E38CA /* osip_parser.h in Headers */, + D3F691BA0A77C442007E38CA /* osip_port.h in Headers */, + D3F691BB0A77C442007E38CA /* osip_uri.h in Headers */, + D3F691BC0A77C442007E38CA /* sdp_message.h in Headers */, + D3F691DA0A77C45F007E38CA /* osip_accept_encoding.h in Headers */, + D3F691DB0A77C45F007E38CA /* osip_accept_language.h in Headers */, + D3F691DC0A77C45F007E38CA /* osip_accept.h in Headers */, + D3F691DD0A77C45F007E38CA /* osip_alert_info.h in Headers */, + D3F691DE0A77C45F007E38CA /* osip_allow.h in Headers */, + D3F691DF0A77C45F007E38CA /* osip_authentication_info.h in Headers */, + D3F691E00A77C45F007E38CA /* osip_authorization.h in Headers */, + D3F691E10A77C45F007E38CA /* osip_call_id.h in Headers */, + D3F691E20A77C45F007E38CA /* osip_call_info.h in Headers */, + D3F691E30A77C45F007E38CA /* osip_contact.h in Headers */, + D3F691E40A77C45F007E38CA /* osip_content_disposition.h in Headers */, + D3F691E50A77C45F007E38CA /* osip_content_encoding.h in Headers */, + D3F691E60A77C45F007E38CA /* osip_content_length.h in Headers */, + D3F691E70A77C45F007E38CA /* osip_content_type.h in Headers */, + D3F691E80A77C45F007E38CA /* osip_cseq.h in Headers */, + D3F691E90A77C45F007E38CA /* osip_error_info.h in Headers */, + D3F691EA0A77C45F007E38CA /* osip_from.h in Headers */, + D3F691EB0A77C45F007E38CA /* osip_header.h in Headers */, + D3F691EC0A77C45F007E38CA /* osip_mime_version.h in Headers */, + D3F691ED0A77C45F007E38CA /* osip_proxy_authenticate.h in Headers */, + D3F691EE0A77C45F007E38CA /* osip_proxy_authentication_info.h in Headers */, + D3F691EF0A77C45F007E38CA /* osip_proxy_authorization.h in Headers */, + D3F691F00A77C45F007E38CA /* osip_record_route.h in Headers */, + D3F691F10A77C45F007E38CA /* osip_route.h in Headers */, + D3F691F20A77C45F007E38CA /* osip_to.h in Headers */, + D3F691F30A77C45F007E38CA /* osip_via.h in Headers */, + D3F691F40A77C45F007E38CA /* osip_www_authenticate.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F691FD0A77C51B007E38CA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F692400A77C79F007E38CA /* eXosip2.h in Headers */, + D3F692480A77C79F007E38CA /* inet_ntop.h in Headers */, + D3F692500A77C79F007E38CA /* jpipe.h in Headers */, + D3F692620A77C7BE007E38CA /* eX_call.h in Headers */, + D3F692630A77C7BE007E38CA /* eX_message.h in Headers */, + D3F692640A77C7BE007E38CA /* eX_options.h in Headers */, + D3F692650A77C7BE007E38CA /* eX_publish.h in Headers */, + D3F692660A77C7BE007E38CA /* eX_refer.h in Headers */, + D3F692670A77C7BE007E38CA /* eX_register.h in Headers */, + D3F692680A77C7BE007E38CA /* eX_setup.h in Headers */, + D3F692690A77C7BE007E38CA /* eX_subscribe.h in Headers */, + D3F6926A0A77C7BE007E38CA /* eXosip.h in Headers */, + D3F692B10A77CE99007E38CA /* config.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -5165,6 +6120,145 @@ productReference = D3DEC8E70A75E19F002001CF /* dingaling.framework */; productType = "com.apple.product-type.framework"; }; + D3E66A7E0A77E62D00D04E25 /* mod_woomera */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3E66AE80A77E65E00D04E25 /* Build configuration list for PBXNativeTarget "mod_woomera" */; + buildPhases = ( + D3E66A7C0A77E62D00D04E25 /* Sources */, + D3E66A7D0A77E62D00D04E25 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = mod_woomera; + productName = mod_woomera; + productReference = D3E66A7F0A77E62D00D04E25 /* mod_woomera.dylib */; + productType = "com.apple.product-type.objfile"; + }; + D3E66AF10A77E6B400D04E25 /* mod_syslog */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3E66AF30A77E6EA00D04E25 /* Build configuration list for PBXNativeTarget "mod_syslog" */; + buildPhases = ( + D3E66AEF0A77E6B400D04E25 /* Sources */, + D3E66AF00A77E6B400D04E25 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = mod_syslog; + productName = mod_syslog; + productReference = D3E66AF20A77E6B400D04E25 /* mod_syslog.dylib */; + productType = "com.apple.product-type.objfile"; + }; + D3E66B070A77E73100D04E25 /* mod_event_multicast */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3E66B0A0A77E74F00D04E25 /* Build configuration list for PBXNativeTarget "mod_event_multicast" */; + buildPhases = ( + D3E66B050A77E73100D04E25 /* Sources */, + D3E66B060A77E73100D04E25 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = mod_event_multicast; + productName = mod_event_multicast; + productReference = D3E66B080A77E73100D04E25 /* mod_event_multicast.dylib */; + productType = "com.apple.product-type.objfile"; + }; + D3E66B0F0A77E76200D04E25 /* mod_event_socket */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3E66B120A77E78E00D04E25 /* Build configuration list for PBXNativeTarget "mod_event_socket" */; + buildPhases = ( + D3E66B0D0A77E76200D04E25 /* Sources */, + D3E66B0E0A77E76200D04E25 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = mod_event_socket; + productName = mod_event_socket; + productReference = D3E66B100A77E76200D04E25 /* mod_event_socket.dylib */; + productType = "com.apple.product-type.objfile"; + }; + D3F690FC0A77C002007E38CA /* osip2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3F690FF0A77C003007E38CA /* Build configuration list for PBXNativeTarget "osip2" */; + buildPhases = ( + D3F691020A77C01B007E38CA /* ShellScript */, + D3F690F80A77C002007E38CA /* Headers */, + D3F690FA0A77C002007E38CA /* Sources */, + D3F690FB0A77C002007E38CA /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + D3F6928C0A77C979007E38CA /* PBXTargetDependency */, + ); + name = osip2; + productName = osip2; + productReference = D3F690FD0A77C002007E38CA /* osip2.framework */; + productType = "com.apple.product-type.framework"; + }; + D3F6914B0A77C203007E38CA /* osipparser2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3F6914E0A77C203007E38CA /* Build configuration list for PBXNativeTarget "osipparser2" */; + buildPhases = ( + D3F691510A77C236007E38CA /* ShellScript */, + D3F691470A77C203007E38CA /* Headers */, + D3F691490A77C203007E38CA /* Sources */, + D3F6914A0A77C203007E38CA /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = osipparser2; + productName = osipparser2; + productReference = D3F6914C0A77C203007E38CA /* osipparser2.framework */; + productType = "com.apple.product-type.framework"; + }; + D3F692010A77C51B007E38CA /* exosip2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3F692040A77C51C007E38CA /* Build configuration list for PBXNativeTarget "exosip2" */; + buildPhases = ( + D3F692150A77C5F8007E38CA /* ShellScript */, + D3F691FD0A77C51B007E38CA /* Headers */, + D3F691FE0A77C51B007E38CA /* Resources */, + D3F691FF0A77C51B007E38CA /* Sources */, + D3F692000A77C51B007E38CA /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + D3F6927F0A77C8B0007E38CA /* PBXTargetDependency */, + D3F692810A77C8B2007E38CA /* PBXTargetDependency */, + ); + name = exosip2; + productName = exosip2; + productReference = D3F692020A77C51B007E38CA /* exosip2.framework */; + productType = "com.apple.product-type.framework"; + }; + D3F693060A77D473007E38CA /* mod_exosip */ = { + isa = PBXNativeTarget; + buildConfigurationList = D3F6930E0A77D493007E38CA /* Build configuration list for PBXNativeTarget "mod_exosip" */; + buildPhases = ( + D3F693040A77D473007E38CA /* Sources */, + D3F693050A77D473007E38CA /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + D3AA5D780A77D62B008F105E /* PBXTargetDependency */, + ); + name = mod_exosip; + productName = mod_exosip; + productReference = D3F693070A77D473007E38CA /* mod_exosip.dylib */; + productType = "com.apple.product-type.objfile"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -5187,6 +6281,16 @@ D38DD4DE0A768AC500FEDB19 /* srtp */, D38DD5250A768B6100FEDB19 /* resample */, D38DD53F0A768C0900FEDB19 /* speakup */, + D3152F7C0A76F0A100549119 /* portaudio */, + D301514E0A76EB5D00117F59 /* speex */, + D34725340A76D7B1001C8ED7 /* iax */, + D36502A10A76CA9600C47A76 /* ilbc */, + D365021D0A76C82200C47A76 /* gsm */, + D36500F00A76BE9400C47A76 /* pcre */, + D3BC33590A76AB5600DE971E /* sndfile */, + D3F6914B0A77C203007E38CA /* osipparser2 */, + D3F690FC0A77C002007E38CA /* osip2 */, + D3F692010A77C51B007E38CA /* exosip2 */, D3BC31D20A769AE100DE971E /* Build Modules */, D3BC31D50A769AED00DE971E /* mod_echo */, D3BC325E0A769CA700DE971E /* mod_dingaling */, @@ -5197,24 +6301,22 @@ D3BC33100A76A83D00DE971E /* mod_softtimer */, D3BC331D0A76A87E00DE971E /* mod_g711 */, D3BC33410A76A9D900DE971E /* mod_conference */, - D3BC33590A76AB5600DE971E /* sndfile */, D3BC34CC0A76AFEE00DE971E /* mod_sndfile */, D3BC34E50A76B0FC00DE971E /* mod_console */, D365007F0A76BDF700C47A76 /* mod_dialplan_xml */, - D36500F00A76BE9400C47A76 /* pcre */, D36501D80A76C57300C47A76 /* mod_dptools */, D36501DC0A76C57E00C47A76 /* mod_ivrtest */, D36501E00A76C58C00C47A76 /* mod_rss */, - D365021D0A76C82200C47A76 /* gsm */, D36502500A76C8CD00C47A76 /* mod_gsm */, - D36502A10A76CA9600C47A76 /* ilbc */, D36502D90A76CAF200C47A76 /* mod_ilbc */, - D34725340A76D7B1001C8ED7 /* iax */, D34725510A76D8D6001C8ED7 /* mod_iax */, - D301514E0A76EB5D00117F59 /* speex */, D3B406C10A76EE4D000AF6D4 /* mod_speex */, - D3152F7C0A76F0A100549119 /* portaudio */, D3152FA70A76F21400549119 /* mod_portaudio */, + D3F693060A77D473007E38CA /* mod_exosip */, + D3E66A7E0A77E62D00D04E25 /* mod_woomera */, + D3E66AF10A77E6B400D04E25 /* mod_syslog */, + D3E66B070A77E73100D04E25 /* mod_event_multicast */, + D3E66B0F0A77E76200D04E25 /* mod_event_socket */, ); }; /* End PBXProject section */ @@ -5234,6 +6336,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D3F691FE0A77C51B007E38CA /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -5393,6 +6502,45 @@ shellPath = /bin/bash; shellScript = "if [ -e ../../libs/iksemel-$FREESWITCH_IKSEMEL_VERSION/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl $FREESWITCH_DOWNLOAD_URL/iksemel-$FREESWITCH_IKSEMEL_VERSION.tar.gz -o ../../libs/iksemel-$FREESWITCH_IKSEMEL_VERSION.tar.gz\ncd ../../libs\ntar zxfv iksemel-$FREESWITCH_IKSEMEL_VERSION.tar.gz\ncd iksemel-$FREESWITCH_IKSEMEL_VERSION\n./configure \ntouch .complete"; }; + D3F691020A77C01B007E38CA /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/bash; + shellScript = "if [ -e ../../libs/libosip2-$FREESWITCH_LIBOSIP2_VERSION/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl $FREESWITCH_DOWNLOAD_URL/libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz -o ../../libs/libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd ../../libs\ntar zxfv libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd libosip2-$FREESWITCH_LIBOSIP2_VERSION\n./configure \ntouch .complete"; + }; + D3F691510A77C236007E38CA /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/bash; + shellScript = "if [ -e ../../libs/libosip2-$FREESWITCH_LIBOSIP2_VERSION/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl $FREESWITCH_DOWNLOAD_URL/libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz -o ../../libs/libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd ../../libs\ntar zxfv libosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd libosip2-$FREESWITCH_LIBOSIP2_VERSION\n./configure \ntouch .complete"; + }; + D3F692150A77C5F8007E38CA /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/bash; + shellScript = "if [ -e ../../libs/libeXosip2-$FREESWITCH_LIBOSIP2_VERSION/.complete ]; then\n\texit 0\nfi\n/usr/bin/curl $FREESWITCH_DOWNLOAD_URL/libeXosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz -o ../../libs/libeXosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd ../../libs\ntar zxfv libeXosip2-$FREESWITCH_LIBOSIP2_VERSION.tar.gz\ncd libeXosip2-$FREESWITCH_LIBOSIP2_VERSION\n./configure --disable-josua\ntouch .complete"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -6052,6 +7200,152 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + D3E66A7C0A77E62D00D04E25 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66AE40A77E64A00D04E25 /* mod_woomera.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66AEF0A77E6B400D04E25 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66AF70A77E6ED00D04E25 /* mod_syslog.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66B050A77E73100D04E25 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66B160A77E7B300D04E25 /* mod_event_multicast.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3E66B0D0A77E76200D04E25 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3E66B180A77E7C600D04E25 /* mod_event_socket.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F690FA0A77C002007E38CA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F691200A77C12E007E38CA /* fsm_misc.c in Sources */, + D3F691220A77C12E007E38CA /* ict_fsm.c in Sources */, + D3F691230A77C12E007E38CA /* ict.c in Sources */, + D3F691240A77C12E007E38CA /* ist_fsm.c in Sources */, + D3F691250A77C12E007E38CA /* ist.c in Sources */, + D3F691260A77C12E007E38CA /* nict_fsm.c in Sources */, + D3F691270A77C12E007E38CA /* nict.c in Sources */, + D3F691280A77C12E007E38CA /* nist_fsm.c in Sources */, + D3F691290A77C12E007E38CA /* nist.c in Sources */, + D3F6912A0A77C12E007E38CA /* osip_dialog.c in Sources */, + D3F6912B0A77C12E007E38CA /* osip_event.c in Sources */, + D3F6912C0A77C12E007E38CA /* osip_time.c in Sources */, + D3F6912D0A77C12E007E38CA /* osip_transaction.c in Sources */, + D3F6912E0A77C12E007E38CA /* osip.c in Sources */, + D3F6912F0A77C12E007E38CA /* port_condv.c in Sources */, + D3F691300A77C12E007E38CA /* port_fifo.c in Sources */, + D3F691310A77C12E007E38CA /* port_sema.c in Sources */, + D3F691320A77C12E007E38CA /* port_thread.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F691490A77C203007E38CA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F691820A77C3E3007E38CA /* osip_accept_encoding.c in Sources */, + D3F691830A77C3E3007E38CA /* osip_accept_language.c in Sources */, + D3F691840A77C3E3007E38CA /* osip_accept.c in Sources */, + D3F691850A77C3E3007E38CA /* osip_alert_info.c in Sources */, + D3F691860A77C3E3007E38CA /* osip_allow.c in Sources */, + D3F691870A77C3E3007E38CA /* osip_authentication_info.c in Sources */, + D3F691880A77C3E3007E38CA /* osip_authorization.c in Sources */, + D3F691890A77C3E3007E38CA /* osip_body.c in Sources */, + D3F6918A0A77C3E3007E38CA /* osip_call_id.c in Sources */, + D3F6918B0A77C3E3007E38CA /* osip_call_info.c in Sources */, + D3F6918C0A77C3E3007E38CA /* osip_contact.c in Sources */, + D3F6918D0A77C3E3007E38CA /* osip_content_disposition.c in Sources */, + D3F6918E0A77C3E3007E38CA /* osip_content_encoding.c in Sources */, + D3F6918F0A77C3E3007E38CA /* osip_content_length.c in Sources */, + D3F691900A77C3E3007E38CA /* osip_content_type.c in Sources */, + D3F691910A77C3E3007E38CA /* osip_cseq.c in Sources */, + D3F691920A77C3E3007E38CA /* osip_error_info.c in Sources */, + D3F691930A77C3E3007E38CA /* osip_from.c in Sources */, + D3F691940A77C3E3007E38CA /* osip_header.c in Sources */, + D3F691950A77C3E3007E38CA /* osip_list.c in Sources */, + D3F691960A77C3E3007E38CA /* osip_md5c.c in Sources */, + D3F691970A77C3E3007E38CA /* osip_message_parse.c in Sources */, + D3F691980A77C3E3007E38CA /* osip_message_to_str.c in Sources */, + D3F691990A77C3E3007E38CA /* osip_message.c in Sources */, + D3F6919A0A77C3E3007E38CA /* osip_mime_version.c in Sources */, + D3F6919B0A77C3E3007E38CA /* osip_parser_cfg.c in Sources */, + D3F6919C0A77C3E3007E38CA /* osip_port.c in Sources */, + D3F6919D0A77C3E3007E38CA /* osip_proxy_authenticate.c in Sources */, + D3F6919E0A77C3E3007E38CA /* osip_proxy_authentication_info.c in Sources */, + D3F6919F0A77C3E3007E38CA /* osip_proxy_authorization.c in Sources */, + D3F691A00A77C3E3007E38CA /* osip_record_route.c in Sources */, + D3F691A10A77C3E3007E38CA /* osip_route.c in Sources */, + D3F691A20A77C3E3007E38CA /* osip_to.c in Sources */, + D3F691A30A77C3E3007E38CA /* osip_uri.c in Sources */, + D3F691A40A77C3E3007E38CA /* osip_via.c in Sources */, + D3F691A50A77C3E3007E38CA /* osip_www_authenticate.c in Sources */, + D3F691A70A77C3E3007E38CA /* sdp_accessor.c in Sources */, + D3F691A80A77C3E3007E38CA /* sdp_message.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F691FF0A77C51B007E38CA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F6923A0A77C79F007E38CA /* eXcall_api.c in Sources */, + D3F6923B0A77C79F007E38CA /* eXconf.c in Sources */, + D3F6923C0A77C79F007E38CA /* eXinsubscription_api.c in Sources */, + D3F6923D0A77C79F007E38CA /* eXmessage_api.c in Sources */, + D3F6923E0A77C79F007E38CA /* eXoptions_api.c in Sources */, + D3F6923F0A77C79F007E38CA /* eXosip.c in Sources */, + D3F692410A77C79F007E38CA /* eXpublish_api.c in Sources */, + D3F692420A77C79F007E38CA /* eXrefer_api.c in Sources */, + D3F692430A77C79F007E38CA /* eXregister_api.c in Sources */, + D3F692440A77C79F007E38CA /* eXsubscription_api.c in Sources */, + D3F692450A77C79F007E38CA /* eXtransport.c in Sources */, + D3F692460A77C79F007E38CA /* eXutils.c in Sources */, + D3F692470A77C79F007E38CA /* inet_ntop.c in Sources */, + D3F692490A77C79F007E38CA /* jauth.c in Sources */, + D3F6924A0A77C79F007E38CA /* jcall.c in Sources */, + D3F6924B0A77C79F007E38CA /* jcallback.c in Sources */, + D3F6924C0A77C79F007E38CA /* jdialog.c in Sources */, + D3F6924D0A77C79F007E38CA /* jevents.c in Sources */, + D3F6924E0A77C79F007E38CA /* jnotify.c in Sources */, + D3F6924F0A77C79F007E38CA /* jpipe.c in Sources */, + D3F692510A77C79F007E38CA /* jpublish.c in Sources */, + D3F692520A77C79F007E38CA /* jreg.c in Sources */, + D3F692530A77C79F007E38CA /* jrequest.c in Sources */, + D3F692540A77C79F007E38CA /* jresponse.c in Sources */, + D3F692550A77C79F007E38CA /* jsubscribe.c in Sources */, + D3F692560A77C79F007E38CA /* misc.c in Sources */, + D3F692570A77C79F007E38CA /* sdp_offans.c in Sources */, + D3F692580A77C79F007E38CA /* udp.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + D3F693040A77D473007E38CA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D3F693150A77D4D6007E38CA /* mod_exosip.c in Sources */, + D3F693160A77D4D6007E38CA /* osip_rfc3264.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -6205,6 +7499,16 @@ target = D38DD4400A7687A700FEDB19 /* freeswitch_cli */; targetProxy = D38DD5740A768D9C00FEDB19 /* PBXContainerItemProxy */; }; + D3AA5D760A77D61E008F105E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3F693060A77D473007E38CA /* mod_exosip */; + targetProxy = D3AA5D750A77D61E008F105E /* PBXContainerItemProxy */; + }; + D3AA5D780A77D62B008F105E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3F692010A77C51B007E38CA /* exosip2 */; + targetProxy = D3AA5D770A77D62B008F105E /* PBXContainerItemProxy */; + }; D3B407500A76EEE9000AF6D4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D3B406C10A76EE4D000AF6D4 /* mod_speex */; @@ -6290,11 +7594,46 @@ target = D3DEC8300A75DA10002001CF /* teletone */; targetProxy = D3DEC8440A75DAC1002001CF /* PBXContainerItemProxy */; }; + D3E66AE70A77E65800D04E25 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3E66A7E0A77E62D00D04E25 /* mod_woomera */; + targetProxy = D3E66AE60A77E65800D04E25 /* PBXContainerItemProxy */; + }; + D3E66AFA0A77E70500D04E25 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3E66AF10A77E6B400D04E25 /* mod_syslog */; + targetProxy = D3E66AF90A77E70500D04E25 /* PBXContainerItemProxy */; + }; + D3E66B330A77E82600D04E25 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3E66B070A77E73100D04E25 /* mod_event_multicast */; + targetProxy = D3E66B320A77E82600D04E25 /* PBXContainerItemProxy */; + }; + D3E66B350A77E82B00D04E25 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3E66B0F0A77E76200D04E25 /* mod_event_socket */; + targetProxy = D3E66B340A77E82B00D04E25 /* PBXContainerItemProxy */; + }; D3EDD2A10A76D3C900AC4900 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = D37671640A75F0DC00ACC1FB /* libfreeswitch */; targetProxy = D3EDD2A00A76D3C900AC4900 /* PBXContainerItemProxy */; }; + D3F6927F0A77C8B0007E38CA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3F690FC0A77C002007E38CA /* osip2 */; + targetProxy = D3F6927E0A77C8B0007E38CA /* PBXContainerItemProxy */; + }; + D3F692810A77C8B2007E38CA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3F6914B0A77C203007E38CA /* osipparser2 */; + targetProxy = D3F692800A77C8B2007E38CA /* PBXContainerItemProxy */; + }; + D3F6928C0A77C979007E38CA /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = D3F6914B0A77C203007E38CA /* osipparser2 */; + targetProxy = D3F6928B0A77C979007E38CA /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -6325,6 +7664,7 @@ FREESWITCH_DOWNLOAD_URL = "http://svn.freeswitch.org/downloads/libs"; FREESWITCH_IKSEMEL_VERSION = 1.2; FREESWITCH_INSTALL_PREFIX = "$(HOME)"; + FREESWITCH_LIBOSIP2_VERSION = 2.2.3; FREESWITCH_LIBSNDFILE_VERSION = 1.0.16; FREESWITCH_PCRE_VERSION = 6.4; FREESWITCH_RESAMPLE_VERSION = 0.1.3; @@ -6333,6 +7673,7 @@ FREESWITCH_SQLITE_VERSION_B = 3003006; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; + OTHER_CFLAGS = "-fPIC"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; @@ -6352,7 +7693,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = speex.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = "-w"; PREBINDING = NO; PRODUCT_NAME = speex; @@ -6372,7 +7713,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = speex.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = "-w"; PREBINDING = NO; PRODUCT_NAME = speex; @@ -6394,7 +7735,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = portaudio.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = portaudio; ZERO_LINK = YES; @@ -6413,7 +7754,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = portaudio.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = portaudio; ZERO_LINK = NO; @@ -6458,6 +7799,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_portaudio; @@ -6481,7 +7825,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = iax.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6506,7 +7850,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = iax.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-w", "$(OTHER_CFLAGS_QUOTED_1)", @@ -6596,6 +7940,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_iax; @@ -6641,6 +7988,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_dialplan_xml; @@ -6664,7 +8014,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = pcre.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6689,7 +8039,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = pcre.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = "-w"; PREBINDING = NO; PRODUCT_NAME = pcre; @@ -6734,6 +8084,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_dptools; @@ -6779,6 +8132,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_ivrtest; @@ -6824,6 +8180,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_rss; @@ -6847,7 +8206,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = gsm.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6872,7 +8231,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = gsm.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = gsm; ZERO_LINK = NO; @@ -6916,6 +8275,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_gsm; @@ -6939,7 +8301,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = ilbc.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -6964,7 +8326,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = ilbc.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = ilbc; ZERO_LINK = NO; @@ -7008,6 +8370,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_ilbc; @@ -7031,7 +8396,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = sqlite.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7057,7 +8422,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = sqlite.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-DHAVE_USLEEP=1", "-DNDEBUG", @@ -7090,7 +8455,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = libfreeswitch.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-fPIC", "-Wmissing-prototypes", @@ -7134,10 +8499,9 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = libfreeswitch.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; MACH_O_TYPE = mh_dylib; OTHER_CFLAGS = ( - "-fPIC", "-Wmissing-prototypes", "-g", "-std=c99", @@ -7177,7 +8541,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = "$(HOME)/bin"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/bin"; PREBINDING = NO; PRODUCT_NAME = freeswitch; ZERO_LINK = YES; @@ -7192,8 +8556,11 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/bin"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; PREBINDING = NO; PRODUCT_NAME = freeswitch; + WARNING_LDFLAGS = ""; ZERO_LINK = NO; }; name = Release; @@ -7213,7 +8580,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = srtp.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7238,7 +8605,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = srtp.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = srtp; ZERO_LINK = NO; @@ -7260,7 +8627,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = resample.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7286,7 +8653,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = resample.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = resample; ZERO_LINK = NO; @@ -7308,7 +8675,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = speakup.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7333,7 +8700,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = speakup.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = speakup; ZERO_LINK = NO; @@ -7378,6 +8745,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_speex; @@ -7445,6 +8815,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_echo; @@ -7490,6 +8863,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_dingaling; @@ -7514,6 +8890,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_playback; @@ -7535,6 +8914,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_playback; @@ -7580,6 +8962,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_bridgecall; @@ -7625,6 +9010,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_l16; @@ -7670,6 +9058,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_commands; @@ -7715,6 +9106,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_softtimer; @@ -7760,6 +9154,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_g711; @@ -7805,6 +9202,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_conference; @@ -7828,7 +9228,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = sndfile.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -7853,7 +9253,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = sndfile.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-I/Developer/Headers/FlatCarbon", "-w", @@ -7902,6 +9302,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_sndfile; @@ -7947,6 +9350,9 @@ OTHER_LDFLAGS = ( "-undefined", dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", ); PREBINDING = NO; PRODUCT_NAME = mod_console; @@ -7970,7 +9376,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; INFOPLIST_FILE = apr.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-g", "-O2", @@ -8003,7 +9409,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_WARN_ABOUT_RETURN_TYPE = NO; INFOPLIST_FILE = apr.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-g", "-O2", @@ -8036,7 +9442,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = aprutil.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ""; PREBINDING = NO; PRODUCT_NAME = aprutil; @@ -8057,7 +9463,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = aprutil.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ""; PREBINDING = NO; PRODUCT_NAME = aprutil; @@ -8101,7 +9507,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = teletone.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8126,7 +9532,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = teletone.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_LDFLAGS = ( "-framework", Foundation, @@ -8153,7 +9559,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = iksemel.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-I.", @@ -8181,7 +9587,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = iksemel.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", "-I.", @@ -8210,7 +9616,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = dingaling.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = dingaling; ZERO_LINK = YES; @@ -8229,13 +9635,465 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; INFOPLIST_FILE = dingaling.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; PREBINDING = NO; PRODUCT_NAME = dingaling; ZERO_LINK = NO; }; name = Release; }; + D3E66AE90A77E65E00D04E25 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXECUTABLE_EXTENSION = so; + EXECUTABLE_PREFIX = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/lib; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + ); + PREBINDING = NO; + PRODUCT_NAME = mod_woomera; + }; + name = Debug; + }; + D3E66AEA0A77E65E00D04E25 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + EXECUTABLE_EXTENSION = dylib; + EXECUTABLE_PREFIX = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/mod"; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", + ); + PREBINDING = NO; + PRODUCT_NAME = mod_woomera; + SKIP_INSTALL = NO; + ZERO_LINK = NO; + }; + name = Release; + }; + D3E66AF40A77E6EA00D04E25 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXECUTABLE_EXTENSION = so; + EXECUTABLE_PREFIX = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/lib; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + ); + PREBINDING = NO; + PRODUCT_NAME = mod_syslog; + }; + name = Debug; + }; + D3E66AF50A77E6EA00D04E25 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + EXECUTABLE_EXTENSION = dylib; + EXECUTABLE_PREFIX = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/mod"; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", + ); + PREBINDING = NO; + PRODUCT_NAME = mod_syslog; + SKIP_INSTALL = NO; + ZERO_LINK = NO; + }; + name = Release; + }; + D3E66B0B0A77E74F00D04E25 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXECUTABLE_EXTENSION = so; + EXECUTABLE_PREFIX = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/lib; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + ); + PREBINDING = NO; + PRODUCT_NAME = mod_event_multicast; + }; + name = Debug; + }; + D3E66B0C0A77E74F00D04E25 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + EXECUTABLE_EXTENSION = dylib; + EXECUTABLE_PREFIX = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/mod"; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", + ); + PREBINDING = NO; + PRODUCT_NAME = mod_event_multicast; + SKIP_INSTALL = NO; + ZERO_LINK = NO; + }; + name = Release; + }; + D3E66B130A77E78E00D04E25 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXECUTABLE_EXTENSION = so; + EXECUTABLE_PREFIX = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/lib; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + ); + PREBINDING = NO; + PRODUCT_NAME = mod_event_socket; + }; + name = Debug; + }; + D3E66B140A77E78E00D04E25 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + EXECUTABLE_EXTENSION = dylib; + EXECUTABLE_PREFIX = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/mod"; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", + ); + PREBINDING = NO; + PRODUCT_NAME = mod_event_socket; + SKIP_INSTALL = NO; + ZERO_LINK = NO; + }; + name = Release; + }; + D3F691000A77C003007E38CA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INFOPLIST_FILE = osip2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = osip2; + ZERO_LINK = YES; + }; + name = Debug; + }; + D3F691010A77C003007E38CA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + DYLIB_CURRENT_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = osip2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_CFLAGS = ( + "-w", + "-DOSIP_MT", + "-DHAVE_PTHREAD", + "-DHAVE_STRUCT_TIMEVAL", + "-DHAVE_CONFIG_H", + "-I.", + "-I.", + "-I../..", + "-I../../include", + "-Wall", + "-Wcast-align", + "-Wchar-subscripts", + "-Wformat", + "-Winline", + "-Wmissing-declarations", + "-Wmissing-prototypes", + "-Wnested-externs", + "-Wpointer-arith", + "-g", + "-g", + "-DENABLE_TRACE", + "-g", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include/osipparser2/headers", + ); + OTHER_LDFLAGS = "-lpthread"; + PREBINDING = NO; + PRODUCT_NAME = osip2; + ZERO_LINK = NO; + }; + name = Release; + }; + D3F6914F0A77C203007E38CA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INFOPLIST_FILE = osipparser2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = osipparser2; + ZERO_LINK = YES; + }; + name = Debug; + }; + D3F691500A77C203007E38CA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + DYLIB_CURRENT_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = osipparser2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_CFLAGS = ( + "-w", + "-DHAVE_CONFIG_H", + "-Wall", + "-Wcast-align", + "-Wchar-subscripts", + "-Wformat", + "-Winline", + "-Wmissing-declarations", + "-Wmissing-prototypes", + "-Wnested-externs", + "-Wpointer-arith", + "-g", + "-DENABLE_TRACE", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include/osipparser2/headers", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)", + ); + PREBINDING = NO; + PRODUCT_NAME = osipparser2; + ZERO_LINK = NO; + }; + name = Release; + }; + D3F692050A77C51C007E38CA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + FRAMEWORK_VERSION = A; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INFOPLIST_FILE = exosip2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PREBINDING = NO; + PRODUCT_NAME = exosip2; + ZERO_LINK = YES; + }; + name = Debug; + }; + D3F692060A77C51C007E38CA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + DYLIB_CURRENT_VERSION = "$(FREESWITCH_LIBOSIP2_VERSION)"; + FRAMEWORK_VERSION = A; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + INFOPLIST_FILE = exosip2.plist; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/Library/Frameworks"; + OTHER_CFLAGS = ( + "-w", + "-Wall", + "-Wcast-align", + "-Wchar-subscripts", + "-Wformat", + "-Winline", + "-Wmissing-declarations", + "-Wmissing-prototypes", + "-Wnested-externs", + "-Wpointer-arith", + "-DHAVE_CONFIG_H", + "-DOSIP_MT", + "-pedantic", + "-DENABLE_DEBUG", + "-g", + "-DENABLE_TRACE", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libeXosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include/osipparser2/headers", + ); + PREBINDING = NO; + PRODUCT_NAME = exosip2; + ZERO_LINK = NO; + }; + name = Release; + }; + D3F6930F0A77D493007E38CA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXECUTABLE_EXTENSION = so; + EXECUTABLE_PREFIX = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + INSTALL_PATH = /usr/local/lib; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + ); + PREBINDING = NO; + PRODUCT_NAME = mod_exosip; + }; + name = Debug; + }; + D3F693100A77D493007E38CA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + EXECUTABLE_EXTENSION = dylib; + EXECUTABLE_PREFIX = ""; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_MODEL_TUNING = G5; + INSTALL_PATH = "$(FREESWITCH_INSTALL_PREFIX)/freeswitch/mod"; + KEEP_PRIVATE_EXTERNS = NO; + MACH_O_TYPE = mh_bundle; + OTHER_CFLAGS = ( + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libeXosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include", + "-I../../libs/libosip2-$(FREESWITCH_LIBOSIP2_VERSION)/include/osipparser2/headers", + ); + OTHER_LDFLAGS = ( + "-undefined", + dynamic_lookup, + "-dynamic", + "-bundle", + "-force_flat_namespace", + ); + PREBINDING = NO; + PRODUCT_NAME = mod_exosip; + SKIP_INSTALL = NO; + ZERO_LINK = NO; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -8604,6 +10462,78 @@ buildConfigurations = ( D3DEC8EA0A75E1A0002001CF /* Debug */, D3DEC8EB0A75E1A0002001CF /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3E66AE80A77E65E00D04E25 /* Build configuration list for PBXNativeTarget "mod_woomera" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3E66AE90A77E65E00D04E25 /* Debug */, + D3E66AEA0A77E65E00D04E25 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3E66AF30A77E6EA00D04E25 /* Build configuration list for PBXNativeTarget "mod_syslog" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3E66AF40A77E6EA00D04E25 /* Debug */, + D3E66AF50A77E6EA00D04E25 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3E66B0A0A77E74F00D04E25 /* Build configuration list for PBXNativeTarget "mod_event_multicast" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3E66B0B0A77E74F00D04E25 /* Debug */, + D3E66B0C0A77E74F00D04E25 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3E66B120A77E78E00D04E25 /* Build configuration list for PBXNativeTarget "mod_event_socket" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3E66B130A77E78E00D04E25 /* Debug */, + D3E66B140A77E78E00D04E25 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3F690FF0A77C003007E38CA /* Build configuration list for PBXNativeTarget "osip2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3F691000A77C003007E38CA /* Debug */, + D3F691010A77C003007E38CA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3F6914E0A77C203007E38CA /* Build configuration list for PBXNativeTarget "osipparser2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3F6914F0A77C203007E38CA /* Debug */, + D3F691500A77C203007E38CA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3F692040A77C51C007E38CA /* Build configuration list for PBXNativeTarget "exosip2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3F692050A77C51C007E38CA /* Debug */, + D3F692060A77C51C007E38CA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + D3F6930E0A77D493007E38CA /* Build configuration list for PBXNativeTarget "mod_exosip" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D3F6930F0A77D493007E38CA /* Debug */, + D3F693100A77D493007E38CA /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; Added: freeswitch/branches/cypromis/trunk/mac/xcode/exosip2.plist ============================================================================== --- (empty file) +++ freeswitch/branches/cypromis/trunk/mac/xcode/exosip2.plist Tue Aug 1 03:49:17 2006 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIdentifier</key> + <string>org.freeswitch.exosip2</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>FMWK</string> + <key>CFBundleSignature</key> + <string>BKW</string> + <key>CFBundleVersion</key> + <string>$(FREESWITCH_LIBOSIP2_VERSION)</string> +</dict> +</plist> Modified: freeswitch/branches/cypromis/trunk/mac/xcode/libfreeswitch.plist ============================================================================== --- freeswitch/branches/cypromis/trunk/mac/xcode/libfreeswitch.plist (original) +++ freeswitch/branches/cypromis/trunk/mac/xcode/libfreeswitch.plist Tue Aug 1 03:49:17 2006 @@ -7,13 +7,13 @@ <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> <key>CFBundleIdentifier</key> - <string>com.yourcompany.libfreeswitch</string> + <string>org.freeswitch.libfreeswitch</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> - <string>????</string> + <string>BKW</string> <key>CFBundleVersion</key> <string>1.0</string> </dict> Added: freeswitch/branches/cypromis/trunk/mac/xcode/osip2.plist ============================================================================== --- (empty file) +++ freeswitch/branches/cypromis/trunk/mac/xcode/osip2.plist Tue Aug 1 03:49:17 2006 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIdentifier</key> + <string>org.freeswitch.osip2</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>FMWK</string> + <key>CFBundleSignature</key> + <string>BKW</string> + <key>CFBundleVersion</key> + <string>$(FREESWITCH_LIBOSIP2_VERSION)</string> +</dict> +</plist> Added: freeswitch/branches/cypromis/trunk/mac/xcode/osipparser2.plist ============================================================================== --- (empty file) +++ freeswitch/branches/cypromis/trunk/mac/xcode/osipparser2.plist Tue Aug 1 03:49:17 2006 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>${EXECUTABLE_NAME}</string> + <key>CFBundleIdentifier</key> + <string>org.freeswitch.osipparser2</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>FMWK</string> + <key>CFBundleSignature</key> + <string>BKW</string> + <key>CFBundleVersion</key> + <string>$(FREESWITCH_LIBOSIP2_VERSION)</string> +</dict> +</plist> Modified: freeswitch/branches/cypromis/trunk/src/include/switch.h ============================================================================== --- freeswitch/branches/cypromis/trunk/src/include/switch.h (original) +++ freeswitch/branches/cypromis/trunk/src/include/switch.h Tue Aug 1 03:49:17 2006 @@ -73,6 +73,7 @@ #include <switch_stun.h> #include <switch_log.h> #include <switch_xml.h> +#include <pcre.h> /** \mainpage FreeSWITCH Modified: freeswitch/branches/cypromis/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/branches/cypromis/trunk/src/include/switch_core.h (original) +++ freeswitch/branches/cypromis/trunk/src/include/switch_core.h Tue Aug 1 03:49:17 2006 @@ -206,7 +206,7 @@ \return a void pointer to the allocated memory \note this memory never goes out of scope until the core is destroyed */ -SWITCH_DECLARE(void *) switch_core_permenant_alloc(switch_size_t memory); +SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory); /*! \brief Allocate memory directly from a memory pool @@ -226,11 +226,11 @@ SWITCH_DECLARE(void *) switch_core_session_alloc(switch_core_session_t *session, switch_size_t memory); /*! - \brief Copy a string using permenant memory allocation + \brief Copy a string using permanent memory allocation \param todup the string to duplicate \return a pointer to the newly duplicated string */ -SWITCH_DECLARE(char *) switch_core_permenant_strdup(char *todup); +SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup); /*! \brief Copy a string using memory allocation from a session's pool Modified: freeswitch/branches/cypromis/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/branches/cypromis/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/branches/cypromis/trunk/src/include/switch_loadable_module.h Tue Aug 1 03:49:17 2006 @@ -191,10 +191,11 @@ \brief Execute a registered API command \param cmd the name of the API command to execute \param arg the optional arguement to the command + \param session an optional session \param stream stream for output \return the status returned by the API call */ -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_stream_handle_t *stream); +SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); Modified: freeswitch/branches/cypromis/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/branches/cypromis/trunk/src/include/switch_types.h (original) +++ freeswitch/branches/cypromis/trunk/src/include/switch_types.h Tue Aug 1 03:49:17 2006 @@ -707,7 +707,7 @@ typedef switch_status_t (*switch_send_dtmf_hook_t)(switch_core_session_t *, char *); typedef struct switch_stream_handle switch_stream_handle_t; typedef switch_status_t (*switch_stream_handle_write_function_t)(switch_stream_handle_t *handle, char *fmt, ...); -typedef switch_status_t (*switch_api_function_t)(char *in, switch_stream_handle_t *stream); +typedef switch_status_t (*switch_api_function_t)(char *in, switch_core_session_t *session, switch_stream_handle_t *stream); typedef switch_status_t (*switch_input_callback_function_t)(switch_core_session_t *session, void *input, switch_input_type_t input_type, Modified: freeswitch/branches/cypromis/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Aug 1 03:49:17 2006 @@ -35,10 +35,15 @@ static const char modname[] = "mod_commands"; -static switch_status_t status_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t status_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { uint8_t html = 0; switch_core_time_duration_t duration; + + if (session) { + return SWITCH_STATUS_FALSE; + } + switch_core_measure_time(switch_core_uptime(), &duration); if (cmd && strstr(cmd, "html")) { @@ -75,19 +80,27 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t load_function(char *mod, switch_stream_handle_t *stream) +static switch_status_t load_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { + + if (session) { + return SWITCH_STATUS_FALSE; + } switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) mod); - stream->write_function(stream, "OK\n"); + stream->write_function(stream, "OK\n"); return SWITCH_STATUS_SUCCESS; } -static switch_status_t reload_function(char *mod, switch_stream_handle_t *stream) +static switch_status_t reload_function(char *mod, switch_core_session_t *session, switch_stream_handle_t *stream) { const char *err; switch_xml_t xml_root; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((xml_root = switch_xml_open_root(1, &err))) { switch_xml_free(xml_root); } @@ -96,10 +109,14 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t kill_function(char *dest, switch_stream_handle_t *stream) +static switch_status_t kill_function(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if ((session = switch_core_session_locate(dest))) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_core_session_kill_channel(session, SWITCH_SIG_KILL); @@ -114,11 +131,15 @@ } -static switch_status_t transfer_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t transfer_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; char *argv[4] = {0}; int argc = 0; + + if (isession) { + return SWITCH_STATUS_FALSE; + } argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -151,11 +172,15 @@ -static switch_status_t pause_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t pause_function(char *cmd, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session = NULL; char *argv[4] = {0}; int argc = 0; + + if (isession) { + return SWITCH_STATUS_FALSE; + } argc = switch_separate_string(cmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); @@ -230,12 +255,16 @@ return 0; } -static switch_status_t show_function(char *cmd, switch_stream_handle_t *stream) +static switch_status_t show_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char sql[1024]; char *errmsg; switch_core_db_t *db = switch_core_db_handle(); struct holder holder = {0}; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (stream->event) { holder.http = switch_event_get_header(stream->event, "http-host"); Modified: freeswitch/branches/cypromis/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Aug 1 03:49:17 2006 @@ -188,7 +188,7 @@ static switch_status_t conference_play_file(conference_obj_t *conference, char *file, uint32_t leadin); static switch_status_t conference_say(conference_obj_t *conference, char *text, uint32_t leadin); static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim); -static switch_status_t conf_function(char *buf, switch_stream_handle_t *stream); +static switch_status_t conf_function(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t audio_bridge_on_ring(switch_core_session_t *session); static switch_status_t conference_outcall(conference_obj_t *conference, switch_core_session_t *session, char *bridgeto, char *cid_name, char *cid_num); static void conference_function(switch_core_session_t *session, char *data); @@ -1232,6 +1232,7 @@ static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim) { conference_member_t *member = NULL; + switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { @@ -1264,7 +1265,7 @@ } /* API Interface Function */ -static switch_status_t conf_function(char *buf, switch_stream_handle_t *stream) +static switch_status_t conf_function(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { char *lbuf = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -1292,6 +1293,10 @@ "conference <confname> dial <endpoint_module_name>/<destination>\n" "conference <confname> transfer <member_id> <conference_name>\n" ; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (stream->event) { http = switch_event_get_header(stream->event, "http-host"); Modified: freeswitch/branches/cypromis/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Aug 1 03:49:17 2006 @@ -91,9 +91,28 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", argv[0], date); switch_channel_set_variable(channel, argv[0], date); } +} + +static switch_status_t strftime_api_function(char *fmt, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + switch_size_t retsize; + switch_time_exp_t tm; + char date[80] = ""; + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), fmt, &tm); + stream->write_function(stream, date); + + return SWITCH_STATUS_SUCCESS; } +static switch_api_interface_t dptools_api_interface = { + /*.interface_name */ "strftime", + /*.desc */ "strftime", + /*.function */ strftime_api_function, + /*.next */ NULL +}; + static const switch_application_interface_t set_application_interface = { /*.interface_name */ "set", /*.application_function */ set_function @@ -120,7 +139,8 @@ /*.timer_interface = */ NULL, /*.dialplan_interface = */ NULL, /*.codec_interface = */ NULL, - /*.application_interface */ &sleep_application_interface + /*.application_interface */ &sleep_application_interface, + /*.api_interface */ &dptools_api_interface }; SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) Modified: freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_g711/mod_g711.c Tue Aug 1 03:49:17 2006 @@ -33,7 +33,7 @@ #include "g711.h" -static const char modname[] = "mod_g711codec"; +static const char modname[] = "mod_g711"; static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, Modified: freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/codecs/mod_l16/mod_l16.c Tue Aug 1 03:49:17 2006 @@ -31,7 +31,7 @@ */ #include <switch.h> -static const char modname[] = "mod_rawaudio"; +static const char modname[] = "mod_l16"; static switch_status_t switch_raw_init(switch_codec_t *codec, switch_codec_flag_t flags, Modified: freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile (original) +++ freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/Makefile Tue Aug 1 03:49:17 2006 @@ -1,4 +1,4 @@ -LDFLAGS += -lpcre -L/usr/local/lib +LDFLAGS += -L/usr/local/lib all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Tue Aug 1 03:49:17 2006 @@ -33,8 +33,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <pcre.h> + static const char modname[] = "mod_dialplan_xml"; #define cleanre(re) if (re) {\ @@ -122,6 +122,13 @@ substituted[y++] = '\0'; } +typedef enum { + BREAK_ON_TRUE, + BREAK_ON_FALSE, + BREAK_ALWAYS, + BREAK_NEVER +} break_t; + static int parse_exten(switch_core_session_t *session, switch_xml_t xexten, switch_caller_extension_t **extension) { switch_xml_t xcond, xaction; @@ -135,17 +142,50 @@ for (xcond = switch_xml_child(xexten, "condition"); xcond; xcond = xcond->next) { char *field = NULL; + char *do_break_a = NULL; char *expression = NULL; char *field_data = NULL; + char retbuf[1024] = ""; pcre *re = NULL; int ovector[30]; - + break_t do_break_i = BREAK_ON_FALSE; + field = (char *) switch_xml_attr(xcond, "field"); + expression = (char *) switch_xml_attr_soft(xcond, "expression"); - + + if ((do_break_a = (char *) switch_xml_attr(xcond, "break"))) { + if (!strcasecmp(do_break_a, "on-true")) { + do_break_i = BREAK_ON_TRUE; + } else if (!strcasecmp(do_break_a, "on-false")) { + do_break_i = BREAK_ON_FALSE; + } else if (!strcasecmp(do_break_a, "always")) { + do_break_i = BREAK_ALWAYS; + } else if (!strcasecmp(do_break_a, "never")) { + do_break_i = BREAK_NEVER; + } + } + if (field) { if (*field == '$') { field_data = switch_channel_get_variable(channel, field + 1); + } else if (*field == '%') { + switch_stream_handle_t stream = {0}; + char *cmd = switch_core_session_strdup(session, field + 1); + char *arg; + + if (cmd) { + if ((arg = strchr(cmd, ' '))) { + *arg++ = '\0'; + } + stream.data = retbuf; + stream.end = stream.data; + stream.data_size = sizeof(retbuf); + stream.write_function = switch_console_stream_write; + if (switch_api_execute(cmd, arg, session, &stream) == SWITCH_STATUS_SUCCESS) { + field_data = retbuf; + } + } } else { field_data = switch_caller_get_field_by_name(caller_profile, field); } @@ -155,7 +195,27 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "test conditions %s(%s) =~ /%s/\n", field, field_data, expression); if (!(proceed = perform_regex(channel, field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Regex mismatch\n"); - break; + + for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) { + char *application = (char*) switch_xml_attr_soft(xaction, "application"); + char *data = (char *) switch_xml_attr_soft(xaction, "data"); + + if (!*extension) { + if ((*extension = + switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + return 0; + } + } + + switch_caller_extension_add_application(session, *extension, application, data); + } + + if (do_break_i == BREAK_ON_FALSE || do_break_i == BREAK_ALWAYS) { + break; + } else { + continue; + } } assert(re != NULL); } @@ -186,6 +246,10 @@ } cleanre(re); + + if (do_break_i == BREAK_ON_TRUE || do_break_i == BREAK_ALWAYS) { + break; + } } return proceed; } Modified: freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Aug 1 03:49:17 2006 @@ -151,8 +151,8 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string); -static switch_status_t dl_login(char *arg, switch_stream_handle_t *stream); -static switch_status_t dl_logout(char *profile_name, switch_stream_handle_t *stream); +static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream); +static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream); static switch_status_t channel_on_init(switch_core_session_t *session); static switch_status_t channel_on_hangup(switch_core_session_t *session); static switch_status_t channel_on_ring(switch_core_session_t *session); @@ -1248,10 +1248,14 @@ } } -static switch_status_t dl_logout(char *profile_name, switch_stream_handle_t *stream) +static switch_status_t dl_logout(char *profile_name, switch_core_session_t *session, switch_stream_handle_t *stream) { struct mdl_profile *profile; + if (session) { + return SWITCH_STATUS_FALSE; + } + if (!profile_name) { stream->write_function(stream, "NO PROFILE NAME SPECIFIED\n"); return SWITCH_STATUS_SUCCESS; @@ -1267,13 +1271,17 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t dl_login(char *arg, switch_stream_handle_t *stream) +static switch_status_t dl_login(char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { char *argv[10] = {0}; int argc = 0; char *var, *val, *myarg; struct mdl_profile *profile = NULL; int x; + + if (session) { + return SWITCH_STATUS_FALSE; + } if (switch_strlen_zero(arg)) { stream->write_function(stream, "FAIL\n"); Modified: freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_exosip/mod_exosip.c Tue Aug 1 03:49:17 2006 @@ -2095,7 +2095,7 @@ char *errmsg; switch_mutex_lock(globals.reg_mutex); - snprintf(sql, sizeof(sql), "select url from sip_registrations where expires > 0 and expires < %ld", now); + snprintf(sql, sizeof(sql), "select url from sip_registrations where expires > 0 and expires < %ld", (long) now); switch_core_db_exec(globals.db, sql, del_callback, NULL, &errmsg); if (errmsg) { @@ -2104,7 +2104,7 @@ errmsg = NULL; } - snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires < %ld", now); + snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires < %ld", (long) now); switch_core_db_persistant_execute(globals.db, sql, 1); switch_mutex_unlock(globals.reg_mutex); } Modified: freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Aug 1 03:49:17 2006 @@ -116,11 +116,11 @@ static int dump_info(void); static switch_status_t load_config(void); static int get_dev_by_name(char *name, int in); - static switch_status_t place_call(char *dest, switch_stream_handle_t *stream); - static switch_status_t hup_call(char *callid, switch_stream_handle_t *stream); - static switch_status_t call_info(char *callid, switch_stream_handle_t *stream); - static switch_status_t send_dtmf(char *callid, switch_stream_handle_t *stream); - static switch_status_t answer_call(char *callid, switch_stream_handle_t *stream); + static switch_status_t place_call(char *dest, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t hup_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t call_info(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t send_dtmf(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); + static switch_status_t answer_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream); /* State methods they get called when the state changes to the specific state @@ -822,11 +822,15 @@ return SWITCH_STATUS_FALSE; } -static switch_status_t place_call(char *dest, switch_stream_handle_t *stream) +static switch_status_t place_call(char *dest, switch_core_session_t *isession, switch_stream_handle_t *stream) { switch_core_session_t *session; switch_status_t status = SWITCH_STATUS_FALSE; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if (!dest) { stream->write_function(stream, "Usage: pacall <exten>"); return SWITCH_STATUS_FALSE; @@ -875,12 +879,16 @@ } -static switch_status_t hup_call(char *callid, switch_stream_handle_t *stream) +static switch_status_t hup_call(char *callid, switch_core_session_t *isession, switch_stream_handle_t *stream) { struct private_object *tech_pvt; switch_channel_t *channel = NULL; char tmp[50]; + if (isession) { + return SWITCH_STATUS_FALSE; + } + if (callid && !strcasecmp(callid, "last")) { snprintf(tmp, sizeof(tmp), "%d", globals.call_id - 1); callid = tmp; @@ -919,12 +927,16 @@ } -static switch_status_t send_dtmf(char *callid, switch_stream_handle_t *stream) +static switch_status_t send_dtmf(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; char *dtmf; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((dtmf = strchr(callid, ' ')) != 0) { *dtmf++ = '\0'; } else { @@ -943,11 +955,15 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t answer_call(char *callid, switch_stream_handle_t *stream) +static switch_status_t answer_call(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; + if (session) { + return SWITCH_STATUS_FALSE; + } + if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid)) != 0) { channel = switch_core_session_get_channel(tech_pvt->session); assert(channel != NULL); @@ -975,11 +991,16 @@ } -static switch_status_t call_info(char *callid, switch_stream_handle_t *stream) +static switch_status_t call_info(char *callid, switch_core_session_t *session, switch_stream_handle_t *stream) { struct private_object *tech_pvt; switch_hash_index_t *hi; void *val; + + if (session) { + return SWITCH_STATUS_FALSE; + } + if (!callid || !strcasecmp(callid, "all")) { for (hi = switch_hash_first(module_pool, globals.call_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val); Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/Makefile Tue Aug 1 03:49:17 2006 @@ -1,7 +1,7 @@ LDFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto CFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql CPPCC = g++ -OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o +OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/README ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/README (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/README Tue Aug 1 03:49:17 2006 @@ -49,7 +49,7 @@ Class: MysqlCDR, located in mysqlcdr.h and mysqlcdr.cpp Description: This class logs the call detail record to a MySQL 4.1.x or greater database using prepared - statements. This class is a little more complex than the prior two in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the callid of the call. + statements. This class is a little more complex than the prior two in that the fixed channel variables are treated as additional columns on the main freeswitchcdr database table for improved normalization of the database. As such, you need to specify the format of each fixed channel variable as well. If you do not specify, it will default to a varchar column type, and will not execute if the table schema does not match. Therefore it is very important to make sure that any fixed channel variables you log exist as columns on the table. The supplemental channel variables are stored in a separate table using a key / value pair linking to the callid of the call. Recommended to use at least one other logger in conjuction with this one just to be on the safe side, as failover handling of errors to write to the db are not yet implemented, and therefore there is a risk of data loss if the database connection is lost entirely (it will be limited to only those records created at the time of the loss of connection) or some other fatal error is encountered. Configuration: Section: <mysqlcdr> <param name="hostname" value=""/> value is the hostname or IP of the MySQL server (required) <param name="username" value=""/> value is the username to connect to the MySQL server with (required) Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/basecdr.cpp Tue Aug 1 03:49:17 2006 @@ -59,6 +59,7 @@ { if(newchannel != 0) { + errorstate = 0; memset(clid,0,80); memset(dialplan,0,80); memset(myuuid,0,37); @@ -84,9 +85,10 @@ if(newchannel->callerprofile->caller_id_name != 0) { strncpy(clid,newchannel->callerprofile->caller_id_name,strlen(newchannel->callerprofile->caller_id_name)); - strncat(clid," ",1); + strncat(clid," <",2); if(newchannel->callerprofile->caller_id_number != 0 ) strncat(clid,newchannel->callerprofile->caller_id_number,strlen(clid)+strlen(newchannel->callerprofile->caller_id_number)); + strncat(clid,">",1); } // Get the ANI information if it's set @@ -100,9 +102,7 @@ if(newchannel->callerprofile->network_addr != 0) strncpy(network_addr,newchannel->callerprofile->network_addr,strlen(newchannel->callerprofile->network_addr)); - - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Channel caller_profile loaded.\n"); - + originated = newchannel->originate; if(newchannel->originateprofile->uuid != 0) @@ -146,8 +146,6 @@ hangupcause = switch_channel_get_cause(newchannel->channel); hangupcause_text = switch_channel_cause2str(hangupcause); - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Call state & length calculated.\n"); - if(newchannel->callerextension != 0) if(newchannel->callerextension->last_application != 0) { @@ -158,8 +156,6 @@ } amaflags=0; - - switch_console_printf(SWITCH_CHANNEL_LOG, "BaseCDR::BaseCDR(switch_mod_cdr_newchannel*) - Processing completed.\n"); } } Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.cpp Tue Aug 1 03:49:17 2006 @@ -83,10 +83,10 @@ std::list<std::string> MysqlCDR::chanvars_supp_list; std::vector<switch_mod_cdr_sql_types_t> MysqlCDR::chanvars_fixed_types; bool MysqlCDR::activated = 0; -char* MysqlCDR::sql_query = 0; +char MysqlCDR::sql_query[1024] = ""; std::string MysqlCDR::tmp_sql_query; char MysqlCDR::sql_query_chanvars[100] = ""; -MYSQL* MysqlCDR:: conn = 0; +MYSQL* MysqlCDR::conn = 0; MYSQL_STMT* MysqlCDR::stmt=0; MYSQL_STMT* MysqlCDR::stmt_chanvars=0; char MysqlCDR::hostname[255] = ""; @@ -208,38 +208,38 @@ } tmp_sql_query.append(")"); - - std::vector<char> tempfirstvector(tmp_sql_query.begin(), tmp_sql_query.end()); - tempfirstvector.push_back('\0'); - sql_query = &tempfirstvector[0]; char tempsql_query_chanvars[] = "INSERT INTO chanvars (callid,varname,varvalue) VALUES(?,?,?)"; memset(sql_query_chanvars,0,100); strncpy(sql_query_chanvars,tempsql_query_chanvars,strlen(tempsql_query_chanvars)); - conn = mysql_init(NULL); - mysql_options(conn, MYSQL_READ_DEFAULT_FILE, ""); - if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) - { - char *error1 = "Cannot connect to MySQL Server. The error was: "; - const char *error2 = mysql_error(conn); - strncat(error1,error2,strlen(error2)); - switch_console_printf(SWITCH_CHANNEL_LOG,error1); - } - else - connectionstate = 1; + strncpy(sql_query,tmp_sql_query.c_str(),tmp_sql_query.size()); + connect_to_database(); + } + } +} + +void MysqlCDR::connect_to_database() +{ + conn = mysql_init(NULL); + mysql_options(conn, MYSQL_READ_DEFAULT_FILE, ""); + if(mysql_real_connect(conn,hostname,username,password,dbname,0,NULL,0) == NULL) + { + const char *error1 = mysql_error(conn); + switch_console_printf(SWITCH_CHANNEL_LOG,"Cannot connect to MySQL Server. The error was: %s\n",error1); + } + else + connectionstate = 1; - mysql_autocommit(conn,0); - stmt = mysql_stmt_init(conn); + mysql_autocommit(conn,0); + stmt = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); + mysql_stmt_prepare(stmt,sql_query,(long unsigned int)strlen(sql_query)); - if(logchanvars) - { - stmt_chanvars = mysql_stmt_init(conn); - mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); - } - } + if(logchanvars) + { + stmt_chanvars = mysql_stmt_init(conn); + mysql_stmt_prepare(stmt_chanvars,sql_query_chanvars,(long unsigned int)strlen(sql_query_chanvars)); } } @@ -390,10 +390,8 @@ *x = 0; bool* is_null = new bool; *is_null = 0; - std::cout << "CDR_TINY: " << iItr->second << " and its size is " << iItr->second.size() << " bytes." << std::endl << std::endl; if(iItr->second.size() > 0) { - std::cout << "Converting iItr->second to type char." << std::endl; std::istringstream istring(iItr->second); istring >> *x; } @@ -433,75 +431,93 @@ bindmetemp = new MYSQL_BIND[bindme.size()]; copy(bindme.begin(), bindme.end(), bindmetemp); - mysql_stmt_bind_param(stmt,bindmetemp); - int bah = mysql_stmt_execute(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",bah); - - const char* bah2 = mysql_stmt_error(stmt); - switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",bah2); - - if(logchanvars && chanvars_supp.size() > 0) + for(int mysql_ping_result = -1, count = 0, mysql_stmt_error_code = -1; mysql_ping_result != 0 && count < 5 && mysql_stmt_error_code != 0 ; count++) { - long long insertid = mysql_stmt_insert_id(stmt); - - std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; - iEnd = chanvars_supp.end(); - for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + mysql_ping_result = mysql_ping(conn); + if(mysql_ping_result) { - MYSQL_BIND bindme_chanvars[3]; - memset(bindme_chanvars,0,sizeof(bindme_chanvars)); + switch(mysql_ping_result) + { + case CR_SERVER_GONE_ERROR: + case CR_SERVER_LOST: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We lost connection to the MySQL server. Trying to reconnect.\n"); + connect_to_database(); + break; + } + default: + { + switch_console_printf(SWITCH_CHANNEL_LOG,"We have encountered an unknown error when pinging the MySQL server. Attempting to reconnect anyways.\n"); + connect_to_database(); + } + } + } + else + { + mysql_stmt_bind_param(stmt,bindmetemp); + mysql_stmt_error_code = mysql_stmt_execute(stmt); - bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; - bindme_chanvars[0].buffer = &insertid; + if(mysql_stmt_error_code != 0) + { + errorstate = 1; + switch_console_printf(SWITCH_CHANNEL_LOG,"MysqlCDR::process_record() - Statement executed? Error: %d\n",mysql_stmt_error_code); - std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); - tempfirstvector.push_back('\0'); - char* varname_temp = &tempfirstvector[0]; + const char* mysql_stmt_error_string = mysql_stmt_error(stmt); + switch_console_printf(SWITCH_CHANNEL_LOG,"MySQL encountered error: %s\n",mysql_stmt_error_string); + } + else + errorstate = 0; + + if(logchanvars && chanvars_supp.size() > 0 && errorstate == 0) + { + long long insertid = mysql_stmt_insert_id(stmt); - bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; - long unsigned int varname_length = (long unsigned int)(iItr->first.size()); - bindme_chanvars[1].length = &varname_length; - bindme_chanvars[1].buffer_length = varname_length; - bindme_chanvars[1].buffer = varname_temp; + std::map<std::string,std::string>::iterator iItr,iBeg,iEnd; + iEnd = chanvars_supp.end(); + for(iItr = chanvars_supp.begin(); iItr != iEnd; iItr++) + { + MYSQL_BIND bindme_chanvars[3]; + memset(bindme_chanvars,0,sizeof(bindme_chanvars)); - std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); - tempsecondvector.push_back('\0'); - char* varvalue_temp = &tempsecondvector[0]; + bindme_chanvars[0].buffer_type = MYSQL_TYPE_LONGLONG; + bindme_chanvars[0].buffer = &insertid; - bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; - if(iItr->second.size() == 0) - bindme_chanvars[2].is_null = (my_bool*)1; - else - { - long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); - bindme_chanvars[2].length = &varvalue_length; - bindme_chanvars[2].buffer_length = varvalue_length; - bindme_chanvars[2].buffer = varvalue_temp; + std::vector<char> tempfirstvector(iItr->first.begin(), iItr->first.end()); + tempfirstvector.push_back('\0'); + char* varname_temp = &tempfirstvector[0]; + + bindme_chanvars[1].buffer_type = MYSQL_TYPE_VAR_STRING; + long unsigned int varname_length = (long unsigned int)(iItr->first.size()); + bindme_chanvars[1].length = &varname_length; + bindme_chanvars[1].buffer_length = varname_length; + bindme_chanvars[1].buffer = varname_temp; + + std::vector<char> tempsecondvector(iItr->second.begin(), iItr->second.end()); + tempsecondvector.push_back('\0'); + char* varvalue_temp = &tempsecondvector[0]; + + bindme_chanvars[2].buffer_type = MYSQL_TYPE_VAR_STRING; + if(iItr->second.size() == 0) + bindme_chanvars[2].is_null = (my_bool*)1; + else + { + long unsigned int varvalue_length = (long unsigned int)(iItr->second.size()); + bindme_chanvars[2].length = &varvalue_length; + bindme_chanvars[2].buffer_length = varvalue_length; + bindme_chanvars[2].buffer = varvalue_temp; + } + + mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); + mysql_stmt_execute(stmt_chanvars); + } } - mysql_stmt_bind_param(stmt_chanvars,bindme_chanvars); - mysql_stmt_execute(stmt_chanvars); + if(errorstate == 0) + mysql_commit(conn); + else + mysql_rollback(conn); } } - - - mysql_commit(conn); - - /* For future use - if(!mysql_stmt_execute(stmt)) - { - if(errorstate == TRUE) - reprocess_tempdumped_data(); - mysql_commit(conn); - errorstate=FALSE(); - } - else - { - errorstate = TRUE; - mysql_rollback(conn); - tempdump_data(); - } - */ delete [] bindmetemp; if(temp_chanvars_holder.size() > 0) Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h Tue Aug 1 03:49:17 2006 @@ -36,6 +36,7 @@ #include <list> #include <sstream> #include <mysql.h> +#include <errmsg.h> #ifndef MYSQLCDR #define MYSQLCDR @@ -55,7 +56,7 @@ private: static bool activated; - static char *sql_query; + static char sql_query[1024]; static std::string tmp_sql_query; // Object must exist to bind the statement, this used for generating the sql static char sql_query_chanvars[100]; static MYSQL *conn; @@ -94,6 +95,7 @@ template <typename T> void add_parameter(T& param, enum_field_types type, bool *is_null=0); void add_string_parameter(char* param, long unsigned int& param_length, enum_field_types type, bool* is_null=0); void set_mysql_time(switch_time_exp_t& param, MYSQL_TIME& destination); + void connect_to_database(); }; #endif Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Aug 1 03:49:17 2006 @@ -429,7 +429,7 @@ *arg++ = '\0'; } - if (switch_api_execute(api_cmd, arg, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(api_cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { switch_size_t len; char buf[1024]; Modified: freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.c Tue Aug 1 03:49:17 2006 @@ -240,7 +240,7 @@ stream.end = stream.data; stream.data_size = sizeof(retbuf); stream.write_function = switch_console_stream_write; - switch_api_execute(cmd, arg, &stream); + switch_api_execute(cmd, arg, NULL, &stream); return 0; } Modified: freeswitch/branches/cypromis/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Tue Aug 1 03:49:17 2006 @@ -287,7 +287,7 @@ sfinfo.channels = 1; len = ((major_count + (exlen + 2)) * sizeof(char *)); - supported_formats = switch_core_permenant_alloc(len); + supported_formats = switch_core_permanent_alloc(len); len = 0; for (m = 0; m < major_count; m++) { Modified: freeswitch/branches/cypromis/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Aug 1 03:49:17 2006 @@ -1705,12 +1705,15 @@ } } else { - if (switch_core_session_read_frame(session, &read_frame, -1, 0) != SWITCH_STATUS_SUCCESS) { + switch_status_t status; + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } } if ((write_frame.datalen = (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { - if (loops > 0) { + if (loops) { switch_buffer_t *tmp; /* Switcharoo*/ @@ -1719,11 +1722,12 @@ tto->loop_buffer = tmp; loops--; /* try again */ - if ((write_frame.datalen = (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { + if ((write_frame.datalen = + (uint32_t)switch_buffer_read(tto->audio_buffer, fdata, write_frame.codec->implementation->bytes_per_frame)) <= 0) { break; } } else { - continue; + break; } } @@ -1838,13 +1842,25 @@ if (argc > 1) { char *cmd = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + switch_core_session_t *session = NULL; switch_stream_handle_t stream = {0}; char retbuf[2048] = ""; + if (argc > 2) { + JSObject *session_obj; + struct js_session *jss; + if (JS_ValueToObject(cx, argv[2], &session_obj)) { + if ((jss = JS_GetPrivate(cx, session_obj))) { + session = jss->session; + } + } + } + + stream.data = retbuf; stream.end = stream.data; stream.data_size = sizeof(retbuf); - switch_api_execute(cmd, arg, &stream); + switch_api_execute(cmd, arg, session, &stream); stream.write_function = switch_console_stream_write; *rval = STRING_TO_JSVAL (JS_NewStringCopyZ(cx, retbuf)); @@ -2203,7 +2219,7 @@ } -static switch_status_t launch_async(char *text, switch_stream_handle_t *stream) +static switch_status_t launch_async(char *text, switch_core_session_t *session, switch_stream_handle_t *stream) { if (switch_strlen_zero(text)) { Modified: freeswitch/branches/cypromis/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/branches/cypromis/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Aug 1 03:49:17 2006 @@ -272,7 +272,7 @@ ResponseStatus(r,200); ResponseContentType(r, m); ResponseWrite(r); - switch_api_execute(command, r->query, &stream); + switch_api_execute(command, r->query, NULL, &stream); HTTPWriteEnd(r); return TRUE; } @@ -296,7 +296,7 @@ stream.end = stream.data; stream.data_size = CMDLEN; stream.write_function = switch_console_stream_write; - switch_api_execute(command, arg, &stream); + switch_api_execute(command, arg, NULL, &stream); /* Return our result. */ val = xmlrpc_build_value(envP, "s", retbuf); Modified: freeswitch/branches/cypromis/trunk/src/switch_console.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/switch_console.c (original) +++ freeswitch/branches/cypromis/trunk/src/switch_console.c Tue Aug 1 03:49:17 2006 @@ -108,7 +108,7 @@ stream.end = stream.data; stream.data_size = retlen; stream.write_function = switch_console_stream_write; - if (switch_api_execute(cmd, arg, &stream) == SWITCH_STATUS_SUCCESS) { + if (switch_api_execute(cmd, arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", retbuf); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Unknown Command: %s\n", cmd); Modified: freeswitch/branches/cypromis/trunk/src/switch_core.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/switch_core.c (original) +++ freeswitch/branches/cypromis/trunk/src/switch_core.c Tue Aug 1 03:49:17 2006 @@ -857,9 +857,9 @@ } /* **ONLY** alloc things with these functions that **WILL NOT** need - to be freed *EVER* ie this is for *PERMENANT* memory allocation */ + to be freed *EVER* ie this is for *PERMANENT* memory allocation */ -SWITCH_DECLARE(void *) switch_core_permenant_alloc(switch_size_t memory) +SWITCH_DECLARE(void *) switch_core_permanent_alloc(switch_size_t memory) { void *ptr = NULL; assert(runtime.memory_pool != NULL); @@ -874,7 +874,7 @@ return ptr; } -SWITCH_DECLARE(char *) switch_core_permenant_strdup(char *todup) +SWITCH_DECLARE(char *) switch_core_permanent_strdup(char *todup) { char *duped = NULL; switch_size_t len; Modified: freeswitch/branches/cypromis/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/branches/cypromis/trunk/src/switch_loadable_module.c (original) +++ freeswitch/branches/cypromis/trunk/src/switch_loadable_module.c Tue Aug 1 03:49:17 2006 @@ -270,7 +270,7 @@ break; } - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { err = "Could not allocate memory\n"; break; } @@ -283,7 +283,7 @@ return SWITCH_STATUS_GENERR; } - module->filename = switch_core_permenant_strdup(filename); + module->filename = switch_core_permanent_strdup(filename); module->module_interface = module_interface; module->switch_module_load = load_func_ptr; @@ -365,7 +365,7 @@ const char *err = NULL; switch_loadable_module_interface_t *module_interface = NULL; - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Couldn't allocate memory\n"); return SWITCH_STATUS_GENERR; } @@ -384,7 +384,7 @@ break; } - if ((module = switch_core_permenant_alloc(sizeof(switch_loadable_module_t))) == 0) { + if ((module = switch_core_permanent_alloc(sizeof(switch_loadable_module_t))) == 0) { err = "Could not allocate memory\n"; break; } @@ -397,7 +397,7 @@ return SWITCH_STATUS_GENERR; } - module->filename = switch_core_permenant_strdup(filename); + module->filename = switch_core_permanent_strdup(filename); module->module_interface = module_interface; module->switch_module_load = load_func_ptr; @@ -711,7 +711,7 @@ return i; } -SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_stream_handle_t *stream) +SWITCH_DECLARE(switch_status_t) switch_api_execute(char *cmd, char *arg, switch_core_session_t *session, switch_stream_handle_t *stream) { switch_api_interface_t *api; switch_status_t status; @@ -734,7 +734,7 @@ } if ((api = switch_loadable_module_get_api_interface(cmd)) != 0) { - status = api->function(arg, stream); + status = api->function(arg, session, stream); } else { status = SWITCH_STATUS_FALSE; stream->write_function(stream, "INVALID COMMAND [%s]", cmd); Modified: freeswitch/branches/cypromis/trunk/w32/vsnet/Freeswitch.sln ============================================================================== --- freeswitch/branches/cypromis/trunk/w32/vsnet/Freeswitch.sln (original) +++ freeswitch/branches/cypromis/trunk/w32/vsnet/Freeswitch.sln Tue Aug 1 03:49:17 2006 @@ -384,8 +384,8 @@ {05515420-16DE-4E63-BE73-85BE85BA5142}.Debug|Win32.Build.0 = Debug|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.ActiveCfg = Release|Win32 {05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug with MySql|Win32 - {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug with MySql|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.ActiveCfg = Debug|Win32 + {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Debug|Win32.Build.0 = Debug|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.ActiveCfg = Release|Win32 {3D1EED36-A510-4EDB-B4D9-4E0F4A5EC2A8}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection

1 0

Jump to page: