<!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][15022] </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=15022">15022</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-09-30 09:52:19 -0500 (Wed, 30 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-340">MODAPP-340</a> - Add support for user_rates which are the (optional) end-user rates</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 (15021 => 15022)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-09-30 14:08:49 UTC (rev 15021)
+++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c 2009-09-30 14:52:19 UTC (rev 15022)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx"> #define LCR_ADMIN_SYNTAX "lcr_admin show profiles"
</span><span class="cx">
</span><span class="cx"> /* SQL Query places */
</span><ins>+/* these now make up a map that describes the location of
+ the field based on name */
</ins><span class="cx"> #define LCR_DIGITS_PLACE 0
</span><span class="cx"> #define LCR_CARRIER_PLACE 1
</span><span class="cx"> #define LCR_RATE_PLACE 2
</span><span class="lines">@@ -47,9 +49,10 @@
</span><span class="cx"> #define LCR_SUFFIX_PLACE 8
</span><span class="cx"> #define LCR_CODEC_PLACE 9
</span><span class="cx"> #define LCR_CID_PLACE 10
</span><ins>+#define LCR_USER_RATE_PLACE 11
</ins><span class="cx">
</span><span class="cx"> #define LCR_QUERY_COLS_REQUIRED 9
</span><del>-#define LCR_QUERY_COLS 11
</del><ins>+#define LCR_QUERY_COLS 12
</ins><span class="cx">
</span><span class="cx"> #define LCR_HEADERS_COUNT 6
</span><span class="cx">
</span><span class="lines">@@ -83,6 +86,8 @@
</span><span class="cx"> char *dialstring;
</span><span class="cx"> float rate;
</span><span class="cx"> char *rate_str;
</span><ins>+ float user_rate;
+ char *user_rate_str;
</ins><span class="cx"> size_t lstrip;
</span><span class="cx"> size_t tstrip;
</span><span class="cx"> size_t digit_len;
</span><span class="lines">@@ -246,6 +251,7 @@
</span><span class="cx"> char *codec = NULL;
</span><span class="cx"> char *cid = NULL;
</span><span class="cx"> char *header = NULL;
</span><ins>+ char *user_rate = NULL;
</ins><span class="cx">
</span><span class="cx"> orig_destination_number = destination_number = switch_core_strdup(pool, dialed_number);
</span><span class="cx">
</span><span class="lines">@@ -286,9 +292,15 @@
</span><span class="cx"> cur_route->carrier_name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s%s%s]%s%s%s%s%s"
</del><ins>+ if (switch_strlen_zero(cur_route->user_rate_str)) {
+ user_rate = "";
+ } else {
+ user_rate = switch_core_sprintf(pool, ",lcr_user_rate=%s", cur_route->user_rate_str);
+ }
+
+ data = switch_core_sprintf(pool, "[lcr_carrier=%s,lcr_rate=%s%s%s%s%s]%s%s%s%s%s"
</ins><span class="cx"> , cur_route->carrier_name, cur_route->rate_str
</span><del>- , codec, cid, header
</del><ins>+ , user_rate, codec, cid, header
</ins><span class="cx"> , cur_route->gw_prefix, cur_route->prefix
</span><span class="cx"> , destination_number, cur_route->suffix, cur_route->gw_suffix);
</span><span class="cx">
</span><span class="lines">@@ -571,6 +583,10 @@
</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><ins>+ if (argc > LCR_USER_RATE_PLACE) {
+ additional->user_rate = (float)atof(switch_str_nil(argv[LCR_USER_RATE_PLACE]));
+ additional->user_rate_str = switch_core_sprintf(pool, "%0.5f", additional->user_rate);
+ }
</ins><span class="cx"> additional->dialstring = get_bridge_data(pool, cbt->lookup_number, cbt->cid, additional, cbt->profile, cbt->session);
</span><span class="cx">
</span><span class="cx"> if (cbt->head == NULL) {
</span><span class="lines">@@ -716,6 +732,7 @@
</span><span class="cx"> char *id_str;
</span><span class="cx"> char *safe_sql = NULL;
</span><span class="cx"> char *rate_field = NULL;
</span><ins>+ char *user_rate_field = NULL;
</ins><span class="cx">
</span><span class="cx"> switch_assert(cb_struct->lookup_number != NULL);
</span><span class="cx">
</span><span class="lines">@@ -739,10 +756,13 @@
</span><span class="cx"> /* set our rate field based on env and profile */
</span><span class="cx"> if (cb_struct->intralata == SWITCH_TRUE && profile->profile_has_intralata == SWITCH_TRUE) {
</span><span class="cx"> rate_field = switch_core_strdup(cb_struct->pool, "intralata_rate");
</span><ins>+ user_rate_field = switch_core_strdup(cb_struct->pool, "user_intralata_rate");
</ins><span class="cx"> } else if (cb_struct->intrastate == SWITCH_TRUE && profile->profile_has_intrastate == SWITCH_TRUE) {
</span><span class="cx"> rate_field = switch_core_strdup(cb_struct->pool, "intrastate_rate");
</span><ins>+ user_rate_field = switch_core_strdup(cb_struct->pool, "user_intrastate_rate");
</ins><span class="cx"> } else {
</span><span class="cx"> rate_field = switch_core_strdup(cb_struct->pool, "rate");
</span><ins>+ user_rate_field = switch_core_strdup(cb_struct->pool, "user_rate");
</ins><span class="cx"> }
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "intra routing [state:%d lata:%d] so rate field is [%s]\n",
</span><span class="cx"> cb_struct->intrastate, cb_struct->intralata, rate_field);
</span><span class="lines">@@ -752,6 +772,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "we have a session\n");
</span><span class="cx"> if ((channel = switch_core_session_get_channel(cb_struct->session))) {
</span><span class="cx"> switch_channel_set_variable_var_check(channel, "lcr_rate_field", rate_field, SWITCH_FALSE);
</span><ins>+ switch_channel_set_variable_var_check(channel, "lcr_user_rate_field", user_rate_field, SWITCH_FALSE);
</ins><span class="cx"> switch_channel_set_variable_var_check(channel, "lcr_query_digits", digits_copy, SWITCH_FALSE);
</span><span class="cx"> id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
</span><span class="cx"> switch_channel_set_variable_var_check(channel, "lcr_query_profile", id_str, SWITCH_FALSE);
</span><span class="lines">@@ -761,6 +782,7 @@
</span><span class="cx"> if (cb_struct->event) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_DEBUG, "we have an event\n");
</span><span class="cx"> switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_rate_field", rate_field);
</span><ins>+ switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_user_rate_field", user_rate_field);
</ins><span class="cx"> switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_digits", digits_copy);
</span><span class="cx"> id_str = switch_core_sprintf(cb_struct->pool, "%d", cb_struct->profile->id);
</span><span class="cx"> switch_event_add_header_string(cb_struct->event, SWITCH_STACK_BOTTOM, "lcr_query_profile", id_str);
</span><span class="lines">@@ -1217,10 +1239,13 @@
</span><span class="cx"> routes.lookup_number = dest;
</span><span class="cx"> if (caller_profile) {
</span><span class="cx"> routes.cid = (char *) switch_channel_get_variable(channel, "effective_caller_id_number");
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Caller ID: %s\n", routes.cid);
</ins><span class="cx"> if (!routes.cid) {
</span><span class="cx"> routes.cid = (char *) caller_profile->caller_id_number;
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Caller ID2: %s\n", routes.cid);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx">
</span><span class="cx"> if (!(routes.profile = locate_profile(lcr_profile))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unknown profile: %s\n", lcr_profile);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>