Changeset 6034 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

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.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c (modified) (7 diffs)

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);