Avoid using PJ_EEOF to indicate SSL renegotiation (#4642)

Author: nanangizz

pjlib/include/pj/errno.h

@@ -492,6 +492,11 @@ PJ_DECL(pj_status_t) pj_register_strerror(pj_status_t start_code,
  * Socket is stopped
  */
 #define PJ_ESOCKETSTOP      (PJ_ERRNO_START_STATUS + 24)/* 70024 */
+/**
+ * @hideinitializer
+ * Try again
+ */
+#define PJ_ETRYAGAIN        (PJ_ERRNO_START_STATUS + 25)/* 70025 */
 
 /** @} */   /* pj_errnum */
 

pjlib/src/pj/errno.c

@@ -78,7 +78,8 @@ static const struct
     PJ_BUILD_ERR(PJ_EIPV6NOTSUP,   "IPv6 is not supported"),
     PJ_BUILD_ERR(PJ_EAFNOTSUP,     "Unsupported address family"),
     PJ_BUILD_ERR(PJ_EGONE,         "Object no longer exists"),
-    PJ_BUILD_ERR(PJ_ESOCKETSTOP,   "Socket is in bad state")
+    PJ_BUILD_ERR(PJ_ESOCKETSTOP,   "Socket is in bad state"),
+    PJ_BUILD_ERR(PJ_ETRYAGAIN,     "Try again")
 };
 #endif  /* PJ_HAS_ERROR_STRING */
 

pjlib/src/pj/ssl_sock_gtls.c

@@ -1194,7 +1194,7 @@ static pj_status_t ssl_read(pj_ssl_sock_t *ssock, void *data, int *size)
         /* Nothing more to read */
         return PJ_SUCCESS;
     } else if (decrypted_size == GNUTLS_E_REHANDSHAKE) {
-        return PJ_EEOF;
+        return PJ_ETRYAGAIN;
     } else if (decrypted_size == GNUTLS_E_AGAIN ||
                decrypted_size == GNUTLS_E_INTERRUPTED ||
                !gnutls_error_is_fatal(decrypted_size))

pjlib/src/pj/ssl_sock_imp_common.c

@@ -854,7 +854,7 @@ static pj_bool_t ssock_on_data_read (pj_ssl_sock_t *ssock,
 
             } else if (status_ == PJ_SUCCESS) {
                 break;
-            } else if (status_ == PJ_EEOF) {
+            } else if (status_ == PJ_ETRYAGAIN) {
                 status = ssl_do_handshake(ssock);
                 if (status == PJ_SUCCESS) {
                     /* Renegotiation completed */
@@ -1817,7 +1817,7 @@ static pj_status_t ssl_send (pj_ssl_sock_t *ssock,
     if (status == PJ_SUCCESS && nwritten == size) {
         /* All data written, flush write buffer to network socket */
         status = flush_circ_buf_output(ssock, send_key, size, flags);
-    } else if (status == PJ_EEOF) {
+    } else if (status == PJ_ETRYAGAIN) {
         /* Re-negotiation is on progress, flush re-negotiation data */
         status = flush_circ_buf_output(ssock, &ssock->handshake_op_key, 0, 0);
         if (status == PJ_SUCCESS || status == PJ_EPENDING) {

pjlib/src/pj/ssl_sock_ossl.c

@@ -2487,10 +2487,10 @@ static pj_status_t ssl_read(pj_ssl_sock_t *ssock, void *data, int *size)
             }
         }
 
-        /* Return PJ_EEOF when SSL needs renegotiation */
+        /* Return PJ_ETRYAGAIN when SSL needs renegotiation */
         if (!SSL_is_init_finished(ossock->ossl_ssl)) {
             pj_lock_release(ssock->write_mutex);
-            return PJ_EEOF;
+            return PJ_ETRYAGAIN;
         }
     }
 
@@ -2518,9 +2518,9 @@ static pj_status_t ssl_write(pj_ssl_sock_t *ssock, const void *data,
         int err;
         err = SSL_get_error(ossock->ossl_ssl, *nwritten);
         if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_NONE) {
-            status = PJ_EEOF;
+            status = PJ_ETRYAGAIN;
         } else {
-            /* Some problem occured */
+            /* Some problem occurred */
             status = STATUS_FROM_SSL_ERR2("Write", ssock, *nwritten,
                                           err, size);
         }

pjlib/src/pj/ssl_sock_schannel.c

@@ -1539,14 +1539,14 @@ static pj_status_t ssl_read(pj_ssl_sock_t* ssock, void* data, int* size)
         /* Set SSL state as handshaking & reset handshake status */
         ssock->ssl_state = SSL_STATE_HANDSHAKING;
         ssock->handshake_status = PJ_EUNKNOWN;
-        status = PJ_EEOF;
+        status = PJ_ETRYAGAIN;
     }
 
     else if (ss == SEC_I_CONTEXT_EXPIRED)
     {
         PJ_LOG(3, (SNAME(ssock), "TLS connection closed"));
         //status = sec_err_to_pj(ss);
-        status = PJ_ECANCELLED;
+        status = PJ_EEOF;
     }
 
     else {