<!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][15763] </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=15763">15763</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-02 14:47:46 -0600 (Wed, 02 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>retry reg faster on dns timeouts</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_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.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 (15762 => 15763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h        2009-12-02 20:28:49 UTC (rev 15762)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h        2009-12-02 20:47:46 UTC (rev 15763)
</span><span class="lines">@@ -383,6 +383,7 @@
</span><span class="cx">         int ping_min;
</span><span class="cx">         uint8_t flags[REG_FLAG_MAX];
</span><span class="cx">         int32_t retry_seconds;
</span><ins>+        int32_t failure_status;
</ins><span class="cx">         reg_state_t state;
</span><span class="cx">         switch_memory_pool_t *pool;
</span><span class="cx">         int deleted;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (15762 => 15763)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c        2009-12-02 20:28:49 UTC (rev 15762)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c        2009-12-02 20:47:46 UTC (rev 15763)
</span><span class="lines">@@ -323,7 +323,8 @@
</span><span class="cx">                         break;
</span><span class="cx">                 case REG_STATE_UNREGED:
</span><span class="cx">                         gateway_ptr-&gt;status = SOFIA_GATEWAY_DOWN;
</span><del>-
</del><ins>+                        gateway_ptr-&gt;retry = 0;
+                        
</ins><span class="cx">                         if (!gateway_ptr-&gt;nh) sofia_reg_new_handle(gateway_ptr, now ? 1 : 0);
</span><span class="cx"> 
</span><span class="cx">                         if (sofia_glue_check_nat(gateway_ptr-&gt;profile, gateway_ptr-&gt;register_proxy)) {
</span><span class="lines">@@ -361,11 +362,24 @@
</span><span class="cx">                         break;
</span><span class="cx"> 
</span><span class="cx">                 case REG_STATE_FAILED:
</span><del>-                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, &quot;%s Failed Registration, setting retry to %d seconds.\n&quot;, 
-                                                                  gateway_ptr-&gt;name, gateway_ptr-&gt;retry_seconds * (gateway_ptr-&gt;failures + 1));
-                        gateway_ptr-&gt;retry =  now + (gateway_ptr-&gt;retry_seconds * (gateway_ptr-&gt;failures + 1));
-                        gateway_ptr-&gt;status = SOFIA_GATEWAY_DOWN;
-                        gateway_ptr-&gt;state = REG_STATE_FAIL_WAIT;
</del><ins>+                        {
+                                int sec;
+
+                                if (gateway_ptr-&gt;failure_status == 503) {
+                                        sec = now + gateway_ptr-&gt;retry_seconds;
+                                } else{
+                                        sec = gateway_ptr-&gt;retry_seconds * (gateway_ptr-&gt;failures + 1);
+                                }
+                                
+                                gateway_ptr-&gt;retry = sec;
+                                gateway_ptr-&gt;status = SOFIA_GATEWAY_DOWN;
+                                gateway_ptr-&gt;state = REG_STATE_FAIL_WAIT;
+                                gateway_ptr-&gt;failure_status = 0;
+
+                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, &quot;%s Failed Registration, setting retry to %d seconds.\n&quot;, 
+                                                                  gateway_ptr-&gt;name, sec);
+
+                        }
</ins><span class="cx">                         break;
</span><span class="cx">                 case REG_STATE_FAIL_WAIT:
</span><span class="cx">                         if (!gateway_ptr-&gt;retry || now &gt;= gateway_ptr-&gt;retry) {
</span><span class="lines">@@ -1440,6 +1454,7 @@
</span><span class="cx">                         break;
</span><span class="cx">                 default:
</span><span class="cx">                         sofia_private-&gt;gateway-&gt;state = REG_STATE_FAILED;
</span><ins>+                        sofia_private-&gt;gateway-&gt;failure_status = status;
</ins><span class="cx">                         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, &quot;%s Registration Failed with status %s [%d]. failure #%d\n&quot;, 
</span><span class="cx">                                                           sofia_private-&gt;gateway-&gt;name, switch_str_nil(phrase), status, ++sofia_private-&gt;gateway-&gt;failures);
</span><span class="cx">                         break;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>