add param

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6317 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/xmlrpc-c/xmlrpc_amconfig.h.in b/libs/xmlrpc-c/xmlrpc_amconfig.h.in
index 19f64ebdd9ca0b4cee428482974dc37049b54f8a..99479b65afe56bf6a3c0748b1c2468d8612e1bef 100644 (file)
--- a/libs/xmlrpc-c/xmlrpc_amconfig.h.in
+++ b/libs/xmlrpc-c/xmlrpc_amconfig.h.in
@@ -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.
+/* xmlrpc_amconfig.h.in.  Generated from configure.in by autoheader.  */
 
-   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.  
-*/
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
 
-#undef HAVE_SETGROUPS
-#undef HAVE_ASPRINTF
+/* 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

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 3c36a57cf9f2767ccf41a1b38d873de77d0c66c3..80057584bcd634201a06dfd2fd4db7493d45e903 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -456,7 +456,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel_t *channel, sw
   \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);
 
 /** @} */
 

diff --git a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
index f368244eae2b1b5715839c059d40f069a60a89bf..31efcec89742a6b5bff9ce2b67d033449ae34e71 100644 (file)
--- a/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
+++ b/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c
@@ -186,7 +186,7 @@ static switch_status_t dialplan_xml_locate(switch_core_session_t *session, switc
        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);

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 649c301f01f5886b4ffac72553cabfc4a70cde38..4c7c256bd155f7958a45793a80cf67f78a1fde90 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1510,7 +1510,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
        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_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *chann
 
        SWITCH_STANDARD_STREAM(stream);
 
+       if (prefix) {
+               stream.write_function(&stream, "%s&", prefix);
+       }
+
        encode_buf = malloc(encode_len);
        assert(encode_buf);