GithubStar/workflow
1
0
Fork 0
mirror of https://github.com/sogou/workflow.git synced 2026-10-17 04:31:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support sending IO vector over 2GB on TLS. (#1822)

Browse Source
This commit is contained in:
xiehan
2026-07-03 00:07:20 +08:00
committed by GitHub
parent e740feae6e
commit fa270e07c0
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/Communicator.cc
+4 -2
View File
@@ -158,10 +158,12 @@ static int __ssl_writev(poller_ssl_t *ssl, struct iovec vectors[], int cnt)
break;
}
cnt = vectors[0].iov_len;
if (n > 0 && n < SSL_WRITEV_BUFSIZE)
cnt -= SSL_WRITEV_BUFSIZE - n;
n += vectors[0].iov_len - SSL_WRITEV_BUFSIZE;
else
n = vectors[0].iov_len;
cnt = n <= INT_MAX ? n : INT_MAX;
return poller_ssl_write(vectors[0].iov_base, cnt, &i, ssl);
}
src/kernel/poller.c
+8 -13
View File
@@ -557,20 +557,17 @@ static void __poller_handle_write(struct __poller_node *node,
poller_t *poller)
{
struct iovec *iov = node->data.write_iov;
size_t count = 0;
size_t sum = 0;
ssize_t nleft;
int iovcnt;
int cnt;
int ret;
while (node->data.iovcnt > 0)
{
if (!node->data.ssl)
{
iovcnt = node->data.iovcnt;
if (iovcnt > IOV_MAX)
iovcnt = IOV_MAX;
nleft = writev(node->data.fd, iov, iovcnt);
cnt = node->data.iovcnt <= IOV_MAX ? node->data.iovcnt : IOV_MAX;
nleft = writev(node->data.fd, iov, cnt);
if (nleft < 0)
{
ret = errno == EAGAIN ? 0 : -1;
@@ -579,7 +576,8 @@ static void __poller_handle_write(struct __poller_node *node,
}
else if (iov->iov_len > 0)
{
nleft = SSL_write(node->data.ssl->ssl, iov->iov_base, iov->iov_len);
cnt = iov->iov_len <= INT_MAX ? iov->iov_len : INT_MAX;
nleft = SSL_write(node->data.ssl->ssl, iov->iov_base, cnt);
if (nleft <= 0)
{
ret = __poller_handle_ssl_error(node, nleft, poller);
@@ -589,7 +587,7 @@ static void __poller_handle_write(struct __poller_node *node,
else
nleft = 0;
count += nleft;
sum += nleft;
do
{
if (nleft >= iov->iov_len)
@@ -612,10 +610,7 @@ static void __poller_handle_write(struct __poller_node *node,
node->data.write_iov = iov;
if (node->data.iovcnt > 0 && ret >= 0)
{
if (count == 0)
return;
if (node->data.partial_written(count, node->data.context) >= 0)
if (node->data.partial_written(sum, node->data.context) >= 0)
return;
}