<!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][14319] </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=14319">14319</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-22 14:14:47 -0500 (Wed, 22 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODSOFIA-18">MODSOFIA-18</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeprivateswitch_core_pvth">freeswitch/trunk/src/include/private/switch_core_pvt.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_aprh">freeswitch/trunk/src/include/switch_apr.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_state_machinec">freeswitch/trunk/src/switch_core_state_machine.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeprivateswitch_core_pvth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h (14318 => 14319)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/private/switch_core_pvt.h        2009-07-22 18:44:16 UTC (rev 14318)
+++ freeswitch/trunk/src/include/private/switch_core_pvt.h        2009-07-22 19:14:47 UTC (rev 14319)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">         void *streams[SWITCH_MAX_STREAMS];
</span><span class="cx">         int stream_count;
</span><span class="cx">
</span><del>-        char uuid_str[128];
</del><ins>+        char uuid_str[SWITCH_UUID_FORMATTED_LENGTH+1];
</ins><span class="cx">         void *private_info;
</span><span class="cx">         switch_queue_t *event_queue;
</span><span class="cx">         switch_queue_t *message_queue;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_aprh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_apr.h (14318 => 14319)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_apr.h        2009-07-22 18:44:16 UTC (rev 14318)
+++ freeswitch/trunk/src/include/switch_apr.h        2009-07-22 19:14:47 UTC (rev 14319)
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx">          } switch_uuid_t;
</span><span class="cx">
</span><span class="cx"> /** UUIDs are formatted as: 00112233-4455-6677-8899-AABBCCDDEEFF */
</span><del>-#define SWITCH_UUID_FORMATTED_LENGTH 36
</del><ins>+#define SWITCH_UUID_FORMATTED_LENGTH 256
</ins><span class="cx">
</span><span class="cx"> #define SWITCH_MD5_DIGESTSIZE 16
</span><span class="cx"> #define SWITCH_MD5_DIGEST_STRING_SIZE 33
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (14318 => 14319)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c        2009-07-22 18:44:16 UTC (rev 14318)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c        2009-07-22 19:14:47 UTC (rev 14319)
</span><span class="lines">@@ -416,25 +416,22 @@
</span><span class="cx">                                         tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id);
</span><span class="cx">                                         switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id);
</span><span class="cx">                                 }
</span><ins>+
</ins><span class="cx">                                 if (tech_pvt->gateway_name) {
</span><span class="cx">                                         gateway = sofia_reg_find_gateway(tech_pvt->gateway_name);
</span><span class="cx">                                 }
</span><ins>+
+                                if (channel && switch_channel_down(channel)) {
+                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n");
+                                        goto done;
+                                }
</ins><span class="cx">                         } else {
</span><del>-                                /* too late */
</del><ins>+                                /* we can't find the session it must be hanging up or something else, its too late to do anything with it. */
</ins><span class="cx">                                 return;
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">         }
</span><span class="cx">
</span><del>-        if (session) {
-                if (channel && switch_channel_down(channel)) {
-                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n");
-                        goto done;
-                }
-        } else if (sofia_private && sofia_private->is_call) {
-                sofia_private->destroy_me = 22;
-        }
-
</del><span class="cx">         if (sofia_test_pflag(profile, PFLAG_AUTH_ALL) && tech_pvt && tech_pvt->key && sip) {
</span><span class="cx">                 sip_authorization_t const *authorization = NULL;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_state_machinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_state_machine.c (14318 => 14319)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_state_machine.c        2009-07-22 18:44:16 UTC (rev 14318)
+++ freeswitch/trunk/src/switch_core_state_machine.c        2009-07-22 19:14:47 UTC (rev 14319)
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx">         switch_thread_id_t thread_id;
</span><span class="cx">         jmp_buf env;
</span><span class="cx">         int sig, silly = 0;
</span><del>-        uint32_t new_loops = 60000000;
</del><ins>+        uint32_t new_loops = 60000;
</ins><span class="cx">
</span><span class="cx">         if (switch_test_flag((&runtime), SCF_CRASH_PROT)) {
</span><span class="cx">                 thread_id = switch_thread_self();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>