Changeset 142:dee0a871abcd in freeDiameter

Timestamp:

Dec 16, 2009, 6:11:43 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added number of CA certificates for debug

Files:

• freeDiameter/config.c (modified) (1 diff)
• freeDiameter/fdd.y (modified) (1 diff)
• freeDiameter/main.c (modified) (1 diff)
• include/freeDiameter/freeDiameter.h (modified) (1 diff)

freeDiameter/config.c

@@ -130 +130 @@
         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 "')");

freeDiameter/fdd.y

@@ -456 +456 @@
                         {
                                 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,

freeDiameter/main.c

@@ -61 +61 @@
         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)  );

include/freeDiameter/freeDiameter.h

@@ -95 +95 @@
                 
                 char *                           ca_file;
+                int                              ca_file_nr;
                 char *                           crl_file;