<!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][17095] </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=17095">17095</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-24 19:27:20 -0500 (Wed, 24 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fixing patch</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>
<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 (17094 => 17095)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-03-25 00:27:20 UTC (rev 17095)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> #define sofia_glue_profile_rdlock(x) sofia_glue_profile_rdlock__(__FILE__, __SWITCH_FUNC__, __LINE__, x)
</span><span class="cx"> switch_status_t sofia_glue_profile_rdlock__(const char *file, const char *func, int line, sofia_profile_t *profile);
</span><span class="cx">
</span><del>-switch_status_t sofia_reg_add_gateway(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway);
</del><ins>+switch_status_t sofia_reg_add_gateway(const char *profile_name, const char *key, sofia_gateway_t *gateway);
</ins><span class="cx"> sofia_gateway_t *sofia_reg_find_gateway__(const char *file, const char *func, int line, const char *key);
</span><span class="cx"> #define sofia_reg_find_gateway(x) sofia_reg_find_gateway__(__FILE__, __SWITCH_FUNC__, __LINE__, x)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (17094 => 17095)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-03-25 00:27:20 UTC (rev 17095)
</span><span class="lines">@@ -2023,9 +2023,9 @@
</span><span class="cx"> gateway->freq = 3600;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
- sofia_reg_add_gateway(profile, gateway->name, gateway);
-
</del><ins>+ gateway->next = profile->gateways;
+ profile->gateways = gateway;
+ sofia_reg_add_gateway(profile->name, gateway->name, gateway);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> skip:
</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 (17094 => 17095)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-03-25 00:27:20 UTC (rev 17095)
</span><span class="lines">@@ -4529,10 +4529,6 @@
</span><span class="cx"> "create index ssd_contact_str on sip_shared_appearance_dialogs (contact_str)",
</span><span class="cx"> "create index ssd_call_id on sip_shared_appearance_dialogs (call_id)",
</span><span class="cx"> "create index ssd_expires on sip_shared_appearance_dialogs (expires)",
</span><del>- "create index sr_1 on sip_recovery (runtime_uuid)",
- "create index sr_2 on sip_recovery (profile_name)",
- "create index sr_3 on sip_recovery (hostname)",
- "create index sr_4 on sip_recovery (uuid)",
</del><span class="cx"> NULL
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -4751,12 +4747,6 @@
</span><span class="cx">
</span><span class="cx"> switch_core_db_exec(db, "create index if not exists sa_nonce on sip_authentication (nonce)", NULL, NULL, NULL);
</span><span class="cx"> switch_core_db_exec(db, "create index if not exists sa_hostname on sip_authentication (hostname)", NULL, NULL, NULL);
</span><del>-
- switch_core_db_exec(db, "create index sr_1 on sip_recovery (runtime_uuid)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_2 on sip_recovery (profile_name)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_3 on sip_recovery (hostname)", NULL, NULL, NULL);
- switch_core_db_exec(db, "create index sr_4 on sip_recovery (uuid)", NULL, NULL, NULL);
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (odbc_dbh) {
</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 (17094 => 17095)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-03-25 00:24:45 UTC (rev 17094)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-03-25 00:27:20 UTC (rev 17095)
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx"> void sofia_reg_unregister(sofia_profile_t *profile)
</span><span class="cx"> {
</span><span class="cx"> sofia_gateway_t *gateway_ptr;
</span><del>- switch_mutex_lock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
</span><span class="cx">
</span><span class="cx"> if (gateway_ptr->sofia_private) {
</span><span class="lines">@@ -121,7 +120,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>- switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void sofia_sub_check_gateway(sofia_profile_t *profile, time_t now)
</span><span class="lines">@@ -133,7 +131,6 @@
</span><span class="cx"> */
</span><span class="cx"> sofia_gateway_t *gateway_ptr;
</span><span class="cx">
</span><del>- switch_mutex_lock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
</span><span class="cx"> sofia_gateway_subscription_t *gw_sub_ptr;
</span><span class="cx">
</span><span class="lines">@@ -220,7 +217,6 @@
</span><span class="cx"> switch_safe_free(user_via);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
</span><span class="lines">@@ -229,7 +225,6 @@
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> char *pkey;
</span><span class="cx">
</span><del>- switch_mutex_lock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) {
</span><span class="cx"> if (gateway_ptr->deleted && gateway_ptr->state == REG_STATE_NOREG) {
</span><span class="cx"> if (last) {
</span><span class="lines">@@ -408,7 +403,6 @@
</span><span class="cx"> sofia_reg_fire_custom_gateway_state_event(gateway_ptr, 0, NULL);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2425,20 +2419,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t sofia_reg_add_gateway(sofia_profile_t *profile, const char *key, sofia_gateway_t *gateway)
</del><ins>+switch_status_t sofia_reg_add_gateway(const char *profile_name, const char *key, sofia_gateway_t *gateway)
</ins><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><del>- char *pkey = switch_mprintf("%s::%s", profile->name, key);
</del><ins>+ char *pkey = switch_mprintf("%s::%s", profile_name, key);
</ins><span class="cx">
</span><span class="cx"> switch_mutex_lock(mod_sofia_globals.hash_mutex);
</span><del>-
- gateway->next = profile->gateways;
- profile->gateways = gateway;
-
</del><span class="cx"> if (!switch_core_hash_find(mod_sofia_globals.gateway_hash, key)) {
</span><span class="cx"> status = switch_core_hash_insert(mod_sofia_globals.gateway_hash, key, gateway);
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> if (!switch_core_hash_find(mod_sofia_globals.gateway_hash, pkey)) {
</span><span class="cx"> status = switch_core_hash_insert(mod_sofia_globals.gateway_hash, pkey, gateway);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>