phpged/unit
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity

Disabled useless code in nxt_router_listen_socket_error().

Browse source 
It doesn't do anything useful, among creating a JSON message and logging it
to debug log.  Besides that it causes segmentation fault if the RPC handler
is triggered with an empty buffer due to exiting of the main process.
This commit is contained in:
Valentin Bartenev 2019-02-25 15:10:44 +03:00
parent c5563d142d
commit d8c0a0dbe2
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nxt_router.c
View file

@ -1982,13 +1982,18 @@ static void
nxt_router_listen_socket_error(nxt_task_t *task, nxt_port_recv_msg_t *msg, nxt_router_listen_socket_error(nxt_task_t *task, nxt_port_recv_msg_t *msg,
void *data) void *data)
{ {
nxt_socket_rpc_t *rpc;
nxt_router_temp_conf_t *tmcf;
rpc = data;
tmcf = rpc->temp_conf;
#if 0
u_char *p; u_char *p;
size_t size; size_t size;
uint8_t error; uint8_t error;
nxt_buf_t *in, *out; nxt_buf_t *in, *out;
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
nxt_socket_rpc_t *rpc;
nxt_router_temp_conf_t *tmcf;
static nxt_str_t socket_errors[] = { static nxt_str_t socket_errors[] = {
nxt_string("ListenerSystem"), nxt_string("ListenerSystem"),
@ -2000,9 +2005,7 @@ nxt_router_listen_socket_error(nxt_task_t *task, nxt_port_recv_msg_t *msg,
nxt_string("ListenerPath"), nxt_string("ListenerPath"),
}; };
rpc = data;
sa = rpc->socket_conf->listen->sockaddr; sa = rpc->socket_conf->listen->sockaddr;
tmcf = rpc->temp_conf;
in = nxt_buf_chk_make_plain(tmcf->mem_pool, msg->buf, msg->size); in = nxt_buf_chk_make_plain(tmcf->mem_pool, msg->buf, msg->size);
@ -2030,6 +2033,7 @@ nxt_router_listen_socket_error(nxt_task_t *task, nxt_port_recv_msg_t *msg,
&socket_errors[error], in->mem.free - p, p); &socket_errors[error], in->mem.free - p, p);
nxt_debug(task, "%*s", out->mem.free - out->mem.pos, out->mem.pos); nxt_debug(task, "%*s", out->mem.free - out->mem.pos, out->mem.pos);
#endif
nxt_router_conf_error(task, tmcf); nxt_router_conf_error(task, tmcf);
} }