Thu Feb 12 12:02:48 CST 2009 Jarod Neuner <janeuner@networkharbor.com>

  * tport_tls: add/fix some tls init logging

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11964 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 2dc3487b5d4b98aaca2531d2f75bc0ea6e2533a0..3f2a8f213c77cd41fad455fa5b64cfc49a814141 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Thu Feb 12 15:29:22 CST 2009
+Thu Feb 12 15:29:54 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
index 2379b48dd607f74b58783a29dc3f0b91ba49a2db..0ab447624674c4dba3ca61e3575d40a6b9591c2a 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c
@@ -271,7 +271,7 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
     if (ti->configured > 0) {
       SU_DEBUG_1(("%s: invalid local certificate: %s\n",
                 "tls_init_context", ti->cert));
-      tls_log_errors(1, "tls_init_context", 0);
+      tls_log_errors(3, "tls_init_context", 0);
 #if require_client_certificate
       errno = EIO;
       return -1;
@@ -283,7 +283,9 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
                                    ti->key,
                                    SSL_FILETYPE_PEM)) {
     if (ti->configured > 0) {
-      tls_log_errors(1, "tls_init_context", 0);
+      SU_DEBUG_1(("%s: invalid private key: %s\n",
+                "tls_init_context", ti->key));
+      tls_log_errors(3, "tls_init_context(key)", 0);
 #if require_client_certificate
       errno = EIO;
       return -1;
@@ -305,8 +307,10 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
   if (!SSL_CTX_load_verify_locations(tls->ctx,
                                      ti->CAfile,
                                      ti->CApath)) {
+    SU_DEBUG_1(("%s: error loading CA list: %s\n",
+                "tls_init_context", ti->CAfile));
     if (ti->configured > 0)
-      tls_log_errors(1, "tls_init_context", 0);
+      tls_log_errors(3, "tls_init_context(CA)", 0);
     errno = EIO;
     return -1;
   }
@@ -328,7 +332,7 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
 
   if (!SSL_CTX_set_cipher_list(tls->ctx, ti->cipher)) {
     SU_DEBUG_1(("%s: error setting cipher list\n", "tls_init_context"));
-    tls_log_errors(1, "tls_init_context", 0);
+    tls_log_errors(3, "tls_init_context", 0);
     errno = EIO;
     return -1;
   }

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c
index 4dc84ba3f9500d42f2c80897d7eb2b95e187f4f6..6d83e2ef7ac2cab34cdb24a09e19c54792ee2f3c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c
@@ -222,13 +222,21 @@ static int tport_tls_init_master(tport_primary_t *pri,
   su_home_zap(autohome);
 
   if (!tlspri->tlspri_master) {
+    /*
     if (!path || ti.configured) {
       SU_DEBUG_1(("tls_init_master: %s\n", strerror(errno)));
     }
     else {
       SU_DEBUG_5(("tls_init_master: %s\n", strerror(errno)));
     }
+    */
     return *return_culprit = "tls_init_master", -1;
+  } else {
+    char buf[TPORT_HOSTPORTSIZE];
+    su_sockaddr_t *sa = ai ? (void *)(ai->ai_addr) : NULL;
+    if (sa && tport_hostport(buf, sizeof(buf), sa, 2))
+      SU_DEBUG_5(("%s(%p): tls context initialized for %s\n", \
+                  __func__, (void *)pri, buf));
   }
 
   if (tls_subjects)