<!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][15150] </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=15150">15150</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-13 15:28:45 -0500 (Tue, 13 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>working on 2 boxes at once ignore me</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_bridgec">freeswitch/trunk/src/switch_ivr_bridge.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/include/switch_core.h 2009-10-13 20:28:45 UTC (rev 15150)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> struct switch_app_log *next;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#define MESSAGE_STAMP_FFL(_m) _m->_file = __FILE__; _m->_func = __SWITCH_FUNC__; _m->_line = __LINE__
+
</ins><span class="cx"> #define MESSAGE_STRING_ARG_MAX 10
</span><span class="cx"> /*! \brief A message object designed to allow unlike technologies to exchange data */
</span><span class="cx"> struct switch_core_session_message {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-13 20:28:45 UTC (rev 15150)
</span><span class="lines">@@ -1295,8 +1295,8 @@
</span><span class="cx"> nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
</span><span class="cx"> SIPTAG_PAYLOAD_STR(message), TAG_END());
</span><del>- } else if ((ua && (switch_stristr("polycom", ua) || switch_stristr("FreeSWITCH", ua))) ||
- switch_stristr("UPDATE", tech_pvt->x_actually_support_remote)) {
</del><ins>+ } else if ((ua && (switch_stristr("polycom", ua) ||
+ switch_stristr("UPDATE", tech_pvt->x_actually_support_remote)))) {
</ins><span class="cx"> snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", name, number);
</span><span class="cx"> nua_update(tech_pvt->nh,
</span><span class="cx"> TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)),
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-13 20:28:45 UTC (rev 15150)
</span><span class="lines">@@ -404,6 +404,7 @@
</span><span class="cx"> switch_core_session_message_t *msg;
</span><span class="cx">
</span><span class="cx"> msg = switch_core_session_alloc(session_b, sizeof(*msg));
</span><ins>+ MESSAGE_STAMP_FFL(msg);
</ins><span class="cx"> msg->message_id = SWITCH_MESSAGE_INDICATE_DISPLAY;
</span><span class="cx"> msg->string_array_arg[0] = switch_core_session_strdup(session_b, name);
</span><span class="cx"> msg->string_array_arg[1] = switch_core_session_strdup(session_b, number);
</span><span class="lines">@@ -443,7 +444,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((tmp = switch_channel_get_variable(channel, "sip_callee_id_name"))) {
</span><span class="cx"> name = (char *)tmp;
</span><span class="cx"> }
</span><span class="lines">@@ -467,7 +468,7 @@
</span><span class="cx"> caller_profile = switch_channel_get_caller_profile(channel);
</span><span class="cx"> caller_profile->callee_id_name = switch_core_strdup(caller_profile->pool, name);
</span><span class="cx"> caller_profile->callee_id_number = switch_core_strdup(caller_profile->pool, number);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (send) {
</span><span class="cx"> sofia_send_callee_id(session, NULL, NULL);
</span><span class="cx"> }
</span><span class="lines">@@ -483,8 +484,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> sofia_update_callee_id(session, profile, sip, SWITCH_TRUE);
</span><ins>+ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/switch_core_session.c 2009-10-13 20:28:45 UTC (rev 15150)
</span><span class="lines">@@ -582,15 +582,24 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- message->_file = file;
- message->_func = func;
- message->_line = line;
</del><ins>+ if (!message->_file) {
+ message->_file = file;
+ }
</ins><span class="cx">
</span><ins>+ if (!message->_func) {
+ message->_func = func;
+ }
+
+ if (!message->_line) {
+ message->_line = line;
+ }
+
</ins><span class="cx"> if (message->message_id > SWITCH_MESSAGE_INVALID) {
</span><span class="cx"> message->message_id = SWITCH_MESSAGE_INVALID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, message->_file, message->_func, message->_line,
+ switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), message_names[message->message_id]);
</span><span class="cx">
</span><span class="cx"> if (session->endpoint_interface->io_routines->receive_message) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_bridgec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_bridge.c (15149 => 15150)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_bridge.c 2009-10-13 20:03:18 UTC (rev 15149)
+++ freeswitch/trunk/src/switch_ivr_bridge.c 2009-10-13 20:28:45 UTC (rev 15150)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> const char *silence_var, *var;
</span><span class="cx"> int silence_val = 0, bypass_media_after_bridge = 0;
</span><span class="cx"> const char *bridge_answer_timeout = NULL;
</span><del>- int answer_timeout, sent_update = -5;
</del><ins>+ int answer_timeout, sent_update = -50;
</ins><span class="cx"> time_t answer_limit = 0;
</span><span class="cx">
</span><span class="cx"> #ifdef SWITCH_VIDEO_IN_THREADS
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>