<!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][16250] </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=16250">16250</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-11 18:05:11 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/SFSIP-195">SFSIP-195</a></pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (16249 => 16250)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-01-11 21:27:41 UTC (rev 16249)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-01-12 00:05:11 UTC (rev 16250)
</span><span class="lines">@@ -579,6 +579,7 @@
</span><span class="cx"> switch_rtp_crypto_key_type_t crypto_recv_type;
</span><span class="cx"> switch_rtp_crypto_key_type_t crypto_type;
</span><span class="cx"> char *local_sdp_str;
</span><ins>+ char *last_sdp_str;
</ins><span class="cx"> char *dest;
</span><span class="cx"> char *dest_to;
</span><span class="cx"> char *key;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (16249 => 16250)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-11 21:27:41 UTC (rev 16249)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-12 00:05:11 UTC (rev 16250)
</span><span class="lines">@@ -3412,6 +3412,11 @@
</span><span class="cx">
</span><span class="cx"> switch_channel_clear_flag(channel, CF_REQ_MEDIA);
</span><span class="cx">
</span><ins>+ tech_pvt->last_sdp_str = NULL;
+ if (!sofia_use_soa(tech_pvt) && sip->sip_payload && sip->sip_payload->pl_data) {
+ tech_pvt->last_sdp_str = switch_core_session_strdup(session, sip->sip_payload->pl_data);
+ }
+
</ins><span class="cx"> if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) {
</span><span class="cx"> if (channel && sip->sip_call_info) {
</span><span class="cx"> char *p;
</span><span class="lines">@@ -3832,6 +3837,20 @@
</span><span class="cx"> NUTAG_OFFER_SENT_REF(offer_sent),
</span><span class="cx"> NUTAG_ANSWER_SENT_REF(answer_sent),
</span><span class="cx"> SIPTAG_REPLACES_STR_REF(replaces_str), SOATAG_LOCAL_SDP_STR_REF(l_sdp), SOATAG_REMOTE_SDP_STR_REF(r_sdp), TAG_END());
</span><ins>+
+
+ if (session) {
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
+ if (!tech_pvt || !tech_pvt->nh) {
+ goto done;
+ }
+ }
+
+ if (status > 100 && status < 300 && tech_pvt && !sofia_use_soa(tech_pvt) && !r_sdp && tech_pvt->last_sdp_str) {
+ r_sdp = tech_pvt->last_sdp_str;
+ }
</ins><span class="cx">
</span><span class="cx"> /* This marr in our code brought to you by people who can't read........*/
</span><span class="cx"> if (profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME && r_sdp && (p = (char *) switch_stristr("g729a/8000", r_sdp))) {
</span><span class="lines">@@ -3867,13 +3886,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session) {
</span><del>- channel = switch_core_session_get_channel(session);
- tech_pvt = switch_core_session_get_private(session);
-
- if (!tech_pvt || !tech_pvt->nh) {
- goto done;
- }
-
</del><span class="cx"> if ((switch_channel_test_flag(channel, CF_EARLY_MEDIA) || switch_channel_test_flag(channel, CF_ANSWERED)) &&
</span><span class="cx"> (status == 180 || status == 183)) {
</span><span class="cx"> /* Must you send 180 after 183 w/sdp ? sheesh */
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (16249 => 16250)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-11 21:27:41 UTC (rev 16249)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-12 00:05:11 UTC (rev 16250)
</span><span class="lines">@@ -1817,7 +1817,10 @@
</span><span class="cx"> SOATAG_REUSE_REJECTED(1),
</span><span class="cx"> SOATAG_ORDERED_USER(1),
</span><span class="cx"> SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE),
</span><del>- SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END());
</del><ins>+ SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL),
+ TAG_IF(rep, SIPTAG_REPLACES_STR(rep)),
+ SOATAG_HOLD(holdstr),
+ TAG_END());
</ins><span class="cx"> } else {
</span><span class="cx"> nua_invite(tech_pvt->nh,
</span><span class="cx"> NUTAG_AUTOANSWER(0),
</span><span class="lines">@@ -1839,7 +1842,8 @@
</span><span class="cx"> SIPTAG_CONTENT_TYPE_STR("application/sdp"),
</span><span class="cx"> SIPTAG_PAYLOAD_STR(tech_pvt->local_sdp_str),
</span><span class="cx"> TAG_IF(rep, SIPTAG_REPLACES_STR(rep)),
</span><del>- TAG_END());
</del><ins>+ SOATAG_HOLD(holdstr),
+ TAG_END());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sofia_glue_free_destination(dst);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>