Changeset 6034

Timestamp:

Jul 1, 2019 5:41:29 AM (5 years ago)

Author:

riza

Message:

Re #2210 (misc): Minor patch for SSL error message. Thanks to George Joseph for the patch.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/ssl_sock_ossl.c (modified) (6 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (7 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -211 +211 @@
 }
 
-#define ERROR_LOG(msg, err) \
-    PJ_LOG(2,("SSL", "%s (%s): Level: %d err: <%lu> <%s-%s-%s> len: %d", \
-              msg, action, level, err, \
-              (ERR_lib_error_string(err)? ERR_lib_error_string(err): "???"), \
-              (ERR_func_error_string(err)? ERR_func_error_string(err):"???"),\
-              (ERR_reason_error_string(err)? \
-               ERR_reason_error_string(err): "???"), len));
-
-static void SSLLogErrors(char * action, int ret, int ssl_err, int len)
+#define ERROR_LOG(msg, err, ssock) \
+{ \
+    char buf[PJ_INET6_ADDRSTRLEN+10]; \
+    PJ_LOG(2,("SSL", "%s (%s): Level: %d err: <%lu> <%s-%s-%s> len: %d " \
+           "peer: %s", \
+           msg, action, level, err, \
+           (ERR_lib_error_string(err)? ERR_lib_error_string(err): "???"), \
+           (ERR_func_error_string(err)? ERR_func_error_string(err):"???"),\
+           (ERR_reason_error_string(err)? \
+            ERR_reason_error_string(err): "???"), len, \
+           (ssock && pj_sockaddr_has_addr(&ssock->rem_addr)? \
+            pj_sockaddr_print(&ssock->rem_addr, buf, sizeof(buf), 3):"???")));\
+}
+
+static void SSLLogErrors(char * action, int ret, int ssl_err, int len, 
+                         pj_ssl_sock_t *ssock)
 {
     char *ssl_err_str = SSLErrorString(ssl_err);
@@ -234 +241 @@
             int level = 0;
             while (err2) {
-                ERROR_LOG("SSL_ERROR_SYSCALL", err2);
+                ERROR_LOG("SSL_ERROR_SYSCALL", err2, ssock);
                 level++;
                 err2 = ERR_get_error();
@@ -265 +272 @@
 
         while (err2) {
-            ERROR_LOG("SSL_ERROR_SSL", err2);
+            ERROR_LOG("SSL_ERROR_SSL", err2, ssock);
             level++;
             err2 = ERR_get_error();
@@ -303 +310 @@
     int len = 0; //dummy
 
-    ERROR_LOG("STATUS_FROM_SSL_ERR", err);
+    ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock);
     level++;
 
@@ -309 +316 @@
     if (err == SSL_ERROR_SSL) {
         err = ERR_get_error();
-        ERROR_LOG("STATUS_FROM_SSL_ERR", err);
+        ERROR_LOG("STATUS_FROM_SSL_ERR", err, ssock);
     }
 
@@ -327 +334 @@
 
     /* Dig for more from OpenSSL error queue */
-    SSLLogErrors(action, ret, err, len);
+    SSLLogErrors(action, ret, err, len, ssock);
 
     ssock->last_err = ssl_err;

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -174 +174 @@
 
 static void tls_perror(const char *sender, const char *title,
-                       pj_status_t status)
-{
-    PJ_PERROR(3,(sender, status, "%s: [code=%d]", title, status));
+                       pj_status_t status, pj_str_t *remote_name)
+{
+    PJ_PERROR(3,(sender, status, "%s: [code=%d]%s%.*s", title, status,
+        remote_name ? " peer: " : "", remote_name ? remote_name->slen : 0,
+        remote_name ? remote_name->ptr : ""));
 }
 
@@ -731 +733 @@
     if (status != PJ_SUCCESS) { 
         tls_perror(listener->factory.obj_name, 
-                   "Unable to start listener after closing it", status);
+                   "Unable to start listener after closing it", status, NULL);
 
         return status;
@@ -740 +742 @@
     if (status != PJ_SUCCESS) {
         tls_perror(listener->factory.obj_name,
-                    "Unable to register the transport listener", status);
+                    "Unable to register the transport listener", status, NULL);
 
         listener->is_registered = PJ_FALSE;     
@@ -1086 +1088 @@
                                    PJSIP_POOL_RDATA_INC);
     if (!pool) {
-        tls_perror(tls->base.obj_name, "Unable to create pool", PJ_ENOMEM);
+        tls_perror(tls->base.obj_name, "Unable to create pool", PJ_ENOMEM,
+                   NULL);
         return PJ_ENOMEM;
     }
@@ -1773 +1776 @@
     if (status != PJ_SUCCESS) {
 
-        tls_perror(tls->base.obj_name, "TLS connect() error", status);
+        tls_perror(tls->base.obj_name, "TLS connect() error", status,
+                   &tls->remote_name);
 
         /* Cancel all delayed transmits */
@@ -1917 +1921 @@
     if (is_shutdown) {
         status = tls->close_reason;
-        tls_perror(tls->base.obj_name, "TLS connect() error", status);
+        tls_perror(tls->base.obj_name, "TLS connect() error", status, 
+                   &tls->remote_name);
 
         /* Cancel all delayed transmits */
@@ -2016 +2021 @@
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
         tls_perror(tls->base.obj_name, 
-                   "Error sending keep-alive packet", status);
+                   "Error sending keep-alive packet", status,
+                   &tls->remote_name);
 
         tls_init_shutdown(tls, status);