<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15469] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15469">15469</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-14 12:36:41 -0600 (Sat, 14 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add <> var continer to enterprise_originate syntax to set variables to pass to every thread</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15468 => 15469)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-11-14 11:51:25 UTC (rev 15468)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-11-14 18:36:41 UTC (rev 15469)
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> switch_originate_flag_t flags
</span><span class="cx"> )
</span><span class="cx"> {
</span><del>- int x_argc;
</del><ins>+ int x_argc = 0;
</ins><span class="cx"> char *x_argv[MAX_PEERS] = { 0 };
</span><span class="cx"> enterprise_originate_handle_t *hp = NULL, handles[MAX_PEERS] = { { 0 } };
</span><span class="cx"> int i;
</span><span class="lines">@@ -1242,6 +1242,11 @@
</span><span class="cx"> switch_event_header_t *hi = NULL;
</span><span class="cx"> struct ent_originate_ringback rb_data = { 0 };
</span><span class="cx"> const char *ringback_data = NULL;
</span><ins>+ char *vars = NULL;
+ int var_block_count = 0;
+ char *e = NULL;
+ switch_event_t *var_event = NULL;
+ const char *export_vars = NULL;
</ins><span class="cx">
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx">
</span><span class="lines">@@ -1252,6 +1257,108 @@
</span><span class="cx">
</span><span class="cx"> data = switch_core_strdup(pool, bridgeto);
</span><span class="cx">
</span><ins>+ /* strip leading spaces */
+ while (data && *data && *data == ' ') {
+ data++;
+ }
+
+ /* extract channel variables, allowing multiple sets of braces */
+ while (*data == '<') {
+ if (!var_block_count) {
+ e = switch_find_end_paren(data, '<', '>');
+ if (!e || !*e) {
+ goto var_extract_error;
+ }
+ vars = data + 1;
+ *e = '\0';
+ data = e + 1;
+ } else {
+ int j = 0, k = 0;
+ if (e) {
+ *e = ',';
+ }
+ e = switch_find_end_paren(data, '<', '>');
+ if (!e || !*e) {
+ goto var_extract_error;
+ }
+ /* swallow the opening bracket */
+ while ((data + k) && *(data + k)) {
+ j = k; k++;
+ /* note that this affects vars[] */
+ data[j] = data[k];
+ }
+ *(--e) = '\0';
+ data = e + 1;
+ }
+ var_block_count++;
+ continue;
+
+ var_extract_error:
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Parse Error!\n");
+ switch_goto_status(SWITCH_STATUS_GENERR, done);
+ }
+
+ /* strip leading spaces (again) */
+ while (data && *data && *data == ' ') {
+ data++;
+ }
+
+ if (ovars) {
+ var_event = ovars;
+ } else {
+ if (switch_event_create_plain(&var_event, SWITCH_EVENT_CHANNEL_DATA) != SWITCH_STATUS_SUCCESS) {
+ abort();
+ }
+ }
+
+ /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */
+ if (channel && (export_vars = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE))) {
+ char *cptmp = switch_core_session_strdup(session, export_vars);
+ int argc;
+ char *argv[256];
+
+ if ((argc = switch_separate_string(cptmp, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) {
+ int x;
+
+ for (x = 0; x < argc; x++) {
+ const char *vval;
+ if ((vval = switch_channel_get_variable(channel, argv[x]))) {
+ char *vvar = argv[x];
+ if (!strncasecmp(vvar, "nolocal:", 8)) {
+ vvar += 8;
+ }
+ switch_event_del_header(var_event, vvar);
+ switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, vvar, vval);
+ }
+ }
+ }
+ }
+
+ if (vars) { /* Parse parameters specified from the dialstring */
+ char *var_array[1024] = { 0 };
+ int var_count = 0;
+ if ((var_count = switch_separate_string(vars, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) {
+ int x = 0;
+ for (x = 0; x < var_count; x++) {
+ char *inner_var_array[2] = { 0 };
+ int inner_var_count;
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]);
+ if ((inner_var_count =
+ switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) {
+ switch_event_del_header(var_event, inner_var_array[0]);
+ switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, inner_var_array[0], inner_var_array[1]);
+ }
+ }
+ }
+ }
+
+ if (ovars) {
+ for (hi = ovars->headers; hi; hi = hi->next) {
+ switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, hi->name, hi->value);
+ }
+ }
+
+
</ins><span class="cx"> if (!(x_argc = switch_separate_string_string(data, OSEP, x_argv, MAX_PEERS))) {
</span><span class="cx"> *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="lines">@@ -1275,19 +1382,7 @@
</span><span class="cx"> handles[i].cid_name_override = cid_name_override;
</span><span class="cx"> handles[i].cid_num_override = cid_num_override;
</span><span class="cx"> handles[i].caller_profile_override = cp;
</span><del>-
- if (channel) {
- switch_channel_get_variables(channel, &handles[i].ovars);
- } else {
- switch_event_create_plain(&handles[i].ovars, SWITCH_EVENT_CHANNEL_DATA);
- }
-
- if (ovars) {
- for (hi = ovars->headers; hi; hi = hi->next) {
- switch_event_add_header_string(handles[i].ovars, SWITCH_STACK_BOTTOM, hi->name, hi->value);
- }
- }
-
</del><ins>+ switch_event_dup(&handles[i].ovars, var_event);
</ins><span class="cx"> handles[i].flags = flags;
</span><span class="cx"> switch_thread_create(&handles[i].thread, thd_attr, enterprise_originate_thread, &handles[i], pool);
</span><span class="cx"> }
</span><span class="lines">@@ -1374,10 +1469,12 @@
</span><span class="cx"> switch_event_destroy(&hp->ovars);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ end:
</ins><span class="cx">
</span><ins>+ if (var_event && var_event != ovars) {
+ switch_event_destroy(&var_event);
+ }
</ins><span class="cx">
</span><del>- end:
-
</del><span class="cx"> switch_core_destroy_memory_pool(&pool);
</span><span class="cx">
</span><span class="cx"> return status;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>