Mercurial > hg > freeDiameter
changeset 142:dee0a871abcd
Added number of CA certificates for debug
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Wed, 16 Dec 2009 18:11:43 +0900 |
| parents | 4e671e8dcae8 |
| children | 6f7fc8efbb9f |
| files | freeDiameter/config.c freeDiameter/fdd.y freeDiameter/main.c include/freeDiameter/freeDiameter.h |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/freeDiameter/config.c Wed Dec 16 17:26:50 2009 +0900 +++ b/freeDiameter/config.c Wed Dec 16 18:11:43 2009 +0900 @@ -129,7 +129,7 @@ fd_log_debug(" TLS : - Certificate .. : %s\n", fd_g_config->cnf_sec_data.cert_file ?: "(NONE)"); fd_log_debug(" - Private key .. : %s\n", fd_g_config->cnf_sec_data.key_file ?: "(NONE)"); - fd_log_debug(" - CA (trust) ... : %s\n", fd_g_config->cnf_sec_data.ca_file ?: "(none)"); + fd_log_debug(" - CA (trust) ... : %s (%d certs)\n", fd_g_config->cnf_sec_data.ca_file ?: "(none)", fd_g_config->cnf_sec_data.ca_file_nr); fd_log_debug(" - CRL .......... : %s\n", fd_g_config->cnf_sec_data.crl_file ?: "(none)"); fd_log_debug(" - Priority ..... : %s\n", fd_g_config->cnf_sec_data.prio_string ?: "(default: '" GNUTLS_DEFAULT_PRIORITY "')"); fd_log_debug(" - DH bits ...... : %d\n", fd_g_config->cnf_sec_data.dh_bits ?: GNUTLS_DEFAULT_DHBITS);
--- a/freeDiameter/fdd.y Wed Dec 16 17:26:50 2009 +0900 +++ b/freeDiameter/fdd.y Wed Dec 16 18:11:43 2009 +0900 @@ -455,7 +455,7 @@ tls_ca: TLS_CA '=' QSTRING ';' { conf->cnf_sec_data.ca_file = $3; - CHECK_GNUTLS_DO( gnutls_certificate_set_x509_trust_file( + CHECK_GNUTLS_DO( conf->cnf_sec_data.ca_file_nr += gnutls_certificate_set_x509_trust_file( conf->cnf_sec_data.credentials, conf->cnf_sec_data.ca_file, GNUTLS_X509_FMT_PEM),
--- a/freeDiameter/main.c Wed Dec 16 17:26:50 2009 +0900 +++ b/freeDiameter/main.c Wed Dec 16 18:11:43 2009 +0900 @@ -60,8 +60,9 @@ pthread_t sig_th; sigset_t sig_all; + memset(fd_g_config, 0, sizeof(struct fd_config)); + /* Block all signals */ - memset(fd_g_config, 0, sizeof(struct fd_config)); sigfillset(&sig_all); CHECK_POSIX( pthread_sigmask(SIG_BLOCK, &sig_all, NULL) );