Skip to content

Commit

Permalink
Core: added limit to recv_chain().
Browse files Browse the repository at this point in the history
  • Loading branch information
@arut
arut committed Oct 28, 2014
1 parent 5f625b7 commit 0989d63
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 20 deletions.
17 changes: 14 additions & 3 deletions src/event/ngx_event_openssl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1185,10 +1185,10 @@ ngx_ssl_handshake_handler(ngx_event_t *ev)


ssize_t
ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl)
ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit)
{
u_char *last;
ssize_t n, bytes;
ssize_t n, bytes, size;
ngx_buf_t *b;

bytes = 0;
Expand All @@ -1197,8 +1197,19 @@ ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl)
last = b->last;

for ( ;; ) {
size = b->end - last;

n = ngx_ssl_recv(c, last, b->end - last);
if (limit) {
if (bytes >= limit) {
return bytes;
}

if (bytes + size > limit) {
size = (ssize_t) (limit - bytes);
}
}

n = ngx_ssl_recv(c, last, size);

if (n > 0) {
last += n;
Expand Down
2 changes: 1 addition & 1 deletion src/event/ngx_event_openssl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ ngx_int_t ngx_ssl_get_client_verify(ngx_connection_t *c, ngx_pool_t *pool,
ngx_int_t ngx_ssl_handshake(ngx_connection_t *c);
ssize_t ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_ssl_write(ngx_connection_t *c, u_char *data, size_t size);
ssize_t ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl);
ssize_t ngx_ssl_recv_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit);
ngx_chain_t *ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
void ngx_ssl_free_buffer(ngx_connection_t *c);
Expand Down
2 changes: 1 addition & 1 deletion src/event/ngx_event_pipe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
break;
}

n = p->upstream->recv_chain(p->upstream, chain);
n = p->upstream->recv_chain(p->upstream, chain, 0);

ngx_log_debug1(NGX_LOG_DEBUG_EVENT, p->log, 0,
"pipe recv chain: %z", n);
Expand Down
2 changes: 1 addition & 1 deletion src/os/unix/ngx_aio_read_chain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


ssize_t
ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit)
{
int n;
u_char *buf, *prev;
Expand Down
7 changes: 4 additions & 3 deletions src/os/unix/ngx_os.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@


typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);
typedef ssize_t (*ngx_recv_chain_pt)(ngx_connection_t *c, ngx_chain_t *in);
typedef ssize_t (*ngx_recv_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
typedef ssize_t (*ngx_send_pt)(ngx_connection_t *c, u_char *buf, size_t size);
typedef ngx_chain_t *(*ngx_send_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
Expand All @@ -41,15 +42,15 @@ ngx_int_t ngx_os_signal_process(ngx_cycle_t *cycle, char *sig, ngx_int_t pid);


ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *entry);
ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *entry, off_t limit);
ssize_t ngx_udp_unix_recv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_unix_send(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);

#if (NGX_HAVE_AIO)
ssize_t ngx_aio_read(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl);
ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl, off_t limit);
ssize_t ngx_aio_write(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_aio_write_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
Expand Down
20 changes: 16 additions & 4 deletions src/os/unix/ngx_readv_chain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


ssize_t
ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
{
u_char *prev;
ssize_t n, size;
Expand Down Expand Up @@ -66,8 +66,20 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
/* coalesce the neighbouring bufs */

while (chain) {
n = chain->buf->end - chain->buf->last;

if (limit) {
if (size >= limit) {
break;
}

if (size + n > limit) {
n = (ssize_t) (limit - size);
}
}

if (prev == chain->buf->last) {
iov->iov_len += chain->buf->end - chain->buf->last;
iov->iov_len += n;

} else {
if (vec.nelts >= IOV_MAX) {
Expand All @@ -80,10 +92,10 @@ ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
}

iov->iov_base = (void *) chain->buf->last;
iov->iov_len = chain->buf->end - chain->buf->last;
iov->iov_len = n;
}

size += chain->buf->end - chain->buf->last;
size += n;
prev = chain->buf->end;
chain = chain->next;
}
Expand Down
5 changes: 3 additions & 2 deletions src/os/win32/ngx_os.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@


typedef ssize_t (*ngx_recv_pt)(ngx_connection_t *c, u_char *buf, size_t size);
typedef ssize_t (*ngx_recv_chain_pt)(ngx_connection_t *c, ngx_chain_t *in);
typedef ssize_t (*ngx_recv_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
typedef ssize_t (*ngx_send_pt)(ngx_connection_t *c, u_char *buf, size_t size);
typedef ngx_chain_t *(*ngx_send_chain_pt)(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
Expand All @@ -41,7 +42,7 @@ ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_udp_wsarecv(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_udp_overlapped_wsarecv(ngx_connection_t *c, u_char *buf,
size_t size);
ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain);
ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit);
ssize_t ngx_wsasend(ngx_connection_t *c, u_char *buf, size_t size);
ssize_t ngx_overlapped_wsasend(ngx_connection_t *c, u_char *buf, size_t size);
ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in,
Expand Down
22 changes: 17 additions & 5 deletions src/os/win32/ngx_wsarecv_chain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@


ssize_t
ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain)
ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain, off_t limit)
{
int rc;
u_char *prev;
u_long bytes, flags;
size_t size;
size_t n, size;
ngx_err_t err;
ngx_array_t vec;
ngx_event_t *rev;
Expand All @@ -41,8 +41,20 @@ ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain)
/* coalesce the neighbouring bufs */

while (chain) {
n = chain->buf->end - chain->buf->last;

if (limit) {
if (size >= (size_t) limit) {
break;
}

if (size + n > (size_t) limit) {
n = (size_t) limit - size;
}
}

if (prev == chain->buf->last) {
wsabuf->len += chain->buf->end - chain->buf->last;
wsabuf->len += n;

} else {
wsabuf = ngx_array_push(&vec);
Expand All @@ -51,10 +63,10 @@ ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain)
}

wsabuf->buf = (char *) chain->buf->last;
wsabuf->len = chain->buf->end - chain->buf->last;
wsabuf->len = n;
}

size += chain->buf->end - chain->buf->last;
size += n;
prev = chain->buf->end;
chain = chain->next;
}
Expand Down

0 comments on commit 0989d63

Please sign in to comment.