November 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6331 - freeswitch/trunk/build
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: brian Date: Mon Nov 19 10:38:21 2007 New Revision: 6331 Modified: freeswitch/trunk/build/modules.conf.in Log: are we there yet... Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Mon Nov 19 10:38:21 2007 @@ -8,7 +8,6 @@ applications/mod_voicemail applications/mod_limit applications/mod_expr -#applications/mod_ivrtest #applications/mod_soundtouch #applications/mod_rss #asr_tts/mod_cepstral @@ -46,13 +45,11 @@ formats/mod_sndfile #formats/mod_shout #formats/mod_local_stream -#languages/mod_perl #languages/mod_python languages/mod_spidermonkey languages/mod_spidermonkey_teletone languages/mod_spidermonkey_core_db #languages/mod_spidermonkey_odbc -#languages/mod_spidermonkey_etpan xml_int/mod_xml_rpc #xml_int/mod_xml_curl xml_int/mod_xml_cdr

1 0

[commit] r6324 - freeswitch/branches/metik
by Freeswitch SVN 19 Nov '07

19 Nov '07

Author: sphere Date: Sun Nov 18 22:29:01 2007 New Revision: 6324 Added: freeswitch/branches/metik/ Log: blah

1 0

[commit] r6323 - freeswitch/trunk/build
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: brian Date: Sat Nov 17 16:51:57 2007 New Revision: 6323 Modified: freeswitch/trunk/build/modules.conf.in Log: more cleanup Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Sat Nov 17 16:51:57 2007 @@ -16,14 +16,14 @@ codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 -#codecs/mod_g723_1 -#codecs/mod_amr -#codecs/mod_g729 +codecs/mod_g723_1 +codecs/mod_amr +codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc codecs/mod_l16 #codecs/mod_lpc10 -#codecs/mod_speex +codecs/mod_speex #dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml dialplans/mod_dialplan_asterisk

1 0

[commit] r6322 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: brian Date: Sat Nov 17 16:51:52 2007 New Revision: 6322 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: more cleanup Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Sat Nov 17 16:51:52 2007 @@ -49,12 +49,15 @@  <load module="mod_g711"/> + <load module="mod_g723_1"/> + <load module="mod_g729"/> <load module="mod_g722"/> <load module="mod_g726"/> <load module="mod_gsm"/> + <load module="mod_amr"/> <load module="mod_ilbc"/> <load module="mod_l16"/> -  + <load module="mod_speex"/>  <load module="mod_sndfile"/>

1 0

[commit] r6321 - freeswitch/trunk/w32/Library
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: mikej Date: Sat Nov 17 16:15:33 2007 New Revision: 6321 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: recursive conf file install Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Sat Nov 17 16:15:33 2007 @@ -105,7 +105,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> <Configuration @@ -194,7 +194,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" + CommandLine="if not exist "$(SolutionDir)$(OutDir)\conf" xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y /S
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> </Configurations> @@ -505,11 +505,11 @@ > </File> <File - RelativePath="..\..\src\include\private\switch_core.h" + RelativePath="..\..\src\include\switch_core.h" > </File> <File - RelativePath="..\..\src\include\switch_core.h" + RelativePath="..\..\src\include\private\switch_core.h" > </File> <File

1 0

[commit] r6320 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: brian Date: Sat Nov 17 16:15:25 2007 New Revision: 6320 Modified: freeswitch/trunk/conf/autoload_configs/sofia.conf.xml Log: tweak Modified: freeswitch/trunk/conf/autoload_configs/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/sofia.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/sofia.conf.xml Sat Nov 17 16:15:25 2007 @@ -1,5 +1,5 @@ <configuration name="sofia.conf" description="sofia Endpoint"> <profiles> - <X-PRE-PROCESS cmd="include" data="sip_profiles/*.xml"/> + <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/> </profiles> </configuration>

1 0

