<!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][15208] </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=15208">15208</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-10-23 10:07:52 -0500 (Fri, 23 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre> record path and template are two values with backwards compatibility tried </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfsip_profilesinternalxml">freeswitch/trunk/conf/sip_profiles/internal.xml</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfsip_profilesinternalxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/sip_profiles/internal.xml (15207 => 15208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/sip_profiles/internal.xml 2009-10-23 15:01:34 UTC (rev 15207)
+++ freeswitch/trunk/conf/sip_profiles/internal.xml 2009-10-23 15:07:52 UTC (rev 15208)
</span><span class="lines">@@ -75,7 +75,8 @@
</span><span class="cx"> <param name="local-network-acl" value="localnet.auto"/>
</span><span class="cx"> <!--<param name="apply-register-acl" value="domains"/>-->
</span><span class="cx"> <!--<param name="dtmf-type" value="info"/>-->
</span><del>- <param name="record-template" value="$${base_dir}/recordings/${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
</del><ins>+ <param name="record-path" value="$${base_dir}/recordings"/>
+ <param name="record-template" value="${caller_id_number}.${target_domain}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
</ins><span class="cx"> <!--enable to use presence -->
</span><span class="cx"> <param name="manage-presence" value="true"/>
</span><span class="cx"> <!--<param name="manage-shared-appearance" value="true"/>-->
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (15207 => 15208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-23 15:01:34 UTC (rev 15207)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-10-23 15:07:52 UTC (rev 15208)
</span><span class="lines">@@ -441,6 +441,7 @@
</span><span class="cx"> char *reg_db_domain;
</span><span class="cx"> char *user_agent;
</span><span class="cx"> char *record_template;
</span><ins>+ char *record_path;
</ins><span class="cx"> char *presence_hosts;
</span><span class="cx"> char *challenge_realm;
</span><span class="cx"> sofia_cid_type_t cid_type;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15207 => 15208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-23 15:01:34 UTC (rev 15207)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-23 15:07:52 UTC (rev 15208)
</span><span class="lines">@@ -1827,6 +1827,8 @@
</span><span class="cx"> profile->cid_type = sofia_cid_name2type(val);
</span><span class="cx"> } else if (!strcasecmp(var, "record-template")) {
</span><span class="cx"> profile->record_template = switch_core_strdup(profile->pool, val);
</span><ins>+ } else if (!strcasecmp(var, "record-path")) {
+ profile->record_path = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media"))) {
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_flag(profile, TFLAG_INB_NOMEDIA);
</span><span class="lines">@@ -2378,6 +2380,8 @@
</span><span class="cx"> profile->cid_type = sofia_cid_name2type(val);
</span><span class="cx"> } else if (!strcasecmp(var, "record-template")) {
</span><span class="cx"> profile->record_template = switch_core_strdup(profile->pool, val);
</span><ins>+ } else if (!strcasecmp(var, "record-path")) {
+ profile->record_path = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media")) && switch_true(val)) {
</span><span class="cx"> sofia_set_flag(profile, TFLAG_INB_NOMEDIA);
</span><span class="cx"> } else if (!strcasecmp(var, "inbound-late-negotiation") && switch_true(val)) {
</span><span class="lines">@@ -4698,12 +4702,15 @@
</span><span class="cx"> nua_respond(nh, 488, "Recording not enabled", NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> } else {
</span><span class="cx"> if (!strcasecmp(rec_header, "on")) {
</span><del>- char *file;
</del><ins>+ char *file = NULL, *tmp = NULL;
</ins><span class="cx">
</span><del>- file = switch_channel_expand_variables(channel, profile->record_template);
</del><ins>+ tmp = switch_mprintf("%s%s%s", profile->record_path ? profile->record_path : "${base_dir}/recordings",
+ SWITCH_PATH_SEPARATOR, profile->record_template);
+ file = switch_channel_expand_variables(channel, tmp);
</ins><span class="cx"> switch_ivr_record_session(session, file, 0, NULL);
</span><span class="cx"> switch_channel_set_variable(channel, "sofia_record_file", file);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Recording %s to %s\n", switch_channel_get_name(channel), file);
</span><ins>+ switch_safe_free(tmp);
</ins><span class="cx"> nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> if (file != profile->record_template) {
</span><span class="cx"> free(file);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>