<!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][15334] </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=15334">15334</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-03 15:32:18 -0600 (Tue, 03 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add distinct-to=true|false to be used with from-domain when you don't want to change the to</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 (15333 => 15334)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-03 21:07:59 UTC (rev 15333)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 2009-11-03 21:32:18 UTC (rev 15334)
</span><span class="lines">@@ -206,7 +206,8 @@
</span><span class="cx"> typedef enum {
</span><span class="cx"> PFLAG_NDLB_TO_IN_200_CONTACT = (1 << 0),
</span><span class="cx"> PFLAG_NDLB_BROKEN_AUTH_HASH = (1 << 1),
</span><del>- PFLAG_NDLB_SENDRECV_IN_SESSION = (1 << 2)
</del><ins>+ PFLAG_NDLB_SENDRECV_IN_SESSION = (1 << 2),
+ PFLAG_NDLB_ALLOW_BAD_IANANAME = (1 << 3)
</ins><span class="cx"> } sofia_NDLB_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -387,6 +388,7 @@
</span><span class="cx"> int failures;
</span><span class="cx"> struct sofia_gateway *next;
</span><span class="cx"> sofia_gateway_subscription_t *subscriptions;
</span><ins>+ int distinct_to;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="lines">@@ -733,7 +735,7 @@
</span><span class="cx"> * \param codec_string The profile's codec string or NULL if inexistant
</span><span class="cx"> * \param sdp The parsed SDP content
</span><span class="cx"> */
</span><del>-void sofia_glue_set_r_sdp_codec_string(switch_channel_t *channel,const char *codec_string, sdp_session_t *sdp);
</del><ins>+void sofia_glue_set_r_sdp_codec_string(switch_core_session_t *session, const char *codec_string, sdp_session_t *sdp);
</ins><span class="cx"> switch_status_t sofia_glue_tech_media(private_object_t *tech_pvt, const char *r_sdp);
</span><span class="cx"> char *sofia_reg_find_reg_url(sofia_profile_t *profile, const char *user, const char *host, char *val, switch_size_t len);
</span><span class="cx"> void event_handler(switch_event_t *event);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15333 => 15334)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-03 21:07:59 UTC (rev 15333)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-03 21:32:18 UTC (rev 15334)
</span><span class="lines">@@ -1437,7 +1437,7 @@
</span><span class="cx"> if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) {
</span><span class="cx"> const char *sipip, *format;
</span><span class="cx"> switch_uuid_t uuid;
</span><del>- uint32_t ping_freq = 0, extension_in_contact = 0;
</del><ins>+ uint32_t ping_freq = 0, extension_in_contact = 0, distinct_to = 0;
</ins><span class="cx"> char *register_str = "true", *scheme = "Digest",
</span><span class="cx"> *realm = NULL,
</span><span class="cx"> *username = NULL,
</span><span class="lines">@@ -1559,6 +1559,8 @@
</span><span class="cx"> register_proxy = val;
</span><span class="cx"> } else if (!strcmp(var, "outbound-proxy")) {
</span><span class="cx"> outbound_proxy = val;
</span><ins>+ } else if (!strcmp(var, "distinct-to")) {
+ distinct_to = switch_true(val);
</ins><span class="cx"> } else if (!strcmp(var, "contact-params")) {
</span><span class="cx"> contact_params = val;
</span><span class="cx"> } else if (!strcmp(var, "register-transport")) {
</span><span class="lines">@@ -1655,6 +1657,7 @@
</span><span class="cx"> gateway->register_username = switch_core_strdup(gateway->pool, username);
</span><span class="cx"> gateway->auth_username = switch_core_strdup(gateway->pool, auth_username);
</span><span class="cx"> gateway->register_password = switch_core_strdup(gateway->pool, password);
</span><ins>+ gateway->distinct_to = distinct_to;
</ins><span class="cx">
</span><span class="cx"> if (switch_true(caller_id_in_from)) {
</span><span class="cx"> sofia_set_flag(gateway, REG_FLAG_CALLERID);
</span><span class="lines">@@ -1930,6 +1933,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> sofia_clear_pflag(profile, PFLAG_RECIEVED_IN_NAT_REG_CONTACT);
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "NDLB-allow-bad-iananame")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_NDLB_ALLOW_BAD_IANANAME);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_NDLB_ALLOW_BAD_IANANAME);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "aggressive-nat-detection")) {
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION);
</span><span class="lines">@@ -2673,6 +2682,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> profile->ndlb &= ~PFLAG_NDLB_SENDRECV_IN_SESSION;
</span><span class="cx"> }
</span><ins>+ } else if (!strcasecmp(var, "NDLB-allow-bad-iananame")) {
+ if (switch_true(val)) {
+ sofia_set_pflag(profile, PFLAG_NDLB_ALLOW_BAD_IANANAME);
+ } else {
+ sofia_clear_pflag(profile, PFLAG_NDLB_ALLOW_BAD_IANANAME);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "pass-rfc2833")) {
</span><span class="cx"> if (switch_true(val)) {
</span><span class="cx"> sofia_set_pflag(profile, PFLAG_PASS_RFC2833);
</span><span class="lines">@@ -3604,7 +3619,7 @@
</span><span class="cx">
</span><span class="cx"> if (sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && (parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) {
</span><span class="cx"> if ((sdp = sdp_session(parser))) {
</span><del>- sofia_glue_set_r_sdp_codec_string(channel, (tech_pvt->profile?tech_pvt->profile->codec_string:NULL), sdp);
</del><ins>+ sofia_glue_set_r_sdp_codec_string(session, (tech_pvt->profile?tech_pvt->profile->codec_string:NULL), sdp);
</ins><span class="cx"> }
</span><span class="cx"> sdp_parser_free(parser);
</span><span class="cx"> }
</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 (15333 => 15334)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-03 21:07:59 UTC (rev 15333)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-11-03 21:32:18 UTC (rev 15334)
</span><span class="lines">@@ -2591,7 +2591,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void sofia_glue_set_r_sdp_codec_string(switch_channel_t *channel,const char *codec_string, sdp_session_t *sdp)
</del><ins>+void sofia_glue_set_r_sdp_codec_string(switch_core_session_t *session, const char *codec_string, sdp_session_t *sdp)
</ins><span class="cx"> {
</span><span class="cx"> char buf[1024] = {0};
</span><span class="cx"> sdp_media_t *m;
</span><span class="lines">@@ -2605,6 +2605,8 @@
</span><span class="cx"> int num_codecs = 0;
</span><span class="cx"> char *codec_order[SWITCH_MAX_CODECS];
</span><span class="cx"> const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS] = { 0 };
</span><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_object_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><span class="cx"> if (!zstr(codec_string)) {
</span><span class="cx"> char *tmp_codec_string;
</span><span class="lines">@@ -2666,7 +2668,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (map->rm_pt < 96) {
</del><ins>+ if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</ins><span class="cx"> match = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="cx"> } else {
</span><span class="cx"> if (map->rm_encoding) {
</span><span class="lines">@@ -2707,7 +2709,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (map->rm_pt < 96) {
</del><ins>+ if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</ins><span class="cx"> match = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="cx"> } else {
</span><span class="cx"> if(map->rm_encoding) {
</span><span class="lines">@@ -3075,7 +3077,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (map = m->m_rtpmaps; map; map = map->rm_next) {
</span><del>- if (zstr(map->rm_encoding) && map->rm_pt < 96) {
</del><ins>+ if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</ins><span class="cx"> match = (map->rm_pt == tech_pvt->pt) ? 1 : 0;
</span><span class="cx"> } else {
</span><span class="cx"> match = strcasecmp(switch_str_nil(map->rm_encoding), tech_pvt->iananame) ? 0 : 1;
</span><span class="lines">@@ -3160,7 +3162,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u:%d]/[%s:%d:%u:%d]\n",
</span><span class="cx"> rm_encoding, map->rm_pt, (int) map->rm_rate, ptime,
</span><span class="cx"> imp->iananame, imp->ianacode, codec_rate, imp->microseconds_per_packet / 1000);
</span><del>- if (zstr(map->rm_encoding) && map->rm_pt < 96) {
</del><ins>+ if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</ins><span class="cx"> match = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="cx"> } else {
</span><span class="cx"> match = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1;
</span><span class="lines">@@ -3294,7 +3296,7 @@
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Compare [%s:%d]/[%s:%d]\n",
</span><span class="cx"> rm_encoding, map->rm_pt, imp->iananame, imp->ianacode);
</span><del>- if (map->rm_pt < 96) {
</del><ins>+ if ((zstr(map->rm_encoding) || (tech_pvt->profile->ndlb & PFLAG_NDLB_ALLOW_BAD_IANANAME)) && map->rm_pt < 96) {
</ins><span class="cx"> vmatch = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span><span class="cx"> } else {
</span><span class="cx"> vmatch = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1;
</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 (15333 => 15334)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-03 21:07:59 UTC (rev 15333)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-03 21:32:18 UTC (rev 15334)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> NUTAG_URL(gateway_ptr->register_url),
</span><span class="cx"> TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)),
</span><span class="cx"> TAG_IF(user_via, SIPTAG_VIA_STR(user_via)),
</span><del>- SIPTAG_TO_STR(gateway_ptr->register_from),
</del><ins>+ SIPTAG_TO_STR(gateway_ptr->distinct_to ? gateway_ptr->register_from : gateway_ptr->register_to),
</ins><span class="cx"> SIPTAG_CONTACT_STR(gateway_ptr->register_contact),
</span><span class="cx"> SIPTAG_FROM_STR(gateway_ptr->register_from),
</span><span class="cx"> SIPTAG_EXPIRES_STR(gateway_ptr->expires_str),
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> NUTAG_URL(gateway_ptr->register_url),
</span><span class="cx"> TAG_IF(user_via, SIPTAG_VIA_STR(user_via)),
</span><span class="cx"> SIPTAG_FROM_STR(gateway_ptr->register_from),
</span><del>- SIPTAG_TO_STR(gateway_ptr->register_from),
</del><ins>+ SIPTAG_TO_STR(gateway_ptr->distinct_to ? gateway_ptr->register_from : gateway_ptr->register_to),
</ins><span class="cx"> SIPTAG_EXPIRES_STR(gateway_ptr->expires_str),
</span><span class="cx"> NUTAG_REGISTRAR(gateway_ptr->register_proxy),
</span><span class="cx"> NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL());
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>