lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.修复前一个ssl错误没清，导致后面的正常ssl调用操作 获取到这个错误 (#1401)

Browse Source
This commit is contained in:
蒋祥龙
2021-05-14 21:07:27 +08:00
committed by GitHub
parent 1e6781bd41
commit 28d47d96b9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lualib-src/ltls.c
View File

@@ -182,6 +182,7 @@ _ltls_context_handshake(lua_State* L) {
return 0; return 0;
} else if (ret < 0) { } else if (ret < 0) {
int err = SSL_get_error(tls_p->ssl, ret); int err = SSL_get_error(tls_p->ssl, ret);
ERR_clear_error();
if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
int all_read = _bio_read(L, tls_p); int all_read = _bio_read(L, tls_p);
if(all_read>0) { if(all_read>0) {
@@ -192,6 +193,7 @@ _ltls_context_handshake(lua_State* L) {
} }
} else { } else {
int err = SSL_get_error(tls_p->ssl, ret); int err = SSL_get_error(tls_p->ssl, ret);
ERR_clear_error();
luaL_error(L, "SSL_do_handshake error:%d ret:%d", err, ret); luaL_error(L, "SSL_do_handshake error:%d ret:%d", err, ret);
} }
} }
@@ -219,6 +221,7 @@ _ltls_context_read(lua_State* L) {
read = SSL_read(tls_p->ssl, outbuff, sizeof(outbuff)); read = SSL_read(tls_p->ssl, outbuff, sizeof(outbuff));
if(read <= 0) { if(read <= 0) {
int err = SSL_get_error(tls_p->ssl, read); int err = SSL_get_error(tls_p->ssl, read);
ERR_clear_error();
if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) { if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
break; break;
} }
@@ -244,6 +247,7 @@ _ltls_context_write(lua_State* L) {
int written = SSL_write(tls_p->ssl, unencrypted_data, slen); int written = SSL_write(tls_p->ssl, unencrypted_data, slen);
if(written <= 0) { if(written <= 0) {
int err = SSL_get_error(tls_p->ssl, written); int err = SSL_get_error(tls_p->ssl, written);
ERR_clear_error();
luaL_error(L, "SSL_write error:%d", err); luaL_error(L, "SSL_write error:%d", err);
}else if(written <= slen) { }else if(written <= slen) {
unencrypted_data += written; unencrypted_data += written;