Skip to content

Commit

Permalink
Stream: configurable socket buffer sizes.
Browse files Browse the repository at this point in the history
The "rcvbuf" and "sndbuf" parameters are now supported by
the "listen" directive.
  • Loading branch information
vlhomutov committed Apr 3, 2017
1 parent 97cb303 commit 9f7b557
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/stream/ngx_stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,8 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
ls->log.handler = ngx_accept_log_error;

ls->backlog = addr[i].opt.backlog;
ls->rcvbuf = addr[i].opt.rcvbuf;
ls->sndbuf = addr[i].opt.sndbuf;

ls->wildcard = addr[i].opt.wildcard;

Expand Down
2 changes: 2 additions & 0 deletions src/stream/ngx_stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ typedef struct {
int tcp_keepcnt;
#endif
int backlog;
int rcvbuf;
int sndbuf;
int type;
} ngx_stream_listen_t;

Expand Down
36 changes: 35 additions & 1 deletion src/stream/ngx_stream_core_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_stream_core_srv_conf_t *cscf = conf;

ngx_str_t *value;
ngx_str_t *value, size;
ngx_url_t u;
ngx_uint_t i, backlog;
ngx_stream_listen_t *ls, *als;
Expand Down Expand Up @@ -620,6 +620,8 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)

ls->socklen = u.socklen;
ls->backlog = NGX_LISTEN_BACKLOG;
ls->rcvbuf = -1;
ls->sndbuf = -1;
ls->type = SOCK_STREAM;
ls->wildcard = u.wildcard;
ls->ctx = cf->ctx;
Expand Down Expand Up @@ -659,6 +661,38 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue;
}

if (ngx_strncmp(value[i].data, "rcvbuf=", 7) == 0) {
size.len = value[i].len - 7;
size.data = value[i].data + 7;

ls->rcvbuf = ngx_parse_size(&size);
ls->bind = 1;

if (ls->rcvbuf == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid rcvbuf \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

continue;
}

if (ngx_strncmp(value[i].data, "sndbuf=", 7) == 0) {
size.len = value[i].len - 7;
size.data = value[i].data + 7;

ls->sndbuf = ngx_parse_size(&size);
ls->bind = 1;

if (ls->sndbuf == NGX_ERROR) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid sndbuf \"%V\"", &value[i]);
return NGX_CONF_ERROR;
}

continue;
}

if (ngx_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
size_t len;
Expand Down

0 comments on commit 9f7b557

Please sign in to comment.