- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4897 - in freeswitch/trunk: . src/mod
by Freeswitch SVN 09 Apr '07

09 Apr '07

Author: mikej Date: Mon Apr 9 10:40:03 2007 New Revision: 4897 Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in freeswitch/trunk/src/mod/Makefile.am Log: proper -j support for the module builds Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Apr 9 10:40:03 2007 @@ -14,6 +14,9 @@ AM_CFLAGS += -DCRASH_PROT endif +.DEFAULT: + @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ + libfreeswitch_la_SOURCES = \ src/switch_apr.c \ src/switch_buffer.c \ @@ -90,8 +93,6 @@ libs/libteletone/src/libteletone_generate.h\ libs/libteletone/src/libteletone.h - - CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite @@ -244,15 +245,10 @@ megaclean: eclean modclean rm -f `find ./libs -name \*.la` -@am__include@ @am__quote@./$(DEPDIR)/modules.targets@am__quote@ - modules.conf: if test -f $@; then touch $@; else cp build/modules.conf.in $@ ;fi -./$(DEPDIR)/modules.targets: modules.conf - mods=`cat modules.conf | sed -e 's|^.*/||'`; echo MODULE_TARGETS=\"$$mods\" > ./$(DEPDIR)/modules.targets - -$(MODULE_TARGETS): +$(OUR_MODULES): @set fnord $$MAKEFLAGS; amf=$$2; \ (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 9 10:40:03 2007 @@ -340,9 +340,20 @@ #LIBS+=> core.log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat core.log;fi;if test "$$error" = "yes";then exit 1;fi LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`' TOUCH_TARGET='if test -f "$@";then touch "$@";fi;' -AM_MAKEFLAGS='`test -n "$(VERBOSE)" || echo -s`' +CONF_MODULES='\`grep -v "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" \`' +OUR_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-all ; done \`; echo $$mods `' +OUR_CLEAN_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-clean ; done \`; echo $$mods `' +OUR_INSTALL_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-install ; done\`; echo $$mods `' +OUR_UNINSTALL_MODS='`if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods=\`for i in $$tmp_mods ; do echo $$i-uninstall ; done\`; echo $$mods `' +AM_MAKEFLAGS='"OUR_MODULES=$(OUR_MODS)" "OUR_CLEAN_MODULES=$(OUR_CLEAN_MODS)" "OUR_INSTALL_MODULES=$(OUR_INSTALL_MODS)" "OUR_UNINSTALL_MODULES=$(OUR_UNINSTALL_MODS)" `test -n "$(VERBOSE)" || echo -s`' +#AM_MAKEFLAGS='`test -n "$(VERBOSE)" || echo -s`' AC_SUBST(LIBTOOL) AC_SUBST(TOUCH_TARGET) +AC_SUBST(CONF_MODULES) +AC_SUBST(OUR_MODS) +AC_SUBST(OUR_CLEAN_MODS) +AC_SUBST(OUR_INSTALL_MODS) +AC_SUBST(OUR_UNINSTALL_MODS) AC_SUBST(AM_MAKEFLAGS) # Run configure in all the subdirs Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Mon Apr 9 10:40:03 2007 @@ -1,90 +1,28 @@ -CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/build/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; -FOUND_MODULES=found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ; -OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules="$(MODULES)" ; fi ; -OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \ - our_clean_modules=`for i in $$tmp_clean_modules ; do echo $$i ; done | sort | uniq` ; \ - else our_clean_modules="$(MODULES)" ; fi ; -MOD_NAME=`echo $$i | sed -e 's|^.*/||'` -MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` +all: $(OUR_MODULES) +clean: $(OUR_CLEAN_MODULES) +install: $(OUR_INSTALL_MODULES) +uninstall: $(OUR_UNINSTALL_MODULES) -all: - @$(CONF_MODULES) \ - $(OUR_MODULES) \ - echo ;\ - echo making modules ; \ - for i in $$our_modules ; do \ - echo ;\ - echo making $$i ; \ - moddir=$(MOD_DIR); \ - if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules || exit 1; \ - fi; \ - done - @echo - @echo done making modules - -clean: - @$(CONF_MODULES) \ - $(FOUND_MODULES) \ - $(OUR_CLEAN_MODULES) \ - echo ;\ - echo making clean modules ; \ - for i in $$our_clean_modules ; do \ - echo ;\ - echo making clean $$i ; \ - moddir=$(MOD_DIR); \ - if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) clean || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules clean || exit 1; \ - fi; \ - done - @echo - @echo done making clean modules - -install: - @$(CONF_MODULES) \ - $(OUR_MODULES) \ - echo ;\ - echo Installing Modules ; \ - for i in $$our_modules ; do \ - echo ;\ - echo making install $$i ; \ - moddir=$(MOD_DIR); \ - if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) install || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules install || exit 1; \ - fi; \ - done - @echo - @echo done Installing Modules - -uninstall: - @$(CONF_MODULES) \ - $(OUR_MODULES) \ - echo ;\ - echo Uninstalling Modules ; \ - for i in $$our_modules ; do \ - echo ;\ - echo making uninstall $$i ; \ - moddir=$(MOD_DIR); \ - if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) uninstall || exit 1; else \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules uninstall || exit 1; \ - fi; \ - done - @echo - @echo done Uninstalling Modules - - -@am__include@ @am__quote@$(switch_builddir)/$(DEPDIR)/modules.targets@am__quote@ - -$(MODULE_TARGETS): +$(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODULES): @set fnord $$MAKEFLAGS; amf=$$2; \ - moddir=`grep $@ $(switch_builddir)/modules.conf | sed -e 's|#||'` ; \ + target=`echo $@ | sed -e 's|^.*-||'`; \ + modname=`echo $@ | sed -e 's|-.*||'`; \ + confmoddir=`cat $(switch_builddir)/modules.conf | grep $$modname | sed -e 's|#||' `; \ + if test -z "$$confmoddir" ; then moddir=$@ ; else \ + if test -d "$(switch_srcdir)/src/mod/$$confmoddir" ; then \ + moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \ + moddir="$$confmoddir" ; \ + fi ; \ + fi ; \ + if test -z "$$target" ; then target="all" ; fi ; \ + echo ;\ + echo making $$target $$modname ;\ (if test -f $$moddir/Makefile ; then \ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS); else\ - cd $$moddir && MODNAME=$(MOD_NAME) BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules;\ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ fi;)\ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ test -z "$$fail" + +.DEFAULT: + @if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi

