<!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][16698] </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=16698">16698</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-18 16:39:08 -0600 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add ability for multiple profiles to share the same gateway names via profile::gwname syntax for normT</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<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_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (16697 => 16698)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-02-18 21:55:46 UTC (rev 16697)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-02-18 22:39:08 UTC (rev 16698)
</span><span class="lines">@@ -1712,7 +1712,6 @@
</span><span class="cx"> stream->write_function(stream, "+OK module unloaded\n");
</span><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "-ERR unloading module [%s]\n", err);
</span><del>- return SWITCH_STATUS_SUCCESS;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_loadable_module_load_module((char *) SWITCH_GLOBAL_dirs.mod_dir, (char *) cmd, SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS) {
</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 (16697 => 16698)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-02-18 21:55:46 UTC (rev 16697)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-02-18 22:39:08 UTC (rev 16698)
</span><span class="lines">@@ -2282,7 +2282,7 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- stream->write_function(stream, "%25s\t%s\t %32s\t%s\n", "Name", " Type", "Data", "State");
</del><ins>+ stream->write_function(stream, "%25s\t%s\t %40s\t%s\n", "Name", " Type", "Data", "State");
</ins><span class="cx"> stream->write_function(stream, "%s\n", line);
</span><span class="cx"> switch_mutex_lock(mod_sofia_globals.hash_mutex);
</span><span class="cx"> for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
</span><span class="lines">@@ -2292,21 +2292,27 @@
</span><span class="cx">
</span><span class="cx"> if (strcmp(vvar, profile->name)) {
</span><span class="cx"> ac++;
</span><del>- stream->write_function(stream, "%25s\t%s\t %32s\t%s\n", vvar, " alias", profile->name, "ALIASED");
</del><ins>+ stream->write_function(stream, "%25s\t%s\t %40s\t%s\n", vvar, " alias", profile->name, "ALIASED");
</ins><span class="cx"> } else {
</span><del>- stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u)\n", profile->name, "profile", profile->url,
</del><ins>+ stream->write_function(stream, "%25s\t%s\t %40s\t%s (%u)\n", profile->name, "profile", profile->url,
</ins><span class="cx"> sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse);
</span><span class="cx">
</span><span class="cx"> if (sofia_test_pflag(profile, PFLAG_TLS)) {
</span><del>- stream->write_function(stream, "%25s\t%s\t %32s\t%s (%u) (TLS)\n", profile->name, "profile", profile->tls_url,
</del><ins>+ stream->write_function(stream, "%25s\t%s\t %40s\t%s (%u) (TLS)\n", profile->name, "profile", profile->tls_url,
</ins><span class="cx"> sofia_test_pflag(profile, PFLAG_RUNNING) ? "RUNNING" : "DOWN", profile->inuse);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> c++;
</span><span class="cx">
</span><span class="cx"> for (gp = profile->gateways; gp; gp = gp->next) {
</span><ins>+ char *pkey = switch_mprintf("%s::%s", profile->name, gp->name);
+
</ins><span class="cx"> switch_assert(gp->state < REG_STATE_LAST);
</span><del>- stream->write_function(stream, "%25s\t%s\t %32s\t%s", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]);
</del><ins>+
+ stream->write_function(stream, "%25s\t%s\t %40s\t%s",
+ pkey, "gateway", gp->register_to, sofia_state_names[gp->state]);
+ free(pkey);
+
</ins><span class="cx"> if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) {
</span><span class="cx"> time_t now = switch_epoch_time_now(NULL);
</span><span class="cx"> if (gp->retry > now) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiah"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (16697 => 16698)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-02-18 21:55:46 UTC (rev 16697)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2010-02-18 22:39:08 UTC (rev 16698)
</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(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 (16697 => 16698)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-02-18 21:55:46 UTC (rev 16697)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2010-02-18 22:39:08 UTC (rev 16698)
</span><span class="lines">@@ -1702,17 +1702,20 @@
</span><span class="cx"> for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) {
</span><span class="cx"> char *name = (char *) switch_xml_attr_soft(gateway_tag, "name");
</span><span class="cx"> sofia_gateway_t *gateway;
</span><ins>+ char *pkey = switch_mprintf("%s-%s", profile->name, name);
</ins><span class="cx">
</span><span class="cx"> if (zstr(name)) {
</span><span class="cx"> name = "anonymous";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(mod_sofia_globals.hash_mutex);
</span><del>- if ((gp = switch_core_hash_find(mod_sofia_globals.gateway_hash, name))) {
</del><ins>+ if ((gp = switch_core_hash_find(mod_sofia_globals.gateway_hash, name)) && (gp = switch_core_hash_find(mod_sofia_globals.gateway_hash, pkey))) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", name);
</span><span class="cx"> switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</span><ins>+ free(pkey);
</ins><span class="cx"> goto skip;
</span><span class="cx"> }
</span><ins>+ free(pkey);
</ins><span class="cx"> switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</span><span class="cx">
</span><span class="cx"> if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) {
</span><span class="lines">@@ -2009,7 +2012,7 @@
</span><span class="cx">
</span><span class="cx"> gateway->next = profile->gateways;
</span><span class="cx"> profile->gateways = gateway;
</span><del>- sofia_reg_add_gateway(gateway->name, gateway);
</del><ins>+ 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_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (16697 => 16698)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-02-18 21:55:46 UTC (rev 16697)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2010-02-18 22:39:08 UTC (rev 16698)
</span><span class="lines">@@ -223,6 +223,7 @@
</span><span class="cx"> {
</span><span class="cx"> sofia_gateway_t *gateway_ptr, *last = NULL;
</span><span class="cx"> switch_event_t *event;
</span><ins>+ char *pkey;
</ins><span class="cx">
</span><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="lines">@@ -231,10 +232,15 @@
</span><span class="cx"> } else {
</span><span class="cx"> profile->gateways = gateway_ptr->next;
</span><span class="cx"> }
</span><ins>+
+ pkey = switch_mprintf("%s::%s", profile->name, gateway_ptr->name);
</ins><span class="cx">
</span><ins>+ switch_snprintf(pkey, sizeof(pkey), "%s::%s", profile->name, gateway_ptr->name);
+ switch_core_hash_delete(mod_sofia_globals.gateway_hash, pkey);
</ins><span class="cx"> switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->name);
</span><del>- switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_from);
- switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_contact);
</del><ins>+
+ free(pkey);
+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleted gateway %s\n", gateway_ptr->name);
</span><span class="cx"> if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_GATEWAY_DEL) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "profile-name", gateway_ptr->profile->name);
</span><span class="lines">@@ -2414,16 +2420,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t sofia_reg_add_gateway(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><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><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><ins>+ if (!switch_core_hash_find(mod_sofia_globals.gateway_hash, pkey)) {
+ status = switch_core_hash_insert(mod_sofia_globals.gateway_hash, pkey, gateway);
+ }
</ins><span class="cx"> switch_mutex_unlock(mod_sofia_globals.hash_mutex);
</span><span class="cx">
</span><ins>+ free(pkey);
+
</ins><span class="cx"> if (status == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_t *s_event;
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Added gateway '%s' to profile '%s'\n", gateway->name, gateway->profile->name);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>