<!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][14287] </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=14287">14287</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-07-17 17:41:40 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-309">MODAPP-309</a> - variable expansion in cid regexp processing</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc">freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_lcrmod_lcrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (14286 => 14287)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-07-17 22:24:06 UTC (rev 14286)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-07-17 22:41:40 UTC (rev 14287)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lcr_shutdown);
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_lcr, mod_lcr_load, mod_lcr_shutdown, NULL);
</span><span class="cx">
</span><del>-static const char *do_cid(switch_memory_pool_t *pool, const char *cid, const char *number)
</del><ins>+static const char *do_cid(switch_memory_pool_t *pool, const char *cid, const char *number, switch_core_session_t *session)
</ins><span class="cx"> {
</span><span class="cx"> switch_regex_t *re = NULL;
</span><span class="cx"> int proceed = 0, ovector[30];
</span><span class="lines">@@ -164,6 +164,10 @@
</span><span class="cx"> uint32_t len = 0;
</span><span class="cx"> char *src = NULL;
</span><span class="cx"> char *dst = NULL;
</span><ins>+ char *tmp_regex = NULL;
+ char *src_regex = NULL;
+ char *dst_regex = NULL;
+ switch_channel_t *channel = NULL;
</ins><span class="cx">
</span><span class="cx"> if (!switch_strlen_zero(cid)) {
</span><span class="cx"> len = strlen(cid);
</span><span class="lines">@@ -188,7 +192,29 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Not a valid regexp: %s\n", src);
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ /* if a session is provided, check if the source part of the regex has any channel variables, then expand them */
+ if(session) {
+ channel = switch_core_session_get_channel(session);
+ switch_assert(channel);
+
+ if(switch_string_var_check_const(src) || switch_string_has_escaped_data(src)) {
+ tmp_regex = switch_channel_expand_variables(channel, src);
+ src_regex = switch_core_strdup(pool, tmp_regex);
+ switch_safe_free(tmp_regex);
+ src = src_regex;
+ }
+
+ if(switch_string_var_check_const(dst) || switch_string_has_escaped_data(dst)) {
+ tmp_regex = switch_channel_expand_variables(channel, dst);
+ dst_regex = switch_core_strdup(pool, tmp_regex);
+ switch_safe_free(tmp_regex);
+ dst = dst_regex;
+ }
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "expanded src: %s, dst: %s\n", src, dst);
+ }
+
</ins><span class="cx"> if ((proceed = switch_regex_perform(number, src, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
</span><span class="cx"> len = (uint32_t) (strlen(src) + strlen(dst) + 10) * proceed; /* guestimate size */
</span><span class="cx"> if (!(substituted = switch_core_alloc(pool, len))) {
</span><span class="lines">@@ -210,7 +236,7 @@
</span><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, char *caller_id, lcr_route cur_route, profile_t *profile)
</del><ins>+static char *get_bridge_data(switch_memory_pool_t *pool, char *dialed_number, char *caller_id, lcr_route cur_route, profile_t *profile, switch_core_session_t *session)
</ins><span class="cx"> {
</span><span class="cx"> size_t lstrip;
</span><span class="cx"> size_t tstrip;
</span><span class="lines">@@ -250,7 +276,7 @@
</span><span class="cx"> cid = "";
</span><span class="cx"> if (!switch_strlen_zero(cur_route->cid)) {
</span><span class="cx"> cid = switch_core_sprintf(pool, ",origination_caller_id_number=%s",
</span><del>- do_cid(pool, cur_route->cid, caller_id));
</del><ins>+ do_cid(pool, cur_route->cid, caller_id, session));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> header = "";
</span><span class="lines">@@ -545,7 +571,7 @@
</span><span class="cx"> if (argc > LCR_CID_PLACE) {
</span><span class="cx"> additional->cid = switch_core_strdup(pool, switch_str_nil(argv[LCR_CID_PLACE]));
</span><span class="cx"> }
</span><del>- additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional, cbt->profile);
</del><ins>+ additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional, cbt->profile, cbt->session);
</ins><span class="cx">
</span><span class="cx"> if (cbt->head == NULL) {
</span><span class="cx"> key = switch_core_sprintf(pool, "%s:%s", additional->gw_prefix, additional->gw_suffix);
</span><span class="lines">@@ -1340,7 +1366,7 @@
</span><span class="cx"> current = cb_struct.head;
</span><span class="cx"> while (current) {
</span><span class="cx">
</span><del>- dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current, cb_struct.profile);
</del><ins>+ dialstring = get_bridge_data(pool, cb_struct.lookup_number, cb_struct.cid, current, cb_struct.profile, cb_struct.session);
</ins><span class="cx">
</span><span class="cx"> stream->write_function(stream, " | %s", current->digit_str);
</span><span class="cx"> str_repeat((maximum_lengths.digit_str - current->digit_len), " ", stream);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>