1 0

[commit] r4896 - freeswitch/trunk
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: mikej Date: Sun Apr 8 15:13:07 2007 New Revision: 4896 Modified: freeswitch/trunk/bootstrap.sh Log: strip trailing stuff off the automake/autoconf versions detected in bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Sun Apr 8 15:13:07 2007 @@ -15,7 +15,7 @@ touch ChangeLog # autoconf 2.59 or newer -ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` +ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` if test -z "$ac_version"; then echo "bootstrap: autoconf not found." echo " You need autoconf version 2.59 or newer installed" @@ -33,7 +33,7 @@ fi # automake 1.7 or newer -am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'` +am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` if test -z "$am_version"; then echo "bootstrap: automake not found." echo " You need automake version 1.7 or newer installed"

1 0

[commit] r4895 - freeswitch/trunk/src/include
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: mikej Date: Sun Apr 8 13:18:12 2007 New Revision: 4895 Modified: freeswitch/trunk/src/include/switch.h Log: It appears that we should be able to include strings.h only, except msvc does not have strings.h: and at least some linux implementations do not work unless you include both, which seems to be against spec, but should not hurt. The most correct thing to do here would be to include strings.h then string.h wrapped in autoconf detected defines, but this should work for now. If it is still an issue going forward, we will need to add some defines for detected presence of some header files to the public header files, which should be done with care to avoid define collisions in public header files. http://www.opengroup.org/onlinepubs/009695399/basedefs/strings.h.html http://www.opengroup.org/onlinepubs/009695399/basedefs/string.h.html Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sun Apr 8 13:18:12 2007 @@ -59,11 +59,10 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> -#ifdef _MSC_VER -#include <string.h> -#else +#ifndef _MSC_VER #include <strings.h> #endif +#include <string.h> #include <sys/stat.h> #include <limits.h> #include <sys/types.h>

1 0

