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