<!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][14172] </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=14172">14172</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 11:15:06 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 13:08:02 CDT 2009 Pekka Pessi <first.last@nokia.com>
* nta: treat user-via and previously-added via differently</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantantac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (14171 => 14172)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:06:08 UTC (rev 14171)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:15:06 UTC (rev 14172)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 11:04:18 CDT 2009
</del><ins>+Thu Jul 9 11:05:06 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantantac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (14171 => 14172)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-09 16:06:08 UTC (rev 14171)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-09 16:15:06 UTC (rev 14172)
</span><span class="lines">@@ -513,7 +513,8 @@
</span><span class="cx"> unsigned orq_default:1; /**< This is default transaction */
</span><span class="cx"> unsigned orq_inserted:1;
</span><span class="cx"> unsigned orq_resolved:1;
</span><del>- unsigned orq_prepared:1; /**< outgoing_prepare() called */
</del><ins>+ unsigned orq_via_added:1;
+ unsigned orq_prepared:1;
</ins><span class="cx"> unsigned orq_canceled:1;
</span><span class="cx"> unsigned orq_terminated:1;
</span><span class="cx"> unsigned orq_destroyed:1;
</span><span class="lines">@@ -2533,19 +2534,22 @@
</span><span class="cx"> msg_t *msg = orq->orq_request;
</span><span class="cx"> sip_t *sip = sip_object(msg);
</span><span class="cx"> char const *branch = orq->orq_via_branch;
</span><ins>+ int already = orq->orq_user_via || orq->orq_via_added;
</ins><span class="cx"> int user_via = orq->orq_user_via;
</span><span class="cx"> sip_via_t *v;
</span><span class="cx"> int clear = 0;
</span><span class="cx">
</span><span class="cx"> assert(sip); assert(via);
</span><span class="cx">
</span><del>- if (user_via && sip->sip_via) {
- /* Use existing @Via provided by application */
</del><ins>+ if (already && sip->sip_via) {
+ /* Use existing @Via */
</ins><span class="cx"> v = sip->sip_via;
</span><span class="cx"> }
</span><span class="cx"> else if (msg && via && sip->sip_request &&
</span><span class="cx"> (v = sip_via_copy(msg_home(msg), via))) {
</span><del>- msg_header_insert(msg, (msg_pub_t *)sip, (msg_header_t *)v);
</del><ins>+ if (msg_header_insert(msg, (msg_pub_t *)sip, (msg_header_t *)v) < 0)
+ return -1;
+ orq->orq_via_added = 1;
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> return -1;
</span><span class="lines">@@ -7973,8 +7977,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- orq->orq_user_via = 1;
-
</del><span class="cx"> #if HAVE_SOFIA_SMIME
</span><span class="cx"> {
</span><span class="cx"> sm_object_t *smime = sa->sa_smime;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>