<!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][15386] </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=15386">15386</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-06 10:11:26 -0600 (Fri, 06 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>get exported vars in originate thx moc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<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_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (15385 => 15386)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2009-11-06 16:00:56 UTC (rev 15385)
+++ freeswitch/trunk/src/switch_core_session.c 2009-11-06 16:11:26 UTC (rev 15386)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (channel) {
</span><del>- const char *export_vars, *val;
</del><ins>+ const char *val;
</ins><span class="cx"> switch_codec_t *vid_read_codec = NULL, *read_codec = switch_core_session_get_read_codec(session);
</span><span class="cx"> const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
</span><span class="cx">
</span><span class="lines">@@ -475,28 +475,6 @@
</span><span class="cx"> switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session));
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(*new_session));
</span><span class="cx">
</span><del>- /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */
- if ((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_channel_set_variable(peer_channel, vvar, vval);
- }
- }
- }
- }
-
</del><span class="cx"> if ((val = switch_channel_get_variable(channel, SWITCH_PROCESS_CDR_VARIABLE))) {
</span><span class="cx"> switch_channel_set_variable(peer_channel, SWITCH_PROCESS_CDR_VARIABLE, val);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15385 => 15386)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-11-06 16:00:56 UTC (rev 15385)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-11-06 16:11:26 UTC (rev 15386)
</span><span class="lines">@@ -1193,6 +1193,7 @@
</span><span class="cx"> int local_clobber = 0;
</span><span class="cx"> const char *cancel_key = NULL;
</span><span class="cx"> const char *holding = NULL;
</span><ins>+ const char *export_vars = NULL;
</ins><span class="cx">
</span><span class="cx"> oglobals.ringback_ok = 1;
</span><span class="cx">
</span><span class="lines">@@ -1322,6 +1323,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */
+ if ((export_vars = switch_channel_get_variable(caller_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(caller_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);
+ }
+ }
+ }
+ }
+
</ins><span class="cx"> if (vars) { /* Parse parameters specified from the dialstring */
</span><span class="cx"> char *var_array[1024] = { 0 };
</span><span class="cx"> int var_count = 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>