technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed unused code related to testing of address binding.

Browse Source
This commit is contained in:
Valentin Bartenev
2020-04-08 15:15:24 +03:00
parent 27c1e26856
commit 555d595f38
7 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nxt_conn_connect.c
View File

@@ -108,7 +108,7 @@ nxt_conn_socket(nxt_task_t *task, nxt_conn_t *c)
c->write_timer.task = task;
if (c->local != NULL) {
if (nxt_slow_path(nxt_socket_bind(task, s, c->local, 0) != NXT_OK)) {
if (nxt_slow_path(nxt_socket_bind(task, s, c->local) != NXT_OK)) {
nxt_socket_close(task, s);
return NXT_ERROR;
}

2
src/nxt_controller.c
View File

@@ -431,7 +431,7 @@ nxt_runtime_controller_socket(nxt_task_t *task, nxt_runtime_t *rt)
#endif
ls->handler = nxt_controller_conn_init;
if (nxt_listen_socket_create(task, ls, 0) != NXT_OK) {
if (nxt_listen_socket_create(task, ls) != NXT_OK) {
return NXT_ERROR;
}

17
src/nxt_listen_socket.c
View File

@@ -27,8 +27,7 @@ nxt_listen_socket(nxt_task_t *task, nxt_socket_t s, int backlog)
nxt_int_t
nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls,
nxt_bool_t bind_test)
nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls)
{
nxt_log_t log, *old;
nxt_uint_t family;
@@ -81,16 +80,8 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls,
nxt_socket_defer_accept(task, s, sa);
}
switch (nxt_socket_bind(task, s, sa, bind_test)) {
case NXT_OK:
break;
case NXT_ERROR:
if (nxt_socket_bind(task, s, sa) != NXT_OK) {
goto fail;
default: /* NXT_DECLINED: EADDRINUSE on bind() test */
return NXT_OK;
}
#if (NXT_HAVE_UNIX_DOMAIN)
@@ -106,10 +97,6 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_listen_socket_t *ls,
if (nxt_file_set_access(name, access) != NXT_OK) {
goto fail;
}
if (bind_test && nxt_file_delete(name) != NXT_OK) {
goto fail;
}
}
#endif

2
src/nxt_listen_socket.h
View File

@@ -55,7 +55,7 @@ NXT_EXPORT nxt_int_t nxt_listen_socket(nxt_task_t *task, nxt_socket_t s,
int backlog);
NXT_EXPORT nxt_int_t nxt_listen_socket_create(nxt_task_t *task,
nxt_listen_socket_t *ls, nxt_bool_t bind_test);
nxt_listen_socket_t *ls);
NXT_EXPORT nxt_int_t nxt_listen_socket_update(nxt_task_t *task,
nxt_listen_socket_t *ls, nxt_listen_socket_t *prev);
NXT_EXPORT void nxt_listen_socket_remote_size(nxt_listen_socket_t *ls);

2
src/nxt_runtime.c
View File

@@ -1205,7 +1205,7 @@ nxt_runtime_listen_sockets_create(nxt_task_t *task, nxt_runtime_t *rt)
}
}
if (nxt_listen_socket_create(task, &curr[c], 0) != NXT_OK) {
if (nxt_listen_socket_create(task, &curr[c]) != NXT_OK) {
return NXT_ERROR;
}

13
src/nxt_socket.c
View File

@@ -184,11 +184,8 @@ nxt_socket_sockopt_name(nxt_uint_t level, nxt_uint_t sockopt)
nxt_int_t
nxt_socket_bind(nxt_task_t *task, nxt_socket_t s, nxt_sockaddr_t *sa,
nxt_bool_t test)
nxt_socket_bind(nxt_task_t *task, nxt_socket_t s, nxt_sockaddr_t *sa)
{
nxt_err_t err;
nxt_debug(task, "bind(%d, %*s)", s, (size_t) sa->length,
nxt_sockaddr_start(sa));
@@ -196,14 +193,8 @@ nxt_socket_bind(nxt_task_t *task, nxt_socket_t s, nxt_sockaddr_t *sa,
return NXT_OK;
}
err = nxt_socket_errno;
if (err == NXT_EADDRINUSE && test) {
return NXT_DECLINED;
}
nxt_alert(task, "bind(%d, %*s) failed %E",
s, (size_t) sa->length, nxt_sockaddr_start(sa), err);
s, (size_t) sa->length, nxt_sockaddr_start(sa), nxt_socket_errno);
return NXT_ERROR;
}

2
src/nxt_socket.h
View File

@@ -101,7 +101,7 @@ NXT_EXPORT nxt_int_t nxt_socket_getsockopt(nxt_task_t *task, nxt_socket_t s,
NXT_EXPORT nxt_int_t nxt_socket_setsockopt(nxt_task_t *task, nxt_socket_t s,
nxt_uint_t level, nxt_uint_t sockopt, int val);
NXT_EXPORT nxt_int_t nxt_socket_bind(nxt_task_t *task, nxt_socket_t s,
nxt_sockaddr_t *sa, nxt_bool_t test);
nxt_sockaddr_t *sa);
NXT_EXPORT nxt_int_t nxt_socket_connect(nxt_task_t *task, nxt_socket_t s,
nxt_sockaddr_t *sa);
NXT_EXPORT void nxt_socket_shutdown(nxt_task_t *task, nxt_socket_t s,