[commit] r6319 - in freeswitch/trunk/conf: . autoload_configs
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: brian Date: Sat Nov 17 16:13:12 2007 New Revision: 6319 Added: freeswitch/trunk/conf/autoload_configs/alsa.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/alsa.conf.xml freeswitch/trunk/conf/autoload_configs/cdr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/autoload_configs/conference.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/conference.conf.xml freeswitch/trunk/conf/autoload_configs/console.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/console.conf.xml freeswitch/trunk/conf/autoload_configs/dialplan_directory.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/dialplan_directory.conf.xml freeswitch/trunk/conf/autoload_configs/dingaling.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/dingaling.conf.xml freeswitch/trunk/conf/autoload_configs/enum.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/autoload_configs/event_multicast.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/event_multicast.conf.xml freeswitch/trunk/conf/autoload_configs/event_socket.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/event_socket.conf.xml freeswitch/trunk/conf/autoload_configs/iax.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/iax.conf.xml freeswitch/trunk/conf/autoload_configs/ivr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/ivr.conf.xml freeswitch/trunk/conf/autoload_configs/java.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/java.conf.xml freeswitch/trunk/conf/autoload_configs/limit.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/limit.conf.xml freeswitch/trunk/conf/autoload_configs/local_stream.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/local_stream.conf.xml freeswitch/trunk/conf/autoload_configs/modules.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/modules.conf.xml freeswitch/trunk/conf/autoload_configs/openmrcp.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/openmrcp.conf.xml freeswitch/trunk/conf/autoload_configs/portaudio.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/portaudio.conf.xml freeswitch/trunk/conf/autoload_configs/rss.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/rss.conf.xml freeswitch/trunk/conf/autoload_configs/sofia.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/autoload_configs/spidermonkey.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/spidermonkey.conf.xml freeswitch/trunk/conf/autoload_configs/switch.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/conf/autoload_configs/syslog.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/syslog.conf.xml freeswitch/trunk/conf/autoload_configs/voicemail.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/conf/autoload_configs/wanpipe.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/wanpipe.conf.xml freeswitch/trunk/conf/autoload_configs/woomera.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/woomera.conf.xml freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/conf/autoload_configs/xml_curl.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/conf/autoload_configs/xml_rpc.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/xml_rpc.conf.xml freeswitch/trunk/conf/autoload_configs/zeroconf.conf.xml - copied unchanged from r6318, /freeswitch/trunk/conf/zeroconf.conf.xml Removed: freeswitch/trunk/conf/alsa.conf.xml freeswitch/trunk/conf/cdr.conf.xml freeswitch/trunk/conf/conference.conf.xml freeswitch/trunk/conf/console.conf.xml freeswitch/trunk/conf/dialplan_directory.conf.xml freeswitch/trunk/conf/dingaling.conf.xml freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/event_multicast.conf.xml freeswitch/trunk/conf/event_socket.conf.xml freeswitch/trunk/conf/iax.conf.xml freeswitch/trunk/conf/ivr.conf.xml freeswitch/trunk/conf/java.conf.xml freeswitch/trunk/conf/limit.conf.xml freeswitch/trunk/conf/local_stream.conf.xml freeswitch/trunk/conf/modules.conf.xml freeswitch/trunk/conf/openmrcp.conf.xml freeswitch/trunk/conf/portaudio.conf.xml freeswitch/trunk/conf/rss.conf.xml freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/conf/spidermonkey.conf.xml freeswitch/trunk/conf/switch.conf.xml freeswitch/trunk/conf/syslog.conf.xml freeswitch/trunk/conf/voicemail.conf.xml freeswitch/trunk/conf/wanpipe.conf.xml freeswitch/trunk/conf/woomera.conf.xml freeswitch/trunk/conf/xml_cdr.conf.xml freeswitch/trunk/conf/xml_curl.conf.xml freeswitch/trunk/conf/xml_rpc.conf.xml freeswitch/trunk/conf/zeroconf.conf.xml Modified: freeswitch/trunk/conf/freeswitch.xml Log: kaboom Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Sat Nov 17 16:13:12 2007 @@ -21,78 +21,7 @@ <X-PRE-PROCESS cmd="include" data="vars.xml"/> <section name="configuration" description="Various Configuration"> -  <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/> - - <X-PRE-PROCESS cmd="include" data="switch.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="modules.conf.xml"/> - -  -  - <X-PRE-PROCESS cmd="include" data="console.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="syslog.conf.xml"/> - -  - <X-PRE-PROCESS cmd="include" data="enum.conf.xml"/> - -  - <X-PRE-PROCESS cmd="include" data="xml_rpc.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xml_cdr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="xml_curl.conf.xml"/> -  - -  - <XX-PRE-PROCESS cmd="include" data="cdr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="event_multicast.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="event_socket.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="zeroconf.conf.xml"/> - -  -  - -  - <X-PRE-PROCESS cmd="include" data="dingaling.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="iax.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="portaudio.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="alsa.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="sofia.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="wanpipe.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="woomera.conf.xml"/> - -  -  - <X-PRE-PROCESS cmd="include" data="conference.conf.xml"/> -  - <X-PRE-PROCESS cmd="include" data="ivr.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="voicemail.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="limit.conf.xml"/> - -  - <X-PRE-PROCESS cmd="include" data="dialplan_directory.conf.xml"/> -  - -  -  -  -  -  -  - -  - <X-PRE-PROCESS cmd="include" data="spidermonkey.conf.xml"/> -  - <X-PRE-PROCESS cmd="include" data="java.conf.xml"/> - -  -  - <X-PRE-PROCESS cmd="include" data="rss.conf.xml"/> - <X-PRE-PROCESS cmd="include" data="openmrcp.conf.xml"/> - -  -  - <X-PRE-PROCESS cmd="include" data="local_stream.conf.xml"/> </section> <section name="dialplan" description="Regex/XML Dialplan">

1 0

