<!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][14789] </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=14789">14789</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-08 14:05:32 -0500 (Tue, 08 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add optional prefix arg to set_user <a href="http://jira.freeswitch.org/browse/FSCORE-429">FSCORE-429</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc">freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_dptoolsmod_dptoolsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (14788 => 14789)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-09-08 15:18:31 UTC (rev 14788)
+++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 2009-09-08 19:05:32 UTC (rev 14789)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define SET_USER_SYNTAX "<user>@<domain>"
</del><ins>+#define SET_USER_SYNTAX "<user>@<domain> [prefix]"
</ins><span class="cx"> SWITCH_STANDARD_APP(set_user_function)
</span><span class="cx"> {
</span><span class="cx"> switch_ivr_set_user(session, data);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (14788 => 14789)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2009-09-08 15:18:31 UTC (rev 14788)
+++ freeswitch/trunk/src/switch_ivr.c 2009-09-08 19:05:32 UTC (rev 14789)
</span><span class="lines">@@ -2113,7 +2113,31 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const char *get_prefixed_str(char *buffer, size_t buffer_size, const char *prefix, size_t prefix_size, const char *str)
+{
+ size_t str_len;
</ins><span class="cx">
</span><ins>+ if (switch_strlen_zero(buffer)) {
+ /*
+ if buffer is null then it just returns the str without the prefix appended, otherwise buffer contains the prefix followed by the original string
+ */
+
+ return str;
+ }
+
+ str_len = strlen(str);
+ memcpy(buffer, prefix, prefix_size);
+
+ if (str_len + prefix_size + 1 > buffer_size) {
+ memcpy(buffer + prefix_size, str, buffer_size-prefix_size - 1);
+ buffer[buffer_size-prefix_size - 1] = '\0';
+ } else {
+ memcpy(buffer + prefix_size, str, str_len + 1);
+ }
+
+ return buffer;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_ivr_set_user(switch_core_session_t *session, const char *data)
</span><span class="cx"> {
</span><span class="cx"> switch_xml_t x_domain, xml = NULL, x_user, x_param, x_params, x_group = NULL;
</span><span class="lines">@@ -2121,11 +2145,18 @@
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><ins>+ char * prefix_buffer = NULL, *prefix;
+ size_t buffer_size =0;
+ size_t prefix_size=0;
</ins><span class="cx"> if (switch_strlen_zero(data)) {
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> user = switch_core_session_strdup(session, data);
</span><ins>+
+ if ((prefix = strchr(user, ' '))){
+ *prefix++ = 0;
+ }
</ins><span class="cx">
</span><span class="cx"> if (!(domain = strchr(user, '@'))) {
</span><span class="cx"> goto error;
</span><span class="lines">@@ -2140,8 +2171,14 @@
</span><span class="cx">
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><ins>+ if (!switch_strlen_zero(prefix)) {
+ prefix_size = strlen(prefix);
+ buffer_size = 1024 + prefix_size + 1;
+ prefix_buffer = switch_core_session_alloc(session, buffer_size);
+ }
+
</ins><span class="cx"> if ((number_alias = (char *) switch_xml_attr(x_user, "number-alias"))) {
</span><del>- switch_channel_set_variable(channel, "number_alias", number_alias);
</del><ins>+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer, buffer_size, prefix, prefix_size, "number_alias"), number_alias);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((x_params = switch_xml_child(x_domain, "variables"))) {
</span><span class="lines">@@ -2150,7 +2187,7 @@
</span><span class="cx"> const char *val = switch_xml_attr(x_param, "value");
</span><span class="cx">
</span><span class="cx"> if (var && val) {
</span><del>- switch_channel_set_variable(channel, var, val);
</del><ins>+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer, buffer_size, prefix, prefix_size, var), val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2161,7 +2198,7 @@
</span><span class="cx"> const char *val = switch_xml_attr(x_param, "value");
</span><span class="cx">
</span><span class="cx"> if (var && val) {
</span><del>- switch_channel_set_variable(channel, var, val);
</del><ins>+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer, buffer_size, prefix, prefix_size, var), val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2172,13 +2209,13 @@
</span><span class="cx"> const char *val = switch_xml_attr(x_param, "value");
</span><span class="cx">
</span><span class="cx"> if (var && val) {
</span><del>- switch_channel_set_variable(channel, var, val);
</del><ins>+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer, buffer_size, prefix, prefix_size, var), val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_channel_set_variable(channel, "user_name", user);
- switch_channel_set_variable(channel, "domain_name", domain);
</del><ins>+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer,buffer_size,prefix,prefix_size,"user_name") , user);
+ switch_channel_set_variable(channel, get_prefixed_str(prefix_buffer,buffer_size,prefix,prefix_size,"domain_name") , domain);
</ins><span class="cx">
</span><span class="cx"> goto done;
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>