<!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][16315] </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=16315">16315</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-01-14 18:31:43 -0600 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre> finally fix private hold </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_timec">freeswitch/trunk/src/switch_time.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (16314 => 16315)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-14 21:31:40 UTC (rev 16314)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-01-15 00:31:43 UTC (rev 16315)
</span><span class="lines">@@ -51,6 +51,10 @@
</span><span class="cx"> extern su_log_t stun_log[];
</span><span class="cx"> extern su_log_t su_log_default[];
</span><span class="cx">
</span><ins>+
+void sofia_handle_sip_i_reinvite(switch_core_session_t *session,
+ nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]);
+
</ins><span class="cx"> static void set_variable_sip_param(switch_channel_t *channel, char *header_type, sip_param_t const *params);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -671,7 +675,11 @@
</span><span class="cx"> sofia_handle_sip_i_options(status, phrase, nua, profile, nh, sofia_private, sip, tags);
</span><span class="cx"> break;
</span><span class="cx"> case nua_i_invite:
</span><del>- if (!session) sofia_handle_sip_i_invite(nua, profile, nh, sofia_private, sip, tags);
</del><ins>+ if (session) {
+ sofia_handle_sip_i_reinvite(session, nua, profile, nh, sofia_private, sip, tags);
+ } else {
+ sofia_handle_sip_i_invite(nua, profile, nh, sofia_private, sip, tags);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case nua_i_publish:
</span><span class="cx"> sofia_presence_handle_sip_i_publish(nua, profile, nh, sofia_private, sip, tags);
</span><span class="lines">@@ -5311,6 +5319,25 @@
</span><span class="cx"> return uri;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void sofia_handle_sip_i_reinvite(switch_core_session_t *session,
+ nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[])
+{
+ char *call_info = NULL;
+
+ if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) {
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ if (channel && sip->sip_call_info) {
+ char *p;
+ if ((call_info = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_call_info))) {
+ if ((p = strchr(call_info, ';'))) {
+ switch_channel_set_variable(channel, "presence_call_info", p+1);
+ }
+ su_free(nua_handle_home(nh), call_info);
+ }
+ }
+ }
+}
+
</ins><span class="cx"> void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[])
</span><span class="cx"> {
</span><span class="cx"> switch_core_session_t *session = NULL;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (16314 => 16315)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-01-14 21:31:40 UTC (rev 16314)
+++ freeswitch/trunk/src/switch_channel.c 2010-01-15 00:31:43 UTC (rev 16315)
</span><span class="lines">@@ -503,10 +503,10 @@
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_up(channel)) {
</span><span class="cx"> call_info_state = "idle";
</span><ins>+ } else if (!strcasecmp(status, "hold-private")) {
+ call_info_state = "held-private";
</ins><span class="cx"> } else if (!strcasecmp(status, "hold")) {
</span><span class="cx"> call_info_state = "held";
</span><del>- } else if (!strcasecmp(status, "hold-private")) {
- call_info_state = "held-private";
</del><span class="cx"> } else if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
</span><span class="cx"> if (channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND) {
</span><span class="cx"> call_info_state = "progressing";
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_timec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_time.c (16314 => 16315)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_time.c 2010-01-14 21:31:40 UTC (rev 16314)
+++ freeswitch/trunk/src/switch_time.c 2010-01-15 00:31:43 UTC (rev 16315)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> if (ts.tv_nsec / 1000 > 1500) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</span><span class="cx"> "Timer resolution of %ld microseconds detected!\n"
</span><del>- "Do you have your kernel timer set to higher than 1khz? You may experience audio problems.\n", ts.tv_nsec / 1000);
</del><ins>+ "Do you have your kernel timer set to higher than 1 kHz? You may experience audio problems.\n", ts.tv_nsec / 1000);
</ins><span class="cx"> do_sleep(5000000);
</span><span class="cx"> switch_time_set_cond_yield(SWITCH_TRUE);
</span><span class="cx"> return;
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> if (diff > 1500) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</span><span class="cx"> "Abnormally large timer gap %d detected!\n"
</span><del>- "Do you have your kernel timer set to higher than 1khz? You may experience audio problems.\n", diff);
</del><ins>+ "Do you have your kernel timer set to higher than 1 kHz? You may experience audio problems.\n", diff);
</ins><span class="cx"> do_sleep(5000000);
</span><span class="cx"> switch_time_set_cond_yield(SWITCH_TRUE);
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>