<!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][14353] </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=14353">14353</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-24 14:34:32 -0500 (Fri, 24 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_sofia: Optionally rewrite fs_path element of sip contact string on multicasted registrations (<a href="http://jira.freeswitch.org/browse/MODENDP-231">MODENDP-231</a>)</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>
</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 (14352 => 14353)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-07-24 18:20:37 UTC (rev 14352)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-07-24 19:34:32 UTC (rev 14353)
</span><span class="lines">@@ -274,6 +274,7 @@
</span><span class="cx"> int auto_restart;
</span><span class="cx"> int auto_nat;
</span><span class="cx"> int tracelevel;
</span><ins>+ int rewrite_multicasted_fs_path;
</ins><span class="cx"> };
</span><span class="cx"> extern struct mod_sofia_globals mod_sofia_globals;
</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 (14352 => 14353)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-07-24 18:20:37 UTC (rev 14352)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-07-24 19:34:32 UTC (rev 14353)
</span><span class="lines">@@ -623,6 +623,7 @@
</span><span class="cx"> if ((subclass = switch_event_get_header(event, "orig-event-subclass")) && !strcasecmp(subclass, MY_EVENT_REGISTER)) {
</span><span class="cx"> char *from_user = switch_event_get_header(event, "orig-from-user");
</span><span class="cx"> char *from_host = switch_event_get_header(event, "orig-from-host");
</span><ins>+ char *to_host = switch_event_get_header(event, "orig-to-host");
</ins><span class="cx"> char *contact_str = switch_event_get_header(event, "orig-contact");
</span><span class="cx"> char *exp_str = switch_event_get_header(event, "orig-expires");
</span><span class="cx"> char *rpid = switch_event_get_header(event, "orig-rpid");
</span><span class="lines">@@ -636,8 +637,8 @@
</span><span class="cx"> char *network_port = switch_event_get_header(event, "orig-network-port");
</span><span class="cx"> char *username = switch_event_get_header(event, "orig-username");
</span><span class="cx"> char *realm = switch_event_get_header(event, "orig-realm");
</span><ins>+ char *fixed_contact_str = NULL;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> sofia_profile_t *profile = NULL;
</span><span class="cx">
</span><span class="cx"> char guess_ip4[256];
</span><span class="lines">@@ -660,6 +661,29 @@
</span><span class="cx"> sql = switch_mprintf("delete from sip_registrations where sip_user='%q' and sip_host='%q'", from_user, from_host);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (mod_sofia_globals.rewrite_multicasted_fs_path && contact_str) {
+ const char *needle = ";fs_path=";
+ char *sptr, *eptr = NULL;
+ /* allocate enough room for worst-case scenario */
+ size_t len = strlen(contact_str) + strlen(to_host) + 14;
+ fixed_contact_str = malloc(len);
+ switch_assert(fixed_contact_str);
+ switch_copy_string(fixed_contact_str, contact_str, len);
+
+ if ((sptr = strstr(fixed_contact_str, needle))) {
+ if (!(eptr = strchr(fixed_contact_str, ';'))) {
+ eptr = strrchr(fixed_contact_str, '>');
+ }
+ } else {
+ sptr = strchr(fixed_contact_str, '\0') - 1;
+ }
+
+ switch_snprintf(sptr, len - (sptr - fixed_contact_str), ";fs_path=sip:%s%s%s", to_host, eptr ? ";" : "", eptr ? eptr : ">");
+
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Rewrote contact string from '%s' to '%s'\n", contact_str, fixed_contact_str);
+ contact_str = fixed_contact_str;
+ }
+
</ins><span class="cx"> switch_mutex_lock(profile->ireg_mutex);
</span><span class="cx"> sofia_glue_execute_sql(profile, &sql, SWITCH_TRUE);
</span><span class="cx">
</span><span class="lines">@@ -677,10 +701,11 @@
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(profile->ireg_mutex);
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (profile) {
</span><span class="cx"> sofia_glue_release_profile(profile);
</span><span class="cx"> }
</span><ins>+
+ switch_safe_free(fixed_contact_str);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2035,6 +2060,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> mod_sofia_globals.auto_restart = SWITCH_TRUE;
</span><ins>+ mod_sofia_globals.rewrite_multicasted_fs_path = SWITCH_FALSE;
</ins><span class="cx">
</span><span class="cx"> if ((settings = switch_xml_child(cfg, "global_settings"))) {
</span><span class="cx"> for (param = switch_xml_child(settings, "param"); param; param = param->next) {
</span><span class="lines">@@ -2046,6 +2072,8 @@
</span><span class="cx"> mod_sofia_globals.debug_presence = atoi(val);
</span><span class="cx"> } else if (!strcasecmp(var, "auto-restart")) {
</span><span class="cx"> mod_sofia_globals.auto_restart = switch_true(val);
</span><ins>+ } else if (!strcasecmp(var, "rewrite-multicasted-fs-path")) {
+ mod_sofia_globals.rewrite_multicasted_fs_path = switch_true(val);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>