[commit] r4894 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: mikej Date: Sun Apr 8 12:32:08 2007 New Revision: 4894 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: merged patch from http://jira.freeswitch.org/browse/MDXMLINT-4, thanks bblack Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Apr 8 12:32:08 2007 @@ -247,6 +247,7 @@ switch_event_t *event; const char *rpid = "unknown"; const char *display = "\"user\""; + char network_addr[80]; /* all callers must confirm that sip, sip->sip_request and sip->sip_contact are not NULL */ assert(sip != NULL && sip->sip_contact != NULL && sip->sip_request != NULL); @@ -325,7 +326,8 @@ } if (!authorization || stale) { - snprintf(params, sizeof(params), "from_user=%s&from_host=%s&contact=%s", from_user, from_host, contact_str); + get_addr(network_addr, sizeof(network_addr), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); + snprintf(params, sizeof(params), "network_addr=%s&from_user=%s&from_host=%s&contact=%s", network_addr, from_user, from_host, contact_str); if (switch_xml_locate("directory", "domain", "name", from_host, &xml, &domain, params) != SWITCH_STATUS_SUCCESS) { @@ -780,3 +782,4 @@ +

1 0

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

08 Apr '07

Author: mikej Date: Sun Apr 8 12:24:57 2007 New Revision: 4893 Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_xml.c Log: export some functions for dll linkage in the windows build. Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Sun Apr 8 12:24:57 2007 @@ -222,7 +222,7 @@ ///\param name the name of the tag ///\param off the offset ///\return an xml node or NULL - switch_xml_t switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off); + SWITCH_DECLARE(switch_xml_t) switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off); ///\brief wrapper for switch_xml_add_child() that strdup()s name ///\param xml the xml node @@ -235,7 +235,7 @@ ///\param xml the xml node ///\param txt the text ///\return an xml node or NULL - switch_xml_t switch_xml_set_txt(switch_xml_t xml, const char *txt); + SWITCH_DECLARE(switch_xml_t) switch_xml_set_txt(switch_xml_t xml, const char *txt); ///\brief wrapper for switch_xml_set_txt() that strdup()s txt ///\ sets the character content for the given tag and returns the tag Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Sun Apr 8 12:24:57 2007 @@ -1570,7 +1570,7 @@ // Adds a child tag. off is the offset of the child tag relative to the start // of the parent tag's character content. Returns the child tag -switch_xml_t switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off) +SWITCH_DECLARE(switch_xml_t) switch_xml_add_child(switch_xml_t xml, const char *name, switch_size_t off) { switch_xml_t child; @@ -1587,7 +1587,7 @@ } // sets the character content for the given tag and returns the tag -switch_xml_t switch_xml_set_txt(switch_xml_t xml, const char *txt) +SWITCH_DECLARE(switch_xml_t) switch_xml_set_txt(switch_xml_t xml, const char *txt) { if (!xml) return NULL;

1 0

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

08 Apr '07

Author: mikej Date: Sun Apr 8 12:16:00 2007 New Revision: 4892 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_rtp.c Log: fix windows build Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sun Apr 8 12:16:00 2007 @@ -59,7 +59,11 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> +#ifdef _MSC_VER +#include <string.h> +#else #include <strings.h> +#endif #include <sys/stat.h> #include <limits.h> #include <sys/types.h> Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Apr 8 12:16:00 2007 @@ -447,10 +447,10 @@ switch_core_session_limit(atoi(val)); } else if (!strcasecmp(var, "rtp-start-port")) { - switch_rtp_set_start_port(atoi(val)); + switch_rtp_set_start_port((switch_port_t)atoi(val)); } else if (!strcasecmp(var, "rtp-end-port")) { - switch_rtp_set_end_port(atoi(val)); + switch_rtp_set_end_port((switch_port_t)atoi(val)); } } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sun Apr 8 12:16:00 2007 @@ -857,7 +857,7 @@ rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD; *flags |= SFF_CNG; - *payload_type = rtp_session->recv_msg.header.pt; + *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; return 2 + rtp_header_len; } } @@ -877,7 +877,7 @@ rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD; *flags |= SFF_CNG; - *payload_type = rtp_session->recv_msg.header.pt; + *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; return 2 + rtp_header_len; }

1 0

