<!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][15746] </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=15746">15746</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-01 16:42:18 -0600 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix sofia build when -std=c99</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuanua_registerc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasresolvsres_sipc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttportc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttport_tlsc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_sctpc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_tlsc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Mon Sep 21 14:27:58 CDT 2009
</del><ins>+Tue Dec 1 16:41:39 CST 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuanua_registerc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_register.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx"> tpn = tport_name(nr->nr_tport);
</span><span class="cx">
</span><span class="cx"> SU_DEBUG_5(("nua_register(%p): tport to %s/%s:%s%s%s closed %s\n",
</span><del>- du->du_dialog->ds_owner,
</del><ins>+ (void *)du->du_dialog->ds_owner,
</ins><span class="cx"> tpn->tpn_proto, tpn->tpn_host, tpn->tpn_port,
</span><span class="cx"> tpn->tpn_comp ? ";comp=" : "",
</span><span class="cx"> tpn->tpn_comp ? tpn->tpn_comp : "",
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasresolvsres_sipc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/sres_sip.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> sres_resolver_t *sres = srs->srs_resolver;
</span><span class="cx"> struct srs_step *step;
</span><span class="cx">
</span><del>- SU_DEBUG_5(("srs(%p): destroyed\n", _srs));
</del><ins>+ SU_DEBUG_5(("srs(%p): destroyed\n", (void *) (_srs)));
</ins><span class="cx">
</span><span class="cx"> srs->srs_resolver = NULL;
</span><span class="cx">
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> if (step->sp_otype != sres_type_srv)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SU_DEBUG_5(("srs(%p): graylisting %s:%u;transport=%s\n", target, step->sp_port, proto));
</del><ins>+ SU_DEBUG_5(("srs(%p): graylisting %s:%u;transport=%s\n", (void *) target, step->sp_port, proto));
</ins><span class="cx">
</span><span class="cx"> for (step = srs->srs_send; step; step = step->sp_next)
</span><span class="cx"> if (step->sp_otype == sres_type_srv && step->sp_priority > maxprio)
</span><span class="lines">@@ -1647,7 +1647,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SU_DEBUG_5(("srs(%p): %s result %s%s%s:%u;transport=%s\n",
</span><del>- srs, duplicate ? "duplicate" : "returning",
</del><ins>+ (void *)srs, duplicate ? "duplicate" : "returning",
</ins><span class="cx"> lb , numeric, rb, port,
</span><span class="cx"> sres_sip_transport_name(result->ai_protocol)));
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttportc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -2252,7 +2252,7 @@
</span><span class="cx"> if (tport_is_closed(self)) {
</span><span class="cx"> if (self->tp_refs == 0) {
</span><span class="cx"> SU_DEBUG_7(("tport(%p): set timer at %u ms because %s\n",
</span><del>- self, 0, "zap"));
</del><ins>+ (void *)self, 0, "zap"));
</ins><span class="cx"> su_timer_set_interval(self->tp_timer, timer, self, 0);
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="lines">@@ -2601,7 +2601,7 @@
</span><span class="cx"> /* Alloc a new transport object, then register socket events with it */
</span><span class="cx"> if ((self = tport_alloc_secondary(pri, s, 1, &reason)) == NULL) {
</span><span class="cx"> SU_DEBUG_3(("%s(%p): incoming secondary on "TPN_FORMAT
</span><del>- " failed. reason = %s\n", __func__, pri,
</del><ins>+ " failed. reason = %s\n", __func__, (void *)pri,
</ins><span class="cx"> TPN_ARGS(pri->pri_primary->tp_name), reason));
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttport_tlsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> cert = SSL_get_peer_certificate(tls->con);
</span><span class="cx"> if (!cert) {
</span><span class="cx"> SU_DEBUG_7(("%s(%p): Peer did not provide X.509 Certificate.\n",
</span><del>- __func__, self));
</del><ins>+ __func__, (void *) self));
</ins><span class="cx"> if (self->tp_accepted && tls->verify_incoming)
</span><span class="cx"> return X509_V_ERR_CERT_UNTRUSTED;
</span><span class="cx"> else if (!self->tp_accepted && tls->verify_outgoing)
</span><span class="lines">@@ -572,10 +572,10 @@
</span><span class="cx"> int i, len = su_strlst_len(tls->subjects);
</span><span class="cx"> for (i=0; i < len; i++)
</span><span class="cx"> SU_DEBUG_7(("%s(%p): Peer Certificate Subject %i: %s\n", \
</span><del>- __func__, self, i, su_strlst_item(tls->subjects, i)));
</del><ins>+ __func__, (void *)self, i, su_strlst_item(tls->subjects, i)));
</ins><span class="cx"> if (i == 0)
</span><span class="cx"> SU_DEBUG_7(("%s(%p): Peer Certificate provided no usable subjects.\n",
</span><del>- __func__, self));
</del><ins>+ __func__, (void *)self));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Verify incoming connections */
</span><span class="lines">@@ -599,7 +599,7 @@
</span><span class="cx"> return X509_V_OK;
</span><span class="cx"> }
</span><span class="cx"> SU_DEBUG_3(("%s(%p): Peer Subject Mismatch (incoming connection)\n", \
</span><del>- __func__, self));
</del><ins>+ __func__, (void *)self));
</ins><span class="cx">
</span><span class="cx"> return X509_V_ERR_CERT_UNTRUSTED;
</span><span class="cx"> }
</span><span class="lines">@@ -617,7 +617,7 @@
</span><span class="cx"> if (tport_subject_search(subject, tls->subjects))
</span><span class="cx"> return X509_V_OK; /* Subject match found in verified certificate chain */
</span><span class="cx"> SU_DEBUG_3(("%s(%p): Peer Subject Mismatch (%s)\n", \
</span><del>- __func__, self, subject));
</del><ins>+ __func__, (void *)self, subject));
</ins><span class="cx">
</span><span class="cx"> return X509_V_ERR_CERT_UNTRUSTED;
</span><span class="cx"> }
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">
</span><span class="cx"> if ((tls = tlstp->tlstp_context) == NULL) {
</span><span class="cx"> SU_DEBUG_3(("%s(%p): Error: no TLS context data for connected socket.\n",
</span><del>- __func__, tlstp));
</del><ins>+ __func__, (void *)tlstp));
</ins><span class="cx"> tport_close(self);
</span><span class="cx"> tport_set_secondary_timer(self);
</span><span class="cx"> return 0;
</span><span class="lines">@@ -922,7 +922,7 @@
</span><span class="cx"> char errbuf[64];
</span><span class="cx"> ERR_error_string_n(status, errbuf, 64);
</span><span class="cx"> SU_DEBUG_3(("%s(%p): TLS setup failed (%s)\n",
</span><del>- __func__, self, errbuf));
</del><ins>+ __func__, (void *)self, errbuf));
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_sctpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -325,4 +325,7 @@
</span><span class="cx"> tport_base_timer(self, now);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#else
+/* ISO c99 forbids empty source file */
+void *sofia_tport_type_sctp_dummy;
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuatporttport_type_tlsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c (15745 => 15746)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c 2009-12-01 22:19:07 UTC (rev 15745)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c 2009-12-01 22:42:18 UTC (rev 15746)
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> /* Alloc a new transport object, then register socket events with it */
</span><span class="cx"> if ((self = tport_alloc_secondary(pri, s, 1, &reason)) == NULL) {
</span><span class="cx"> SU_DEBUG_3(("%s(%p): incoming secondary on "TPN_FORMAT
</span><del>- " failed. reason = %s\n", __func__, pri,
</del><ins>+ " failed. reason = %s\n", __func__, (void *)pri,
</ins><span class="cx"> TPN_ARGS(pri->pri_primary->tp_name), reason));
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -594,7 +594,7 @@
</span><span class="cx"> self->tp_is_connected = 0;
</span><span class="cx">
</span><span class="cx"> SU_DEBUG_5(("%s(%p): new connection from " TPN_FORMAT "\n",
</span><del>- __func__, (void *)self, TPN_ARGS(self->tp_name)));
</del><ins>+ __func__, (void *)self, TPN_ARGS(self->tp_name)));
</ins><span class="cx">
</span><span class="cx"> /* Return succesfully */
</span><span class="cx"> return 0;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>