ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

fixup! Clone the csock in accept_connection(), not in callback

Browse Source
This commit is contained in:
Ondřej Surý
2020-10-06 12:03:38 -07:00
committed by Evan Hunt
parent f02c68f884
commit 9243e6d935
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/isc/netmgr/netmgr-int.h
+1
View File
@@ -411,6 +411,7 @@ struct isc_nmsocket {
*/
uv_timer_t timer;
bool timer_initialized;
bool timer_running;
uint64_t read_timeout;
uint64_t connect_timeout;
bool timed_out;
lib/isc/netmgr/netmgr.c
+1 -1
View File
@@ -1052,7 +1052,7 @@ isc__nmsocket_init(isc_nmsocket_t *sock, isc_nm_t *mgr, isc_nmsocket_type type,
void
isc__nmsocket_clearcb(isc_nmsocket_t *sock) {
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(sock->tid == isc_nm_tid());
REQUIRE(!isc__nm_in_netthread() || sock->tid == isc_nm_tid());
sock->recv_cb = NULL;
sock->recv_cbarg = NULL;
lib/isc/netmgr/tcp.c
+8 -3
View File
@@ -86,7 +86,7 @@ connecttimeout_cb(uv_timer_t *handle) {
}
uv_timer_stop(&sock->timer);
sock->timer_initialized = false;
sock->timer_running = false;
sock->timed_out = true;
isc__nm_uvreq_put(&req, sock);
isc__nmsocket_detach(&sock);
@@ -109,6 +109,7 @@ tcp_connect_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
uv_timer_start(&sock->timer, connecttimeout_cb, sock->connect_timeout,
0);
sock->timer_running = true;
r = uv_tcp_init(&worker->loop, &sock->uv_handle.tcp);
if (r != 0) {
@@ -185,7 +186,7 @@ tcp_connect_cb(uv_connect_t *uvreq, int status) {
}
uv_timer_stop(&sock->timer);
sock->timer_initialized = false;
sock->timer_running = false;
if (status != 0) {
req->cb.connect(NULL, isc__nm_uverr2result(status), req->cbarg);
@@ -720,6 +721,7 @@ isc__nm_async_tcp_startread(isc__networker_t *worker, isc__netievent_t *ev0) {
}
uv_timer_start(&sock->timer, readtimeout_cb, sock->read_timeout,
0);
sock->timer_running = true;
}
r = uv_read_start(&sock->uv_handle.stream, tcp_alloc_cb, read_cb);
@@ -762,8 +764,9 @@ isc__nm_async_tcp_pauseread(isc__networker_t *worker, isc__netievent_t *ev0) {
REQUIRE(VALID_NMSOCK(sock));
REQUIRE(worker->id == isc_nm_tid());
if (sock->timer_initialized) {
if (sock->timer_running) {
uv_timer_stop(&sock->timer);
sock->timer_running = false;
}
uv_read_stop(&sock->uv_handle.stream);
}
@@ -1139,7 +1142,9 @@ tcp_close_direct(isc_nmsocket_t *sock) {
}
if (sock->timer_initialized) {
sock->timer_initialized = false;
sock->timer_running = false;
uv_timer_stop(&sock->timer);
uv_handle_set_data((uv_handle_t *)&sock->timer, sock);
uv_close((uv_handle_t *)&sock->timer, timer_close_cb);
} else {
if (sock->server != NULL) {