<!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][16474] </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=16474">16474</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-22 21:59:01 -0600 (Fri, 22 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>tweak</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (16473 => 16474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-01-22 23:37:50 UTC (rev 16473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2010-01-23 03:59:01 UTC (rev 16474)
</span><span class="lines">@@ -1403,40 +1403,41 @@
</span><span class="cx">
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_MEDIA:
</span><span class="cx"> {
</span><del>- uint32_t send_invite = 1;
</del><ins>+ uint32_t send_invite = 1;
</ins><span class="cx">
</span><ins>+ switch_channel_clear_flag(channel, CF_PROXY_MODE);
</ins><span class="cx"> sofia_glue_tech_set_local_sdp(tech_pvt, NULL, SWITCH_FALSE);
</span><span class="cx">
</span><del>- if (!(switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA))) {
- if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) {
- const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);
- tech_pvt->num_codecs = 0;
</del><ins>+ if (!(switch_channel_test_flag(channel, CF_ANSWERED) || switch_channel_test_flag(channel, CF_EARLY_MEDIA))) {
+ if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) {
+ const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);
+
+ tech_pvt->num_codecs = 0;
</ins><span class="cx"> sofia_glue_tech_prepare_codecs(tech_pvt);
</span><del>- if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR");
</span><del>- status = SWITCH_STATUS_FALSE;
- goto end_lock;
- }
- send_invite = 0;
- }
- }
</del><ins>+ status = SWITCH_STATUS_FALSE;
+ goto end_lock;
+ }
+ send_invite = 0;
+ }
+ }
</ins><span class="cx">
</span><del>- if (!switch_rtp_ready(tech_pvt->rtp_session)) {
</del><ins>+ if (!switch_rtp_ready(tech_pvt->rtp_session)) {
</ins><span class="cx"> sofia_glue_tech_prepare_codecs(tech_pvt);
</span><del>- if ((status = sofia_glue_tech_choose_port(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if ((status = sofia_glue_tech_choose_port(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><del>- goto end_lock;
- }
- }
</del><ins>+ goto end_lock;
+ }
+ }
</ins><span class="cx"> sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1);
</span><span class="cx">
</span><del>- if (send_invite) {
</del><ins>+ if (send_invite) {
</ins><span class="cx"> switch_channel_set_flag(channel, CF_REQ_MEDIA);
</span><del>- switch_channel_clear_flag(channel, CF_PROXY_MODE);
</del><span class="cx"> sofia_glue_do_invite(session);
</span><del>- }
- }
- break;
</del><ins>+ }
+ }
+ break;
</ins><span class="cx">
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_SIMPLIFY:
</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 (16473 => 16474)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-22 23:37:50 UTC (rev 16473)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2010-01-23 03:59:01 UTC (rev 16474)
</span><span class="lines">@@ -51,12 +51,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!ip) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s NO IP!\n", switch_channel_get_name(tech_pvt->channel));
+ return;
+ }
+
</ins><span class="cx"> if (!port) {
</span><span class="cx"> if (!(port = tech_pvt->adv_sdp_audio_port)) {
</span><span class="cx"> port = tech_pvt->proxy_sdp_audio_port;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!port) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s NO PORT!\n", switch_channel_get_name(tech_pvt->channel));
+ return;
+ }
+
</ins><span class="cx"> if (!tech_pvt->owner_id) {
</span><span class="cx"> tech_pvt->owner_id = (uint32_t) switch_epoch_time_now(NULL) - port;
</span><span class="cx"> }
</span><span class="lines">@@ -141,12 +151,23 @@
</span><span class="cx"> ip = tech_pvt->proxy_sdp_audio_ip;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (!ip) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s NO IP!\n", switch_channel_get_name(tech_pvt->channel));
+ return;
+ }
+
</ins><span class="cx"> if (!port) {
</span><span class="cx"> if (!(port = tech_pvt->adv_sdp_audio_port)) {
</span><span class="cx"> port = tech_pvt->proxy_sdp_audio_port;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!port) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s NO PORT!\n", switch_channel_get_name(tech_pvt->channel));
+ return;
+ }
+
</ins><span class="cx"> if (!sr) {
</span><span class="cx"> sr = "sendrecv";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>