Mercurial > hg > freeDiameter
changeset 59:067ab3fc6093
Cleanups in debug messages
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 30 Nov 2009 14:50:25 +0900 |
| parents | 4083e32bff99 |
| children | 04ae89829faa |
| files | freeDiameter/cnxctx.c freeDiameter/cnxctx.h freeDiameter/config.c freeDiameter/sctps.c |
| diffstat | 4 files changed, 7 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/freeDiameter/cnxctx.c Mon Nov 30 14:34:21 2009 +0900 +++ b/freeDiameter/cnxctx.c Mon Nov 30 14:50:25 2009 +0900 @@ -776,7 +776,7 @@ } /* Verify remote credentials after successful handshake (return 0 if OK, EINVAL otherwise) */ -int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn) +int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose) { int ret, i; const gnutls_datum_t *cert_list; @@ -785,7 +785,7 @@ time_t now; /* Trace the session information -- http://www.gnu.org/software/gnutls/manual/gnutls.html#Obtaining-session-information */ - if (TRACE_BOOL(FULL)) { + if (verbose && TRACE_BOOL(FULL)) { const char *tmp; gnutls_kx_algorithm_t kx; gnutls_credentials_type_t cred; @@ -888,7 +888,7 @@ now = time(NULL); - if (TRACE_BOOL(FULL)) { + if (verbose && TRACE_BOOL(FULL)) { char serial[40]; char dn[128]; size_t size; @@ -1030,7 +1030,7 @@ } ); /* Now verify the remote credentials are valid -- only simple test here */ - CHECK_FCT( fd_tls_verify_credentials(conn->cc_tls_para.session, conn) ); + CHECK_FCT( fd_tls_verify_credentials(conn->cc_tls_para.session, conn, 1) ); } /* Multi-stream TLS: handshake other streams as well */
--- a/freeDiameter/cnxctx.h Mon Nov 30 14:34:21 2009 +0900 +++ b/freeDiameter/cnxctx.h Mon Nov 30 14:50:25 2009 +0900 @@ -80,7 +80,7 @@ /* TLS */ int fd_tls_rcvthr_core(struct cnxctx * conn, gnutls_session_t session); int fd_tls_prepare(gnutls_session_t * session, int mode, char * priority, void * alt_creds); -int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn); +int fd_tls_verify_credentials(gnutls_session_t session, struct cnxctx * conn, int verbose); /* TCP */ int fd_tcp_create_bind_server( int * sock, sSA * sa, socklen_t salen );
--- a/freeDiameter/config.c Mon Nov 30 14:34:21 2009 +0900 +++ b/freeDiameter/config.c Mon Nov 30 14:50:25 2009 +0900 @@ -251,16 +251,11 @@ { TRACE_DEBUG(INFO, "Error in priority string at position : %s", err_pos); return EINVAL; } ); } if (! fd_g_config->cnf_sec_data.dh_bits) { - if (TRACE_BOOL(INFO)) { - fd_log_debug("Generating Diffie-Hellman parameters of size %d (this takes a few seconds)... ", GNUTLS_DEFAULT_DHBITS); - } + TRACE_DEBUG(INFO, "Generating Diffie-Hellman parameters of size %d (this takes a few seconds)... ", GNUTLS_DEFAULT_DHBITS); CHECK_GNUTLS_DO( gnutls_dh_params_generate2( fd_g_config->cnf_sec_data.dh_cache, GNUTLS_DEFAULT_DHBITS), { TRACE_DEBUG(INFO, "Error in DH bits value : %d", GNUTLS_DEFAULT_DHBITS); return EINVAL; } ); - if (TRACE_BOOL(INFO)) { - fd_log_debug("Done!\n"); - } } return 0;
--- a/freeDiameter/sctps.c Mon Nov 30 14:34:21 2009 +0900 +++ b/freeDiameter/sctps.c Mon Nov 30 14:50:25 2009 +0900 @@ -447,7 +447,7 @@ resumed = gnutls_session_is_resumed(ctx->session); if (!resumed) { /* Check the credentials here also */ - CHECK_FCT_DO( fd_tls_verify_credentials(ctx->session, ctx->parent), return NULL ); + CHECK_FCT_DO( fd_tls_verify_credentials(ctx->session, ctx->parent, 0), return NULL ); } if (TRACE_BOOL(FULL)) { if (resumed) {