Changeset 3455 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Mar 16, 2011 7:34:16 AM (13 years ago)

Author:

nanang

Message:

Fix #1212:

• Updated pj_register_strerror() to just return PJ_SUCCESS when the same range

and handler is being re-registered.

• Removed the usage of static flag of error string handler registration in some

modules, which prevent the re-registration of the handler, e.g: in restarting
pjsua, as such flags never got reseted.

File:

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

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

@@ -268 +268 @@
 /* OpenSSL library initialization counter */
 static int openssl_init_count;
-static int openssl_reg_strerr;
 
 /* OpenSSL available ciphers */
@@ -281 +280 @@
 static pj_status_t init_openssl(void)
 {
+    pj_status_t status;
+
     if (openssl_init_count)
         return PJ_SUCCESS;
@@ -287 +288 @@
 
     /* Register error subsystem */
-    if (!openssl_reg_strerr) {
-        pj_status_t status;
-
-        openssl_reg_strerr = 1;
-        status = pj_register_strerror(PJ_SSL_ERRNO_START, 
-                                      PJ_SSL_ERRNO_SPACE_SIZE, 
-                                      &ssl_strerror);
-        pj_assert(status == PJ_SUCCESS);
-    }
+    status = pj_register_strerror(PJ_SSL_ERRNO_START, 
+                                  PJ_SSL_ERRNO_SPACE_SIZE, 
+                                  &ssl_strerror);
+    pj_assert(status == PJ_SUCCESS);
 
     /* Init OpenSSL lib */