<!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][15373] </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=15373">15373</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-05 11:22:15 -0600 (Thu, 05 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix some win32 issues in sofia </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_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.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_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15372 => 15373)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-05 13:41:11 UTC (rev 15372)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-11-05 17:22:15 UTC (rev 15373)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> callee_name, callee_number, callee_name, callee_number);
</span><span class="cx"> } else {
</span><span class="cx"> pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>\n",
</span><del>- callee_name, callee_number, callee_name, callee_number);
</del><ins>+ callee_name, callee_number);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return pai;
</span><span class="lines">@@ -2958,9 +2958,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((host = switch_core_session_strdup(nsession, tech_pvt->dest))) {
</span><del>- char *p = strchr(host, '@');
- if (p) {
- host = p+1;
</del><ins>+ char *pp = strchr(host, '@');
+ if (pp) {
+ host = pp+1;
</ins><span class="cx"> } else {
</span><span class="cx"> host = NULL;
</span><span class="cx"> dest_to = NULL;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15372 => 15373)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-05 13:41:11 UTC (rev 15372)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-11-05 17:22:15 UTC (rev 15373)
</span><span class="lines">@@ -2855,7 +2855,7 @@
</span><span class="cx"> } else if (!strcasecmp(var, "challenge-realm")) {
</span><span class="cx"> profile->challenge_realm = switch_core_strdup(profile->pool, val);
</span><span class="cx"> } else if (!strcasecmp(var, "dtmf-duration")) {
</span><del>- int dur = atoi(val);
</del><ins>+ uint32_t dur = atoi(val);
</ins><span class="cx"> if (dur > switch_core_min_dtmf_duration(0) && dur < switch_core_max_dtmf_duration(0)) {
</span><span class="cx"> profile->dtmf_duration = dur;
</span><span class="cx"> } else {
</span><span class="lines">@@ -4030,8 +4030,8 @@
</span><span class="cx">
</span><span class="cx"> if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RTP Error!\n");
</span><ins>+ switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</ins><span class="cx"> goto done;
</span><del>- switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</del><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Processing updated SDP\n");
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_presencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (15372 => 15373)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2009-11-05 13:41:11 UTC (rev 15372)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 2009-11-05 17:22:15 UTC (rev 15373)
</span><span class="lines">@@ -1660,6 +1660,7 @@
</span><span class="cx">
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> sql = switch_mprintf("insert into sip_subscriptions "
</span><span class="cx"> "(proto,sip_user,sip_host,sub_to_user,sub_to_host,presence_hosts,event,contact,call_id,full_from,"
</span><span class="cx"> "full_via,expires,user_agent,accept,profile_name,hostname,network_port,network_ip) "
</span><span class="lines">@@ -1667,7 +1668,7 @@
</span><span class="cx"> proto, from_user, from_host, to_user, to_host, profile->presence_hosts ? profile->presence_hosts : to_host,
</span><span class="cx"> event, contact_str, call_id, full_from, full_via,
</span><span class="cx"> //sofia_test_pflag(profile, PFLAG_MULTIREG) ? switch_epoch_time_now(NULL) + exp_delta : exp_delta * -1,
</span><del>- switch_epoch_time_now(NULL) + exp_delta,
</del><ins>+ (long)switch_epoch_time_now(NULL) + exp_delta,
</ins><span class="cx"> full_agent, accept, profile->name,mod_sofia_globals.hostname, network_port, network_ip);
</span><span class="cx">
</span><span class="cx"> if (mod_sofia_globals.debug_presence > 0) {
</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 (15372 => 15373)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-05 13:41:11 UTC (rev 15372)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-11-05 17:22:15 UTC (rev 15373)
</span><span class="lines">@@ -2068,7 +2068,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (nc && cnonce && qop) {
</span><del>- char *sql;
</del><span class="cx">
</span><span class="cx"> #if defined(_WIN32) && !defined(_WIN64)
</span><span class="cx"> #define LL_FMT "ll"
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>