Changeset 5980 for pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c

Timestamp:

May 9, 2019 4:35:41 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJLIB to use PJ_ERROR consistently.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_imp_common.c (modified) (3 diffs)

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

@@ -226 +226 @@
             /* Handshake failed in accepting, destroy our self silently. */
 
-            char errmsg[PJ_ERR_MSG_SIZE];
             char buf[PJ_INET6_ADDRSTRLEN+10];
 
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(3,(ssock->pool->obj_name, "Handshake failed in accepting "
-                      "%s: %s",
-                      pj_sockaddr_print(&ssock->rem_addr, buf, sizeof(buf), 3),
-                      errmsg));
+            PJ_PERROR(3,(ssock->pool->obj_name, status,
+                         "Handshake failed in accepting %s",
+                         pj_sockaddr_print(&ssock->rem_addr, buf,
+                                           sizeof(buf), 3)));
 
             if (ssock->param.cb.on_accept_complete2) {
@@ -251 +249 @@
             if (ssock->param.timer_heap) {
                 pj_time_val interval = {0, PJ_SSL_SOCK_DELAYED_CLOSE_TIMEOUT};
+                pj_status_t status1;
 
                 ssock->ssl_state = SSL_STATE_NULL;
@@ -261 +260 @@
                 ssock->timer.id = TIMER_CLOSE;
                 pj_time_val_normalize(&interval);
-                if (pj_timer_heap_schedule(ssock->param.timer_heap, 
-                                           &ssock->timer, &interval) != 0)
-                {
-                    PJ_LOG(3,(ssock->pool->obj_name, "Failed to schedule "
-                              "a delayed close. Race condition may occur."));
+                status1 = pj_timer_heap_schedule(ssock->param.timer_heap, 
+                                                 &ssock->timer, &interval);
+                if (status1 != PJ_SUCCESS) {
+                    PJ_PERROR(3,(ssock->pool->obj_name, status,
+                                 "Failed to schedule a delayed close. "
+                                 "Race condition may occur."));
                     ssock->timer.id = TIMER_NONE;
                     pj_ssl_sock_close(ssock);