Mail: configurable socket buffer sizes.

The "rcvbuf" and "sndbuf" parameters are now supported by
the "listen" directive.
This commit is contained in:
Vladimir Homutov 2017-04-03 17:30:34 +03:00
parent 9f7b557673
commit a965e1d766
3 changed files with 39 additions and 1 deletions

View File

@ -333,6 +333,8 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
ls->log.handler = ngx_accept_log_error; ls->log.handler = ngx_accept_log_error;
ls->backlog = addr[i].opt.backlog; ls->backlog = addr[i].opt.backlog;
ls->rcvbuf = addr[i].opt.rcvbuf;
ls->sndbuf = addr[i].opt.sndbuf;
ls->keepalive = addr[i].opt.so_keepalive; ls->keepalive = addr[i].opt.so_keepalive;
#if (NGX_HAVE_KEEPALIVE_TUNABLE) #if (NGX_HAVE_KEEPALIVE_TUNABLE)

View File

@ -46,6 +46,8 @@ typedef struct {
int tcp_keepcnt; int tcp_keepcnt;
#endif #endif
int backlog; int backlog;
int rcvbuf;
int sndbuf;
} ngx_mail_listen_t; } ngx_mail_listen_t;

View File

@ -295,7 +295,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
ngx_mail_core_srv_conf_t *cscf = conf; ngx_mail_core_srv_conf_t *cscf = conf;
ngx_str_t *value; ngx_str_t *value, size;
ngx_url_t u; ngx_url_t u;
ngx_uint_t i, m; ngx_uint_t i, m;
ngx_mail_listen_t *ls; ngx_mail_listen_t *ls;
@ -350,6 +350,8 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ls->socklen = u.socklen; ls->socklen = u.socklen;
ls->backlog = NGX_LISTEN_BACKLOG; ls->backlog = NGX_LISTEN_BACKLOG;
ls->rcvbuf = -1;
ls->sndbuf = -1;
ls->wildcard = u.wildcard; ls->wildcard = u.wildcard;
ls->ctx = cf->ctx; ls->ctx = cf->ctx;
@ -398,6 +400,38 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
continue; 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_strncmp(value[i].data, "ipv6only=o", 10) == 0) {
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
size_t len; size_t len;