[commit] r6318 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: mikej Date: Fri Nov 16 23:10:35 2007 New Revision: 6318 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix for MODAPP-51 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Fri Nov 16 23:10:35 2007 @@ -809,7 +809,7 @@ from_user, from_host, to_user, - to_host, event, proto + to_host, event ); assert(sql != NULL); @@ -846,7 +846,7 @@ switch_safe_free(sstr); - if ((sql = switch_mprintf("select * from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host, to_user, to_host))) { + if ((sql = switch_mprintf("select * from sip_subscriptions where sip_user='%q' and sip_host='%q'", to_user, to_host))) { sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, @@ -1145,3 +1145,13 @@ switch_core_hash_insert(tech_pvt->profile->chat_hash, tech_pvt->hash_key, tech_pvt); } +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */ 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 Fri Nov 16 23:10:35 2007 @@ -542,7 +542,7 @@ sql = NULL; } - if ((sql = switch_mprintf("delete from sip_registrations where call_id='%q'", to_user, to_host, call_id))) { + if ((sql = switch_mprintf("delete from sip_registrations where call_id='%q'", call_id))) { sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); switch_safe_free(sql); sql = NULL; @@ -1112,3 +1112,4 @@ +

1 0

[commit] r6317 - in freeswitch/trunk: libs/xmlrpc-c src src/include src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: anthm Date: Fri Nov 16 19:26:28 2007 New Revision: 6317 Modified: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_channel.c Log: add param Modified: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in (original) +++ freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in Fri Nov 16 19:26:28 2007 @@ -1,34 +1,85 @@ -/* xmlrpc_amconfig.h is generated by 'configure' from the template - xmlrpc_amconfig.h.in, by virtue of the AM_CONFIG_HEADER() macro in - configure.in. - - We'd like to replace it some day with something that doesn't use - such a special tool, to make the build understandable by dumber - developers. -*/ +/* xmlrpc_amconfig.h.in. Generated from configure.in by autoheader. */ -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -#undef size_t - -#undef HAVE_SETGROUPS +/* Define to 1 if you have the `asprintf' function. */ #undef HAVE_ASPRINTF + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV -#undef HAVE_WCSNCMP -/* Define if you have the <stdarg.h> header file. */ +/* Define to 1 if you have the `setgroups' function. */ +#undef HAVE_SETGROUPS + +/* Define to 1 if you have the <stdarg.h> header file. */ #undef HAVE_STDARG_H -/* Define if you have the <sys/filio.h> header file. */ +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/filio.h> header file. */ #undef HAVE_SYS_FILIO_H -/* Define if you have the <sys/ioctl.h> header file. */ +/* Define to 1 if you have the <sys/ioctl.h> header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the <wchar.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the <wchar.h> header file. */ #undef HAVE_WCHAR_H -/* Define if you have the socket library (-lsocket). */ -#undef HAVE_LIBSOCKET +/* Define to 1 if you have the `wcsncmp' function. */ +#undef HAVE_WCSNCMP /* Name of package */ #undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Version number of package */ +#undef VERSION + +/* Define to `unsigned' if <sys/types.h> does not define. */ +#undef size_t Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Fri Nov 16 19:26:28 2007 @@ -456,7 +456,7 @@ \note it's necessary to test if the return val is the same as the input and free the string if it is not. */ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, char *in); -SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile); +SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix); /** @} */ Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Nov 16 19:26:28 2007 @@ -186,7 +186,7 @@ switch_status_t status = SWITCH_STATUS_GENERR; channel = switch_core_session_get_channel(session); - data = switch_channel_build_param_string(channel, caller_profile); + data = switch_channel_build_param_string(channel, caller_profile, NULL); status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, data); switch_safe_free(data); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Nov 16 19:26:28 2007 @@ -1510,7 +1510,7 @@ return data; } -SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile) +SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix) { switch_stream_handle_t stream = { 0 }; switch_size_t encode_len = 1024, new_len = 0; @@ -1522,6 +1522,10 @@ SWITCH_STANDARD_STREAM(stream); + if (prefix) { + stream.write_function(&stream, "%s&", prefix); + } + encode_buf = malloc(encode_len); assert(encode_buf);

1 0

[commit] r6316 - freeswitch/trunk/src/include
by Freeswitch SVN 17 Nov '07

17 Nov '07

Author: mikej Date: Fri Nov 16 19:23:18 2007 New Revision: 6316 Modified: freeswitch/trunk/src/include/switch_core_db.h Log: or not. Modified: freeswitch/trunk/src/include/switch_core_db.h ============================================================================== --- freeswitch/trunk/src/include/switch_core_db.h (original) +++ freeswitch/trunk/src/include/switch_core_db.h Fri Nov 16 19:23:18 2007 @@ -539,7 +539,7 @@ * should always use %q instead of %s when inserting text into a string * literal. */ -SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...) PRINTF_FUNCTION(1, 2); +SWITCH_DECLARE(char *) switch_mprintf(const char *zFormat, ...); SWITCH_END_EXTERN_C #endif

1 0