Mercurial > hg > freeDiameter
changeset 1084:6b7966ea27fb
Fix a few compilation issues
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Fri, 03 May 2013 15:33:57 +0800 |
| parents | d0017c5dde61 |
| children | 7d7266115a34 |
| files | libfdcore/cnxctx.c libfdcore/p_out.c libfdproto/messages.c libfdproto/utils.c |
| diffstat | 4 files changed, 3 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/libfdcore/cnxctx.c Fri May 03 15:23:11 2013 +0800 +++ b/libfdcore/cnxctx.c Fri May 03 15:33:57 2013 +0800 @@ -922,14 +922,6 @@ /* The function that receives TLS data and re-builds a Diameter message -- it exits only on error or cancelation */ int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session) { -#ifndef DISABLE_SCTP - void * ptr = gnutls_transport_get_ptr(session); - if (ptr != conn) { - struct sctps_ctx * ctx = (struct sctps_ctx *) ptr; - } -#endif /* DISABLE_SCTP */ - - /* No guarantee that GnuTLS preserves the message boundaries, so we re-build it as in TCP */ do { uint8_t header[4];
--- a/libfdcore/p_out.c Fri May 03 15:23:11 2013 +0800 +++ b/libfdcore/p_out.c Fri May 03 15:33:57 2013 +0800 @@ -44,7 +44,6 @@ size_t sz; int ret; uint32_t bkp_hbh = 0; - struct msg * cpy_for_logs_only; TRACE_ENTRY("%p %x %p %p %p", msg, flags, cnx, hbh, srl); @@ -64,7 +63,7 @@ CHECK_FCT(fd_msg_bufferize( *msg, &buf, &sz )); pthread_cleanup_push( free, buf ); - cpy_for_logs_only = *msg; + // cpy_for_logs_only = *msg; /* Save a request before sending so that there is no race condition with the answer */ if (msg_is_a_req) {
--- a/libfdproto/messages.c Fri May 03 15:23:11 2013 +0800 +++ b/libfdproto/messages.c Fri May 03 15:33:57 2013 +0800 @@ -720,9 +720,6 @@ static int obj_dump_msg (struct msg * msg, int indent, char **outstr, size_t *offset, size_t *outlen ) { int ret = 0; - char buftime[256]; - size_t tsoffset = 0; - struct tm tm; CHECK_FCT( dump_add_str(outstr, offset, outlen, "%*sMSG: %p|", INOBJHDRVAL, msg) );
--- a/libfdproto/utils.c Fri May 03 15:23:11 2013 +0800 +++ b/libfdproto/utils.c Fri May 03 15:33:57 2013 +0800 @@ -43,7 +43,7 @@ if (rc) snprintf(buf, bufsize, "%s", gai_strerror(rc)); else - snprintf(buf, bufsize, "%s", &__addrbuf[0]); + snprintf(buf, bufsize, "%s", &addrbuf[0]); } else { snprintf(buf, bufsize, "(NULL / ANY)"); } @@ -59,7 +59,7 @@ if (rc) snprintf(buf, bufsize, "%s", gai_strerror(rc)); else - snprintf(buf, bufsize, "%s", &__addrbuf[0]); + snprintf(buf, bufsize, "%s", &addrbuf[0]); } else { snprintf(buf, bufsize, "(NULL / ANY)"); }