November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6235 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Mon Nov 12 22:59:11 2007 New Revision: 6235 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: add bugfix portion of MDXMLINT-17 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Mon Nov 12 22:59:11 2007 @@ -58,7 +58,10 @@ struct config_data *config_data = data; int x; x = write(config_data->fd, ptr, realsize); - return realsize; + if ( x != (int)realsize) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Short write! %d out of %d\n", x, realsize); + } + return x; }

1 0

[commit] r6234 - in freeswitch/trunk/src: . include
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: mikej Date: Mon Nov 12 22:47:07 2007 New Revision: 6234 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_utils.c Log: add missing "execute" handler to phrase macro. (not yet tested) Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Nov 12 22:47:07 2007 @@ -300,6 +300,7 @@ SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str); SWITCH_DECLARE(char *) switch_strip_spaces(const char *str); +SWITCH_DECLARE(char *) switch_separate_paren_args(char *str); SWITCH_DECLARE(const char *) switch_stristr(const char *str, const char *instr); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); 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 Mon Nov 12 22:47:07 2007 @@ -260,7 +260,22 @@ done = 1; break; } else if (!strcasecmp(func, "execute")) { + switch_application_interface_t *app; + char *cmd, *cmd_args; + status = SWITCH_STATUS_FALSE; + cmd = switch_core_session_strdup(session, odata); + cmd_args = switch_separate_paren_args(cmd); + + if (!cmd_args ) { + cmd_args = ""; + } + + if ((app = switch_loadable_module_get_application_interface(cmd)) != NULL) { + status = switch_core_session_exec(session, app, cmd_args); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", cmd); + } } else if (!strcasecmp(func, "say")) { switch_say_interface_t *si; if ((si = switch_loadable_module_get_say_interface(module_name))) { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Nov 12 22:47:07 2007 @@ -288,6 +288,36 @@ return s; } + +SWITCH_DECLARE(char *) switch_separate_paren_args(char *str) +{ + char *e, *args; + switch_size_t br; + + if ((args = strchr(str, '('))) { + e = args - 1; + *args++ = '\0'; + while(*e == ' ') { + *e-- = '\0'; + } + e = args; + br = 1; + while(e && *e) { + if (*e == '(') { + br++; + } else if (br > 1 && *e == ')') { + br--; + } else if (br == 1 && *e == ')') { + *e = '\0'; + break; + } + e++; + } + } + + return args; +} + SWITCH_DECLARE(switch_bool_t) switch_is_number(const char *str) { const char *p;

1 0

[commit] r6233 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: tuyan Date: Mon Nov 12 21:59:52 2007 New Revision: 6233 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.cxx freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: files for rtp pairs for external and internal usage Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Mon Nov 12 21:59:52 2007 @@ -19,7 +19,7 @@ # enabled the debug compile for opal and pwlib mod_LTLIBRARIES = mod_opal.la -mod_opal_la_SOURCES = mod_opal.cpp fsmanager.cxx fsep.cxx fsmediastream.cxx fscon.cxx opal_h323.cxx opal_sip.cxx opal_h323con.cxx +mod_opal_la_SOURCES = mod_opal.cpp fsmanager.cxx fsep.cxx fsmediastream.cxx fscon.cxx opal_h323.cxx opal_sip.cxx opal_h323con.cxx fsrtp.cxx mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -g3 -ggdb -O0 -D_DEBUG -I/home/tuyan/CODE/OPAL/pwlib/include -DPTRACING -I/home/tuyan/CODE/OPAL/opal/include -felide-constructors -Wreorder -I$(OPALDIR)/include -I$(PWLIBDIR)/include mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(PWLIBDIR)/lib -L$(OPALDIR)/lib -lopal_linux_x86_d -lpt_linux_x86_d -lpthread -lexpat -lSDL -lresolv -ldl -fPIC -DPIC Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.cxx ============================================================================== Added: freeswitch/trunk/src/mod/endpoints/mod_opal/fsrtp.h ==============================================================================

1 0

[commit] r6232 - freeswitch/trunk
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:45:20 2007 New Revision: 6232 Modified: freeswitch/trunk/bootstrap.sh Log: create modules.conf on bootstrap if it does not exist Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Nov 12 19:45:20 2007 @@ -7,6 +7,11 @@ js js/nsprpub libdingaling libetpan libresample libsndfile pcre sofia-sip \ speex sqlite srtp xmlrpc-c"; + +if [ ! -f modules.conf ]; then + cp build/modules.conf.in modules.conf +fi + # keep automake from making us magically GPL, and to stop complaining about missing files. cp -f docs/COPYING . cp -f docs/AUTHORS .

1 0

[commit] r6231 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:39:18 2007 New Revision: 6231 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: change Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Nov 12 19:39:18 2007 @@ -1,7 +1,7 @@ <context name="default"> <extension name="global"> <condition> - <action application="set" data="use_profile=${qq(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> + <action application="set" data="use_profile=${cond(${is_lan_addr(${network_addr})} == yes ? nat : default)}"/> </condition> </extension> <!--

1 0

[commit] r6230 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 13 Nov '07

13 Nov '07

Author: anthm Date: Mon Nov 12 19:33:31 2007 New Revision: 6230 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: change qq to cond but let qq still work for the time being 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 Mon Nov 12 19:33:31 2007 @@ -106,7 +106,7 @@ O_LE } o_t; -SWITCH_STANDARD_API(qq_function) +SWITCH_STANDARD_API(cond_function) { int argc; char *mydata = NULL, *argv[3]; @@ -1740,7 +1740,9 @@ SWITCH_ADD_API(commands_api_interface, "sched_del", "Delete a Scheduled task", sched_del_function, "<task_id>|<group_id>"); SWITCH_ADD_API(commands_api_interface, "xml_wrap", "Wrap another api command in xml", xml_wrap_api_function, "<command> <args>"); SWITCH_ADD_API(commands_api_interface, "is_lan_addr", "see if an ip is a lan addr", lan_addr_function, "<ip>"); - SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", qq_function, "<expr> ? <true val> : <false val>"); + SWITCH_ADD_API(commands_api_interface, "cond", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); + // remove me before final release + SWITCH_ADD_API(commands_api_interface, "qq", "Eval a conditional", cond_function, "<expr> ? <true val> : <false val>"); SWITCH_ADD_API(commands_api_interface, "regex", "Eval a regex", regex_function, "<data>|<pattern>[|<subst string>]"); /* indicate that the module should continue to be loaded */

1 0

[commit] r6229 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 12 Nov '07

12 Nov '07

Author: tuyan Date: Mon Nov 12 18:49:10 2007 New Revision: 6229 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: opal and pwlib compiles with debug ! Added: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Mon Nov 12 18:49:10 2007 @@ -0,0 +1,37 @@ +AM_CFLAGS = $(SWITCH_AM_CFLAGS) +AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) +AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ +then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +# Dirty trick to override the link output +LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi + +moddir=$(prefix)/mod + +MODNAME=mod_opal + +OPALDIR=/home/tuyan/CODE/OPAL/opal +PWLIBDIR=/home/tuyan/CODE/OPAL/pwlib + +CC=g++ + +# enabled the debug compile for opal and pwlib +mod_LTLIBRARIES = mod_opal.la +mod_opal_la_SOURCES = mod_opal.cpp fsmanager.cxx fsep.cxx fsmediastream.cxx fscon.cxx opal_h323.cxx opal_sip.cxx opal_h323con.cxx +mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -g3 -ggdb -O0 -D_DEBUG -I/home/tuyan/CODE/OPAL/pwlib/include -DPTRACING -I/home/tuyan/CODE/OPAL/opal/include -felide-constructors -Wreorder -I$(OPALDIR)/include -I$(PWLIBDIR)/include +mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(PWLIBDIR)/lib -L$(OPALDIR)/lib -lopal_linux_x86_d -lpt_linux_x86_d -lpthread -lexpat -lSDL -lresolv -ldl -fPIC -DPIC + +#Override the linstall target so we just install the .so/.dylib + +install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la + @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) + @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ + $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + else \ + $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + fi

1 0

[commit] r6228 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 12 Nov '07

12 Nov '07

Author: tuyan Date: Mon Nov 12 18:46:59 2007 New Revision: 6228 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/fsmanager.cxx Log: commented out the stun , and routing directly between h323 and sip to fwd :D Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/fsmanager.cxx ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/fsmanager.cxx (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/fsmanager.cxx Mon Nov 12 18:46:59 2007 @@ -54,9 +54,9 @@ delete sipep; return FALSE; } - SetSTUNServer("stun.voxgratia.org"); + //SetSTUNServer("stun.voxgratia.org"); PStringArray routes; - routes += "h323:.* = sip:<da>@fwd.pulver.com"; + routes += "h323:.* = fs:<da>"; SetRouteTable(routes); return TRUE;

1 0

[commit] r6227 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 12 Nov '07

12 Nov '07

Author: anthm Date: Mon Nov 12 18:29:07 2007 New Revision: 6227 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: add fake iax2 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Mon Nov 12 18:29:07 2007 @@ -332,6 +332,26 @@ return switch_core_session_outgoing_channel(session, "sofia", outbound_profile, new_session, pool); } + + + +/* fake chan_iax2 */ +switch_endpoint_interface_t *iax2_endpoint_interface; +static switch_call_cause_t iax2_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool); +switch_io_routines_t iax2_io_routines = { + /*.outgoing_channel */ iax2_outgoing_channel +}; + +static switch_call_cause_t iax2_outgoing_channel(switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool) +{ + return switch_core_session_outgoing_channel(session, "iax", outbound_profile, new_session, pool); +} + + #define WE_DONT_NEED_NO_STINKIN_KEY "true" static char *key() { @@ -367,9 +387,17 @@ sip_endpoint_interface->interface_name = "SIP"; sip_endpoint_interface->io_routines = &sip_io_routines; - for (x = 0; x < 10; x++) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Avoiding Deadlock.\n"); - switch_yield(100000); + + /* fake chan_iax2 facade */ + iax2_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + iax2_endpoint_interface->interface_name = "IAX2"; + iax2_endpoint_interface->io_routines = &iax2_io_routines; + + if (getenv("FAITHFUL_EMULATION")) { + for (x = 0; x < 10; x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Avoiding Deadlock.\n"); + switch_yield(100000); + } } /* indicate that the module should continue to be loaded */

1 0

[commit] r6226 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 12 Nov '07

12 Nov '07

Author: anthm Date: Mon Nov 12 18:19:35 2007 New Revision: 6226 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: fix - Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Mon Nov 12 18:19:35 2007 @@ -316,7 +316,7 @@ } } else if (!strcasecmp(var, "interval")) { source->interval = atoi(val); - } else if (!strcasecmp(var, "timer_name")) { + } else if (!strcasecmp(var, "timer-name")) { source->timer_name = switch_core_strdup(source->pool, val); } }

1 0