[commit] r4891 - in freeswitch/trunk: libs/libsndfile src src/include
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: mikej Date: Sun Apr 8 12:11:03 2007 New Revision: 4891 Modified: freeswitch/trunk/libs/libsndfile/Makefile.am freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_play_say.c Log: fix some warnings. Modified: freeswitch/trunk/libs/libsndfile/Makefile.am ============================================================================== --- freeswitch/trunk/libs/libsndfile/Makefile.am (original) +++ freeswitch/trunk/libs/libsndfile/Makefile.am Sun Apr 8 12:11:03 2007 @@ -1,10 +1,11 @@ -## Process this file with automake to produce Makefile.in +# Process this file with automake to produce Makefile.in -SUBDIRS = man doc Win32 Octave src examples regtest tests +SUBDIRS = Win32 Octave src +# man doc Win32 examples regtest tests DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \ sndfile.pc.in Mingw-make-dist.sh - + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = sndfile.pc Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Sun Apr 8 12:11:03 2007 @@ -50,8 +50,7 @@ #define FREESWITCH_PEN "27880" #define FREESWITCH_OID_PREFIX ".1.3.6.1.4.1." FREESWITCH_PEN #define FREESWITCH_ITAD "543" - - +#define __EXTENSIONS__ 1 #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -60,7 +59,7 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> -#include <string.h> +#include <strings.h> #include <sys/stat.h> #include <limits.h> #include <sys/types.h> Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Sun Apr 8 12:11:03 2007 @@ -381,7 +381,7 @@ SWITCH_DECLARE(switch_status_t) switch_socket_shutdown(switch_socket_t * sock, switch_shutdown_how_e how) { - return apr_socket_shutdown(sock, how); + return apr_socket_shutdown(sock, (apr_shutdown_how_e)how); } SWITCH_DECLARE(switch_status_t) switch_socket_close(switch_socket_t * sock) Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Sun Apr 8 12:11:03 2007 @@ -31,7 +31,6 @@ #include <switch.h> static const switch_state_handler_table_t audio_bridge_peer_state_handlers; -static const switch_state_handler_table_t originate_state_handlers; /* Bridge Related Stuff*/ /*********************************************************************************/ Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sun Apr 8 12:11:03 2007 @@ -77,7 +77,7 @@ return (switch_say_method_t) x; } -static switch_say_method_t get_say_type_by_name(char *name) +static switch_say_type_t get_say_type_by_name(char *name) { int x = 0; for (x = 0; SAY_TYPE_NAMES[x]; x++) { @@ -86,7 +86,7 @@ } } - return (switch_say_method_t) x; + return (switch_say_type_t) x; }

1 0

[commit] r4890 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: brian Date: Sun Apr 8 00:41:10 2007 New Revision: 4890 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix warning as error Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sun Apr 8 00:41:10 2007 @@ -900,7 +900,7 @@ switch_core_db_t *db = switch_core_db_handle(); struct holder holder = { 0 }; int help = 0; - char *mydata, *argv[5] = {0}; + char *mydata = NULL, *argv[5] = {0}; int argc; char *cmd = NULL, *as = NULL;

1 0

[commit] r4889 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 08 Apr '07

08 Apr '07

Author: brian Date: Sat Apr 7 23:53:35 2007 New Revision: 4889 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix segfault thanks bblack Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sat Apr 7 23:53:35 2007 @@ -27,6 +27,7 @@ * Michael Jerris <mike(a)jerris.com> * Johny Kadarisman <jkr888(a)gmail.com> * Paul Tinsley <jackhammer(a)gmail.com> + * Marcel Barbulescu <marcelbarbulescu(a)gmail.com> * * * mod_commands.c -- Misc. Command Module @@ -901,19 +902,21 @@ int help = 0; char *mydata, *argv[5] = {0}; int argc; - char *cmd, *as = NULL; + char *cmd = NULL, *as = NULL; if (session) { return SWITCH_STATUS_FALSE; } - if ((mydata = strdup(data))) { - argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - } - - cmd = argv[0]; - if (argv[2] && !strcasecmp(argv[1], "as")) { - as = argv[2]; + if (data) { + if ((mydata = strdup(data))) { + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + } + + cmd = argv[0]; + if (argv[2] && !strcasecmp(argv[1], "as")) { + as = argv[2]; + } } if (!as && stream->event) {

1 0

[commit] r4888 - freeswitch/trunk/conf
by Freeswitch SVN 07 Apr '07

07 Apr '07

Author: anthm Date: Sat Apr 7 17:23:37 2007 New Revision: 4888 Modified: freeswitch/trunk/conf/dingaling.conf.xml Log: update Modified: freeswitch/trunk/conf/dingaling.conf.xml ============================================================================== --- freeswitch/trunk/conf/dingaling.conf.xml (original) +++ freeswitch/trunk/conf/dingaling.conf.xml Sat Apr 7 17:23:37 2007 @@ -15,7 +15,6 @@ <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="auto"/> <param name="auto-login" value="true"/> - <param name="auto-reply" value="Press *Call* to call FreeSWITCH and be sure to come to ClueCon! http://www.cluecon.com"/>  <param name="sasl" value="plain"/>

1 0