isc_tlsctx_enable_dot_client_alpn(query->tlsctx);
isc_nm_tlsdnsconnect(netmgr, &localaddr,
&query->sockaddr, tcp_connected,
- connectquery, local_timeout, 0,
+ connectquery, local_timeout,
query->tlsctx);
#if HAVE_LIBNGHTTP2
} else if (query->lookup->https_mode) {
isc_nm_httpconnect(netmgr, &localaddr, &query->sockaddr,
uri, !query->lookup->https_get,
tcp_connected, connectquery,
- query->tlsctx, local_timeout, 0);
+ query->tlsctx, local_timeout);
#endif
} else {
isc_nm_tcpdnsconnect(netmgr, &localaddr,
&query->sockaddr, tcp_connected,
- connectquery, local_timeout, 0);
+ connectquery, local_timeout);
}
/* XXX: set DSCP */
query_attach(query, &connectquery);
isc_nm_udpconnect(netmgr, &localaddr, &query->sockaddr, udp_ready,
connectquery,
- (timeout ? timeout : UDP_TIMEOUT) * 1000, 0);
+ (timeout ? timeout : UDP_TIMEOUT) * 1000);
}
/*%
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(3),
"freeing control connection");
+
+ isc_mem_put(listener->mctx, conn, sizeof(*conn));
+
maybe_free_listener(listener);
}
conn = isc_nmhandle_getdata(handle);
if (conn == NULL) {
- conn = isc_nmhandle_getextra(handle);
+ conn = isc_mem_get(listener->mctx, sizeof(*conn));
isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
NAMED_LOGMODULE_CONTROL, ISC_LOG_DEBUG(3),
"allocate new control connection");
}
#endif
- CHECK(isc_nm_listentcp(
- named_g_netmgr, &listener->address, control_newconn, listener,
- sizeof(controlconnection_t), 5, NULL, &listener->sock));
+ CHECK(isc_nm_listentcp(named_g_netmgr, &listener->address,
+ control_newconn, listener, 5, NULL,
+ &listener->sock));
#if 0
/* XXX: no unix socket support yet */
if (type == isc_socktype_unix) {
atomic_fetch_add_relaxed(&connects, 1);
isc_nm_tcpconnect(netmgr, local, addr, rndc_connected, &rndc_ccmsg,
- 60000, 0);
+ 60000);
}
static void
switch (protocol) {
case UDP:
isc_nm_udpconnect(netmgr, &sockaddr_local, &sockaddr_remote,
- connect_cb, NULL, timeout, 0);
+ connect_cb, NULL, timeout);
break;
case TCP:
isc_nm_tcpdnsconnect(netmgr, &sockaddr_local, &sockaddr_remote,
- connect_cb, NULL, timeout, 0);
+ connect_cb, NULL, timeout);
break;
case DOT: {
isc_tlsctx_createclient(&tls_ctx);
isc_nm_tlsdnsconnect(netmgr, &sockaddr_local, &sockaddr_remote,
- connect_cb, NULL, timeout, 0, tls_ctx);
+ connect_cb, NULL, timeout, tls_ctx);
break;
}
#if HAVE_LIBNGHTTP2
}
isc_nm_httpconnect(netmgr, &sockaddr_local, &sockaddr_remote,
req_url, is_post, connect_cb, NULL, tls_ctx,
- timeout, 0);
+ timeout);
} break;
#endif
default:
switch (protocol) {
case UDP:
- result = isc_nm_listenudp(netmgr, &sockaddr, read_cb, NULL, 0,
+ result = isc_nm_listenudp(netmgr, &sockaddr, read_cb, NULL,
&sock);
break;
case TCP:
result = isc_nm_listentcpdns(netmgr, &sockaddr, read_cb, NULL,
- accept_cb, NULL, 0, 0, NULL,
- &sock);
+ accept_cb, NULL, 0, NULL, &sock);
break;
case DOT: {
isc_tlsctx_createserver(NULL, NULL, &tls_ctx);
result = isc_nm_listentlsdns(netmgr, &sockaddr, read_cb, NULL,
- accept_cb, NULL, 0, 0, NULL,
- tls_ctx, &sock);
+ accept_cb, NULL, 0, NULL, tls_ctx,
+ &sock);
break;
}
#if HAVE_LIBNGHTTP2
}
eps = isc_nm_http_endpoints_new(mctx);
result = isc_nm_http_endpoints_add(
- eps, ISC_NM_HTTP_DEFAULT_PATH, read_cb, NULL, 0);
+ eps, ISC_NM_HTTP_DEFAULT_PATH, read_cb, NULL);
if (result == ISC_R_SUCCESS) {
result = isc_nm_listenhttp(netmgr, &sockaddr, 0, NULL,
dns_dispatch_attach(disp, &(dns_dispatch_t *){ NULL });
isc_nm_tcpdnsconnect(disp->mgr->nm, &disp->local,
&disp->peer, tcp_connected, disp,
- resp->timeout, 0);
+ resp->timeout);
break;
case DNS_DISPATCHSTATE_CONNECTING:
case isc_socktype_udp:
isc_nm_udpconnect(disp->mgr->nm, &resp->local, &resp->peer,
- udp_connected, resp, resp->timeout, 0);
+ udp_connected, resp, resp->timeout);
break;
default:
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listentcpdns(netmgr, &tcp_server_addr, noop_nameserver,
- NULL, accept_cb, NULL, 0, 0, NULL, &sock);
+ NULL, accept_cb, NULL, 0, NULL, &sock);
assert_int_equal(result, ISC_R_SUCCESS);
region.base = rbuf;
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listentcpdns(netmgr, &tcp_server_addr, nameserver, NULL,
- accept_cb, NULL, 0, 0, NULL, &sock);
+ accept_cb, NULL, 0, NULL, &sock);
assert_int_equal(result, ISC_R_SUCCESS);
region.base = rbuf;
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenudp(netmgr, &udp_server_addr, noop_nameserver,
- NULL, 0, &sock);
+ NULL, &sock);
assert_int_equal(result, ISC_R_SUCCESS);
region.base = rbuf;
/*
* Create a local udp nameserver on the loopback.
*/
- result = isc_nm_listenudp(netmgr, &udp_server_addr, nameserver, NULL, 0,
+ result = isc_nm_listenudp(netmgr, &udp_server_addr, nameserver, NULL,
&sock);
assert_int_equal(result, ISC_R_SUCCESS);
case DNS_TRANSPORT_TCP:
isc_nm_tcpdnsconnect(xfr->netmgr, &xfr->sourceaddr,
&xfr->primaryaddr, xfrin_connect_done,
- connect_xfr, 30000, 0);
+ connect_xfr, 30000);
break;
case DNS_TRANSPORT_TLS: {
uint32_t tls_versions;
}
isc_nm_tlsdnsconnect(xfr->netmgr, &xfr->sourceaddr,
&xfr->primaryaddr, xfrin_connect_done,
- connect_xfr, 30000, 0, tlsctx);
+ connect_xfr, 30000, tlsctx);
} break;
default:
UNREACHABLE();
isc_refcount_init(&httpdmgr->references, 1);
- CHECK(isc_nm_listentcp(nm, addr, httpd_newconn, httpdmgr,
- sizeof(isc_httpd_t), 5, NULL, &httpdmgr->sock));
+ CHECK(isc_nm_listentcp(nm, addr, httpd_newconn, httpdmgr, 5, NULL,
+ &httpdmgr->sock));
httpdmgr->magic = HTTPDMGR_MAGIC;
*httpdmgrp = httpdmgr;
free_buffer(mgr->mctx, &httpd->headerbuffer);
free_buffer(mgr->mctx, &httpd->compbuffer);
+
+ isc_mem_put(mgr->mctx, httpd, sizeof(*httpd));
+
httpdmgr_detach(&mgr);
#if ENABLE_AFL
httpd = isc_nmhandle_getdata(handle);
if (httpd == NULL) {
- httpd = isc_nmhandle_getextra(handle);
+ httpd = isc_mem_get(httpdmgr->mctx, sizeof(*httpd));
*httpd = (isc_httpd_t){ .handle = NULL };
httpdmgr_attach(httpdmgr, &httpd->mgr);
}
void *
isc_nmhandle_getdata(isc_nmhandle_t *handle);
-void *
-isc_nmhandle_getextra(isc_nmhandle_t *handle);
-
bool
isc_nmhandle_is_stream(isc_nmhandle_t *handle);
isc_result_t
isc_nm_listenudp(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nm_recv_cb_t cb,
- void *cbarg, size_t extrasize, isc_nmsocket_t **sockp);
+ void *cbarg, isc_nmsocket_t **sockp);
/*%<
* Start listening for UDP packets on interface 'iface' using net manager
* 'mgr'.
*
* When a packet is received on the socket, 'cb' will be called with 'cbarg'
* as its argument.
- *
- * When handles are allocated for the socket, 'extrasize' additional bytes
- * can be allocated along with the handle for an associated object, which
- * can then be freed automatically when the handle is destroyed.
*/
void
isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize);
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout);
/*%<
* Open a UDP socket, bind to 'local' and connect to 'peer', and
* immediately call 'cb' with a handle so that the caller can begin
* sending packets over UDP.
*
- * When handles are allocated for the socket, 'extrasize' additional bytes
- * can be allocated along with the handle for an associated object, which
- * can then be freed automatically when the handle is destroyed.
- *
* 'timeout' specifies the timeout interval in milliseconds.
*
* The connected socket can only be accessed via the handle passed to
*/
isc_result_t
-isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg,
- size_t extrahandlesize);
+isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg);
/*%<
* Open a route/netlink socket and call 'cb', so the caller can be
* begin listening for interface changes. This behaves similarly to
isc_result_t
isc_nm_listentcp(isc_nm_t *mgr, isc_sockaddr_t *iface,
- isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_nmsocket_t **sockp);
+ isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog,
+ isc_quota_t *quota, isc_nmsocket_t **sockp);
/*%<
* Start listening for raw messages over the TCP interface 'iface', using
* net manager 'mgr'.
* When connection is accepted on the socket, 'accept_cb' will be called with
* 'accept_cbarg' as its argument. The callback is expected to start a read.
*
- * When handles are allocated for the socket, 'extrasize' additional bytes
- * will be allocated along with the handle for an associated object.
- *
* If 'quota' is not NULL, then the socket is attached to the specified
* quota. This allows us to enforce TCP client quota limits.
*
void
isc_nm_tcpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize);
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout);
/*%<
* Create a socket using netmgr 'mgr', bind it to the address 'local',
* and connect it to the address 'peer'.
*
* When the connection is complete or has timed out, call 'cb' with
- * argument 'cbarg'. Allocate 'extrahandlesize' additional bytes along
- * with the handle to use for an associated object.
+ * argument 'cbarg'.
*
* 'timeout' specifies the timeout interval in milliseconds.
*
isc_nm_listentcpdns(isc_nm_t *mgr, isc_sockaddr_t *iface,
isc_nm_recv_cb_t recv_cb, void *recv_cbarg,
isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_nmsocket_t **sockp);
+ int backlog, isc_quota_t *quota, isc_nmsocket_t **sockp);
/*%<
* Start listening for DNS messages over the TCP interface 'iface', using
* net manager 'mgr'.
* When a new TCPDNS connection is accepted, 'accept_cb' will be called
* with 'accept_cbarg' as its argument.
*
- * When handles are allocated for the socket, 'extrasize' additional bytes
- * will be allocated along with the handle for an associated object
- * (typically ns_client).
- *
* 'quota' is passed to isc_nm_listentcp() when opening the raw TCP socket.
*/
isc_nm_listentlsdns(isc_nm_t *mgr, isc_sockaddr_t *iface,
isc_nm_recv_cb_t recv_cb, void *recv_cbarg,
isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_tlsctx_t *sslctx, isc_nmsocket_t **sockp);
+ int backlog, isc_quota_t *quota, isc_tlsctx_t *sslctx,
+ isc_nmsocket_t **sockp);
/*%<
* Same as isc_nm_listentcpdns but for an SSL (DoT) socket.
*/
void
isc_nm_tcpdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize);
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout);
void
isc_nm_tlsdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize, isc_tlsctx_t *sslctx);
+ isc_tlsctx_t *sslctx);
/*%<
* Establish a DNS client connection via a TCP or TLS connection, bound to
* the address 'local' and connected to the address 'peer'.
*
* When the connection is complete or has timed out, call 'cb' with
- * argument 'cbarg'. Allocate 'extrahandlesize' additional bytes along
- * with the handle to use for an associated object.
+ * argument 'cbarg'.
*
* 'timeout' specifies the timeout interval in milliseconds.
*
isc_result_t
isc_nm_listentls(isc_nm_t *mgr, isc_sockaddr_t *iface,
- isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_tlsctx_t *sslctx, isc_nmsocket_t **sockp);
+ isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog,
+ isc_quota_t *quota, isc_tlsctx_t *sslctx,
+ isc_nmsocket_t **sockp);
void
isc_nm_tlsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
isc_nm_cb_t cb, void *cbarg, isc_tlsctx_t *ctx,
- unsigned int timeout, size_t extrahandlesize);
+ unsigned int timeout);
void
isc_nm_httpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
const char *uri, bool POST, isc_nm_cb_t cb, void *cbarg,
- isc_tlsctx_t *ctx, unsigned int timeout,
- size_t extrahandlesize);
+ isc_tlsctx_t *ctx, unsigned int timeout);
isc_result_t
isc_nm_listenhttp(isc_nm_t *mgr, isc_sockaddr_t *iface, int backlog,
isc_result_t
isc_nm_http_endpoints_add(isc_nm_http_endpoints_t *restrict eps,
const char *uri, const isc_nm_recv_cb_t cb,
- void *cbarg, const size_t extrahandlesize);
+ void *cbarg);
/*%< Adds a new endpoint to the given HTTP endpoints set object.
*
* NOTE: adding an endpoint is allowed only if the endpoint object has
* FLUSH_HTTP_WRITE_BUFFER_AFTER bytes in the write buffer, we
* will flush the buffer. */
if (cb != NULL) {
- isc__nm_uvreq_t *newcb = isc__nm_uvreq_get(
- httphandle->sock->mgr, httphandle->sock);
+ isc__nm_uvreq_t *newcb = NULL;
INSIST(VALID_NMHANDLE(httphandle));
+
+ newcb = isc__nm_uvreq_get(httphandle->sock->mgr,
+ httphandle->sock);
newcb->cb.send = cb;
newcb->cbarg = cbarg;
isc_nmhandle_attach(httphandle, &newcb->handle);
void
isc_nm_httpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
const char *uri, bool post, isc_nm_cb_t cb, void *cbarg,
- isc_tlsctx_t *tlsctx, unsigned int timeout,
- size_t extrahandlesize) {
+ isc_tlsctx_t *tlsctx, unsigned int timeout) {
isc_sockaddr_t local_interface;
isc_nmsocket_t *sock = NULL;
sock = isc_mem_get(mgr->mctx, sizeof(*sock));
isc__nmsocket_init(sock, mgr, isc_nm_httpsocket, local);
- sock->extrahandlesize = extrahandlesize;
sock->connect_timeout = timeout;
sock->result = ISC_R_UNSET;
sock->connect_cb = cb;
if (tlsctx != NULL) {
isc_nm_tlsconnect(mgr, local, peer, transport_connect_cb, sock,
- tlsctx, timeout, 0);
+ tlsctx, timeout);
} else {
isc_nm_tcpconnect(mgr, local, peer, transport_connect_cb, sock,
- timeout, 0);
+ timeout);
}
}
if (handler != NULL) {
socket->h2.cb = handler->cb;
socket->h2.cbarg = handler->cbarg;
- socket->extrahandlesize = handler->extrahandlesize;
} else {
isc_mem_free(socket->mgr->mctx, socket->h2.request_path);
socket->h2.request_path = NULL;
if (ctx != NULL) {
result = isc_nm_listentls(mgr, iface, httplisten_acceptcb, sock,
- sizeof(isc_nm_http_session_t),
backlog, quota, ctx, &sock->outer);
} else {
result = isc_nm_listentcp(mgr, iface, httplisten_acceptcb, sock,
- sizeof(isc_nm_http_session_t),
backlog, quota, &sock->outer);
}
isc_result_t
isc_nm_http_endpoints_add(isc_nm_http_endpoints_t *restrict eps,
const char *uri, const isc_nm_recv_cb_t cb,
- void *cbarg, const size_t extrahandlesize) {
+ void *cbarg) {
isc_mem_t *mctx;
isc_nm_httphandler_t *restrict handler = NULL;
isc_nm_httpcbarg_t *restrict httpcbarg = NULL;
if (http_endpoints_find(uri, eps) == NULL) {
handler = isc_mem_get(mctx, sizeof(*handler));
- *handler = (isc_nm_httphandler_t){
- .cb = http_callback,
- .cbarg = httpcbarg,
- .extrahandlesize = extrahandlesize,
- .path = isc_mem_strdup(mctx, uri)
- };
+ *handler = (isc_nm_httphandler_t){ .cb = http_callback,
+ .cbarg = httpcbarg,
+ .path = isc_mem_strdup(
+ mctx, uri) };
ISC_LINK_INIT(handler, link);
newhandler = true;
LINK(isc_nmhandle_t) active_link;
#endif
void *opaque;
- char extra[];
};
typedef enum isc__netievent_type {
char *path;
isc_nm_recv_cb_t cb;
void *cbarg;
- size_t extrahandlesize;
LINK(struct isc_nm_httphandler) link;
} isc_nm_httphandler_t;
isc_nmhandle_t *statichandle;
isc_nmhandle_t *outerhandle;
- /*% Extra data allocated at the end of each isc_nmhandle_t */
- size_t extrahandlesize;
-
/*% TCP backlog */
int backlog;
static isc_nmhandle_t *
alloc_handle(isc_nmsocket_t *sock) {
- isc_nmhandle_t *handle =
- isc_mem_get(sock->mgr->mctx,
- sizeof(isc_nmhandle_t) + sock->extrahandlesize);
+ isc_nmhandle_t *handle = isc_mem_get(sock->mgr->mctx,
+ sizeof(isc_nmhandle_t));
*handle = (isc_nmhandle_t){ .magic = NMHANDLE_MAGIC };
#ifdef NETMGR_TRACE
static void
nmhandle_free(isc_nmsocket_t *sock, isc_nmhandle_t *handle) {
- size_t extra = sock->extrahandlesize;
-
isc_refcount_destroy(&handle->references);
if (handle->dofree != NULL) {
*handle = (isc_nmhandle_t){ .magic = 0 };
- isc_mem_put(sock->mgr->mctx, handle, sizeof(isc_nmhandle_t) + extra);
+ isc_mem_put(sock->mgr->mctx, handle, sizeof(isc_nmhandle_t));
}
static void
return (isc__nmsocket_timer_running(handle->sock));
}
-void *
-isc_nmhandle_getextra(isc_nmhandle_t *handle) {
- REQUIRE(VALID_NMHANDLE(handle));
-
- return (handle->extra);
-}
-
isc_sockaddr_t
isc_nmhandle_peeraddr(isc_nmhandle_t *handle) {
REQUIRE(VALID_NMHANDLE(handle));
void
isc_nm_tcpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize) {
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
isc__netievent_tcpconnect_t *ievent = NULL;
sock = isc_mem_get(mgr->mctx, sizeof(*sock));
isc__nmsocket_init(sock, mgr, isc_nm_tcpsocket, local);
- sock->extrahandlesize = extrahandlesize;
sock->connect_timeout = timeout;
sock->result = ISC_R_UNSET;
sock->fd = (uv_os_sock_t)-1;
csock->parent = sock;
csock->accept_cb = sock->accept_cb;
csock->accept_cbarg = sock->accept_cbarg;
- csock->extrahandlesize = sock->extrahandlesize;
csock->backlog = sock->backlog;
csock->tid = tid;
/*
isc_result_t
isc_nm_listentcp(isc_nm_t *mgr, isc_sockaddr_t *iface,
- isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_nmsocket_t **sockp) {
+ isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog,
+ isc_quota_t *quota, isc_nmsocket_t **sockp) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
size_t children_size = 0;
sock->accept_cb = accept_cb;
sock->accept_cbarg = accept_cbarg;
- sock->extrahandlesize = extrahandlesize;
sock->backlog = backlog;
sock->pquota = quota;
csock = isc_mem_get(ssock->mgr->mctx, sizeof(isc_nmsocket_t));
isc__nmsocket_init(csock, ssock->mgr, isc_nm_tcpsocket, &ssock->iface);
csock->tid = ssock->tid;
- csock->extrahandlesize = ssock->extrahandlesize;
isc__nmsocket_attach(ssock, &csock->server);
csock->recv_cb = ssock->recv_cb;
csock->recv_cbarg = ssock->recv_cbarg;
void
isc_nm_tcpdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize) {
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
isc__netievent_tcpdnsconnect_t *ievent = NULL;
sock = isc_mem_get(mgr->mctx, sizeof(*sock));
isc__nmsocket_init(sock, mgr, isc_nm_tcpdnssocket, local);
- sock->extrahandlesize = extrahandlesize;
sock->connect_timeout = timeout;
sock->result = ISC_R_UNSET;
atomic_init(&sock->client, true);
csock->accept_cbarg = sock->accept_cbarg;
csock->recv_cb = sock->recv_cb;
csock->recv_cbarg = sock->recv_cbarg;
- csock->extrahandlesize = sock->extrahandlesize;
csock->backlog = sock->backlog;
csock->tid = tid;
/*
isc_nm_listentcpdns(isc_nm_t *mgr, isc_sockaddr_t *iface,
isc_nm_recv_cb_t recv_cb, void *recv_cbarg,
isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_nmsocket_t **sockp) {
+ int backlog, isc_quota_t *quota, isc_nmsocket_t **sockp) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
size_t children_size = 0;
sock->accept_cbarg = accept_cbarg;
sock->recv_cb = recv_cb;
sock->recv_cbarg = recv_cbarg;
- sock->extrahandlesize = extrahandlesize;
sock->backlog = backlog;
sock->pquota = quota;
isc__nmsocket_init(csock, ssock->mgr, isc_nm_tcpdnssocket,
&ssock->iface);
csock->tid = ssock->tid;
- csock->extrahandlesize = ssock->extrahandlesize;
isc__nmsocket_attach(ssock, &csock->server);
csock->recv_cb = ssock->recv_cb;
csock->recv_cbarg = ssock->recv_cbarg;
void
isc_nm_tlsdnsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize, isc_tlsctx_t *sslctx) {
+ isc_tlsctx_t *sslctx) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
isc__netievent_tlsdnsconnect_t *ievent = NULL;
sock = isc_mem_get(mgr->mctx, sizeof(*sock));
isc__nmsocket_init(sock, mgr, isc_nm_tlsdnssocket, local);
- sock->extrahandlesize = extrahandlesize;
sock->connect_timeout = timeout;
sock->result = ISC_R_UNSET;
sock->tls.ctx = sslctx;
csock->accept_cbarg = sock->accept_cbarg;
csock->recv_cb = sock->recv_cb;
csock->recv_cbarg = sock->recv_cbarg;
- csock->extrahandlesize = sock->extrahandlesize;
csock->backlog = sock->backlog;
csock->tid = tid;
csock->tls.ctx = sock->tls.ctx;
isc_nm_listentlsdns(isc_nm_t *mgr, isc_sockaddr_t *iface,
isc_nm_recv_cb_t recv_cb, void *recv_cbarg,
isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_tlsctx_t *sslctx, isc_nmsocket_t **sockp) {
+ int backlog, isc_quota_t *quota, isc_tlsctx_t *sslctx,
+ isc_nmsocket_t **sockp) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
size_t children_size = 0;
sock->accept_cbarg = accept_cbarg;
sock->recv_cb = recv_cb;
sock->recv_cbarg = recv_cbarg;
- sock->extrahandlesize = extrahandlesize;
sock->backlog = backlog;
sock->pquota = quota;
isc__nmsocket_init(csock, ssock->mgr, isc_nm_tlsdnssocket,
&ssock->iface);
csock->tid = ssock->tid;
- csock->extrahandlesize = ssock->extrahandlesize;
isc__nmsocket_attach(ssock, &csock->server);
csock->accept_cb = ssock->accept_cb;
csock->accept_cbarg = ssock->accept_cbarg;
return (ISC_R_TLSERROR);
}
- tlssock->extrahandlesize = tlslistensock->extrahandlesize;
isc__nmsocket_attach(tlslistensock, &tlssock->listener);
isc_nmhandle_attach(handle, &tlssock->outerhandle);
tlssock->peer = handle->sock->peer;
isc_result_t
isc_nm_listentls(isc_nm_t *mgr, isc_sockaddr_t *iface,
- isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- SSL_CTX *sslctx, isc_nmsocket_t **sockp) {
+ isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog,
+ isc_quota_t *quota, SSL_CTX *sslctx, isc_nmsocket_t **sockp) {
isc_result_t result;
isc_nmsocket_t *tlssock = NULL;
isc_nmsocket_t *tsock = NULL;
tlssock->result = ISC_R_UNSET;
tlssock->accept_cb = accept_cb;
tlssock->accept_cbarg = accept_cbarg;
- tlssock->extrahandlesize = extrahandlesize;
tlssock->tlsstream.ctx = sslctx;
tlssock->tlsstream.tls = NULL;
* We set tlssock->outer to a socket listening for a TCP connection.
*/
result = isc_nm_listentcp(mgr, iface, tlslisten_acceptcb, tlssock,
- extrahandlesize, backlog, quota,
- &tlssock->outer);
+ backlog, quota, &tlssock->outer);
if (result != ISC_R_SUCCESS) {
atomic_store(&tlssock->closed, true);
isc__nmsocket_detach(&tlssock);
void
isc_nm_tlsconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
isc_nm_cb_t cb, void *cbarg, SSL_CTX *ctx,
- unsigned int timeout, size_t extrahandlesize) {
+ unsigned int timeout) {
isc_nmsocket_t *nsock = NULL;
#if defined(NETMGR_TRACE) && defined(NETMGR_TRACE_VERBOSE)
fprintf(stderr, "TLS: isc_nm_tlsconnect(): in net thread: %s\n",
nsock = isc_mem_get(mgr->mctx, sizeof(*nsock));
isc__nmsocket_init(nsock, mgr, isc_nm_tlssocket, local);
- nsock->extrahandlesize = extrahandlesize;
nsock->result = ISC_R_UNSET;
nsock->connect_cb = cb;
nsock->connect_cbarg = cbarg;
nsock->tlsstream.ctx = ctx;
isc_nm_tcpconnect(mgr, local, peer, tcp_connected, nsock,
- nsock->connect_timeout, 0);
+ nsock->connect_timeout);
}
static void
atomic_init(&csock->reading, true);
csock->recv_cb = sock->recv_cb;
csock->recv_cbarg = sock->recv_cbarg;
- csock->extrahandlesize = sock->extrahandlesize;
csock->tid = tid;
#if HAVE_SO_REUSEPORT_LB
isc_result_t
isc_nm_listenudp(isc_nm_t *mgr, isc_sockaddr_t *iface, isc_nm_recv_cb_t cb,
- void *cbarg, size_t extrahandlesize, isc_nmsocket_t **sockp) {
+ void *cbarg, isc_nmsocket_t **sockp) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
size_t children_size = 0;
sock->recv_cb = cb;
sock->recv_cbarg = cbarg;
- sock->extrahandlesize = extrahandlesize;
sock->result = ISC_R_UNSET;
sock->tid = 0;
#endif /* USE_ROUTE_SOCKET */
isc_result_t
-isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg,
- size_t extrahandlesize) {
+isc_nm_routeconnect(isc_nm_t *mgr, isc_nm_cb_t cb, void *cbarg) {
#ifdef USE_ROUTE_SOCKET
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
sock->connect_cb = cb;
sock->connect_cbarg = cbarg;
- sock->extrahandlesize = extrahandlesize;
sock->result = ISC_R_UNSET;
atomic_init(&sock->client, true);
sock->route_sock = true;
void
isc_nm_udpconnect(isc_nm_t *mgr, isc_sockaddr_t *local, isc_sockaddr_t *peer,
- isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize) {
+ isc_nm_cb_t cb, void *cbarg, unsigned int timeout) {
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *sock = NULL;
isc__netievent_udpconnect_t *event = NULL;
sock->connect_cb = cb;
sock->connect_cbarg = cbarg;
sock->read_timeout = timeout;
- sock->extrahandlesize = extrahandlesize;
sock->peer = *peer;
sock->result = ISC_R_UNSET;
atomic_init(&sock->client, true);
}
isc_nm_httpconnect(mgr, NULL, &tcp_listen_addr, uri, post,
- connect_send_cb, data, ctx, timeout, 0);
+ connect_send_cb, data, ctx, timeout);
}
static int
WILL_RETURN(uv_tcp_bind, UV_EADDRINUSE);
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- noop_read_cb, NULL, 0);
+ noop_read_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, NULL, NULL,
endpoints, 0, &listen_sock);
char req_url[256];
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- noop_read_cb, NULL, 0);
+ noop_read_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, NULL, NULL,
char req_url[256];
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- noop_read_cb, NULL, 0);
+ noop_read_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, NULL, NULL,
char req_url[256];
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, NULL, NULL,
ISC_NM_HTTP_DEFAULT_PATH);
isc_nm_httpconnect(connect_nm, NULL, &tcp_listen_addr, req_url,
atomic_load(&POST), timeout_request_cb, NULL, ctx,
- T_SOFT, 0);
+ T_SOFT);
/*
* Sleep until sends reaches 5.
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
isc_nm_httpconnect(connect_nm, NULL, &tcp_listen_addr, req_url,
atomic_load(&POST), doh_connect_send_two_requests_cb,
- NULL, ctx, 5000, 0);
+ NULL, ctx, 5000);
while (atomic_load(&nsends) > 0) {
if (atomic_load(&was_error)) {
isc_quota_t *quotap = init_listener_quota(workers);
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
atomic_store(&nsends, atomic_load(&total_sends));
result = isc_nm_http_endpoints_add(endpoints, ISC_NM_HTTP_DEFAULT_PATH,
- doh_receive_request_cb, NULL, 0);
+ doh_receive_request_cb, NULL);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listenhttp(listen_nm, &tcp_listen_addr, 0, quotap,
static void
udp_connect(isc_nm_t *nm) {
isc_nm_udpconnect(nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
}
static void
WILL_RETURN(uv_udp_open, UV_ENOMEM);
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_not_equal(result, ISC_R_SUCCESS);
assert_null(listen_sock);
WILL_RETURN(uv_udp_bind, UV_EADDRINUSE);
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_not_equal(result, ISC_R_SUCCESS);
assert_null(listen_sock);
WILL_RETURN(uv_udp_recv_start, UV_EADDRINUSE);
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_not_equal(result, ISC_R_SUCCESS);
assert_null(listen_sock);
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
RESET_RETURN;
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
RESET_RETURN;
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
RESET_RETURN;
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
RESET_RETURN;
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
RESET_RETURN;
isc_nmsocket_t *listen_sock = NULL;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_nm_stoplistening(listen_sock);
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
atomic_assert_int_eq(cconnects, 0);
isc_nmsocket_t *listen_sock = NULL;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_EQ(csends, 1);
* Listen using the noop callback so that client reads will time out.
*/
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, noop_recv_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
/*
connect_readcb = timeout_retry_cb;
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_SOFT, 0);
+ connect_connect_cb, NULL, T_SOFT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_GE(csends, 1);
atomic_store(&nsends, 1);
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_LE(nsends, 0);
atomic_store(&nsends, 2);
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
isc_refcount_increment0(&active_cconnects);
isc_nm_udpconnect(connect_nm, &udp_connect_addr, &udp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 2);
WAIT_FOR_LE(nsends, 0);
SKIP_IN_CI;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
result = isc_nm_listenudp(listen_nm, &udp_listen_addr, listen_read_cb,
- NULL, 0, &listen_sock);
+ NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
static void
tcp_connect(isc_nm_t *nm) {
isc_nm_tcpconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
}
#if HAVE_LIBNGHTTP2
}
static isc_result_t
-stream_listen(isc_nm_accept_cb_t accept_cb, void *accept_cbarg,
- size_t extrahandlesize, int backlog, isc_quota_t *quota,
- isc_nmsocket_t **sockp) {
+stream_listen(isc_nm_accept_cb_t accept_cb, void *accept_cbarg, int backlog,
+ isc_quota_t *quota, isc_nmsocket_t **sockp) {
isc_result_t result = ISC_R_SUCCESS;
#if HAVE_LIBNGHTTP2
if (stream_use_TLS) {
result = isc_nm_listentls(listen_nm, &tcp_listen_addr,
- accept_cb, accept_cbarg,
- extrahandlesize, backlog, quota,
- tcp_listen_tlsctx, sockp);
+ accept_cb, accept_cbarg, backlog,
+ quota, tcp_listen_tlsctx, sockp);
return (result);
}
#endif
result = isc_nm_listentcp(listen_nm, &tcp_listen_addr, accept_cb,
- accept_cbarg, extrahandlesize, backlog, quota,
- sockp);
+ accept_cbarg, backlog, quota, sockp);
return (result);
}
static void
-stream_connect(isc_nm_cb_t cb, void *cbarg, unsigned int timeout,
- size_t extrahandlesize) {
+stream_connect(isc_nm_cb_t cb, void *cbarg, unsigned int timeout) {
#if HAVE_LIBNGHTTP2
if (stream_use_TLS) {
isc_nm_tlsconnect(connect_nm, &tcp_connect_addr,
&tcp_listen_addr, cb, cbarg,
- tcp_connect_tlsctx, timeout, extrahandlesize);
+ tcp_connect_tlsctx, timeout);
return;
}
#endif
isc_nm_tcpconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr, cb,
- cbarg, timeout, extrahandlesize);
+ cbarg, timeout);
}
static void
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *listen_sock = NULL;
- result = stream_listen(noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+ result = stream_listen(noop_accept_cb, NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_nm_stoplistening(listen_sock);
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_CONNECT, 0);
+ stream_connect(connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
atomic_assert_int_eq(cconnects, 0);
isc_result_t result = ISC_R_SUCCESS;
isc_nmsocket_t *listen_sock = NULL;
- result = stream_listen(noop_accept_cb, NULL, 0, 0, NULL, &listen_sock);
+ result = stream_listen(noop_accept_cb, NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_CONNECT, 0);
+ stream_connect(connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_EQ(csends, 1);
* reads to time out.
*/
noanswer = true;
- result = stream_listen(stream_accept_cb, NULL, 0, 0, NULL,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
/*
isc_nm_settimeouts(connect_nm, T_SOFT, T_SOFT, T_SOFT, T_SOFT);
connect_readcb = timeout_retry_cb;
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_SOFT, 0);
+ stream_connect(connect_connect_cb, NULL, T_SOFT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_GE(csends, 1);
atomic_store(&nsends, 1);
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_CONNECT, 0);
+ stream_connect(connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_LE(nsends, 0);
atomic_store(&nsends, 2);
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_CONNECT, 0);
+ stream_connect(connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
isc_refcount_increment0(&active_cconnects);
- stream_connect(connect_connect_cb, NULL, T_CONNECT, 0);
+ stream_connect(connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 2);
WAIT_FOR_LE(nsends, 0);
SKIP_IN_CI;
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
SKIP_IN_CI;
- result = stream_listen(stream_accept_cb, NULL, 0, 0, quotap,
- &listen_sock);
+ result = stream_listen(stream_accept_cb, NULL, 0, quotap, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
static void
tcpdns_connect(isc_nm_t *nm) {
isc_nm_tcpdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
}
static void
isc_nmsocket_t *listen_sock = NULL;
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr, noop_recv_cb,
- NULL, noop_accept_cb, NULL, 0, 0, NULL,
+ NULL, noop_accept_cb, NULL, 0, NULL,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
isc__netmgr_shutdown(connect_nm);
atomic_assert_int_eq(cconnects, 0);
isc_refcount_increment0(&active_cconnects);
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr, noop_recv_cb,
- NULL, noop_accept_cb, NULL, 0, 0, NULL,
+ NULL, noop_accept_cb, NULL, 0, NULL,
&listen_sock);
if (result != ISC_R_SUCCESS) {
isc_refcount_decrement(&active_cconnects);
assert_int_equal(result, ISC_R_SUCCESS);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_EQ(csends, 1);
noanswer = true;
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
/*
isc_nm_settimeouts(connect_nm, T_SOFT, T_SOFT, T_SOFT, T_SOFT);
isc_refcount_increment0(&active_cconnects);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_SOFT, 0);
+ connect_connect_cb, NULL, T_SOFT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_GE(csends, 1);
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
WAIT_FOR_LE(nsends, 0);
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 1);
isc_refcount_increment0(&active_cconnects);
isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0);
+ connect_connect_cb, NULL, T_CONNECT);
WAIT_FOR_EQ(cconnects, 2);
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
result = isc_nm_listentcpdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, &listen_sock);
+ NULL, 0, NULL, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
memset(threads, 0, sizeof(threads));
tls_connect(isc_nm_t *nm) {
isc_nm_tlsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
connect_connect_cb, NULL, tcp_connect_tlsctx,
- T_CONNECT, 0);
+ T_CONNECT);
}
static void
static void
tlsdns_connect(isc_nm_t *nm) {
isc_nm_tlsdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
}
isc_nmsocket_t *listen_sock = NULL;
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr, noop_recv_cb,
- NULL, noop_accept_cb, NULL, 0, 0, NULL,
+ NULL, noop_accept_cb, NULL, 0, NULL,
tcp_listen_tlsctx, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
connect_readcb = NULL;
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
isc__netmgr_shutdown(connect_nm);
isc_sockaddr_fromin6(&connect_addr, &in6addr_loopback, 0);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr, noop_recv_cb,
- NULL, noop_accept_cb, NULL, 0, 0, NULL,
+ NULL, noop_accept_cb, NULL, 0, NULL,
tcp_listen_tlsctx, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(cconnects, 1);
noanswer = true;
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_nm_settimeouts(connect_nm, T_SOFT, T_SOFT, T_SOFT, T_SOFT);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_SOFT, 0,
+ connect_connect_cb, NULL, T_SOFT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(cconnects, 1);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(cconnects, 1);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(cconnects, 1);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(cconnects, 2);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr,
listen_read_cb, NULL, listen_accept_cb,
- NULL, 0, 0, NULL, tcp_listen_tlsctx,
+ NULL, 0, NULL, tcp_listen_tlsctx,
&listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_sockaddr_fromin6(&connect_addr, &in6addr_loopback, 0);
result = isc_nm_listentlsdns(listen_nm, &tcp_listen_addr, noop_recv_cb,
- NULL, noop_accept_cb, NULL, 0, 0, NULL,
+ NULL, noop_accept_cb, NULL, 0, NULL,
tcp_listen_tlsctx, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &connect_addr, &tcp_listen_addr,
- tlsdns_connect_connect_noalpn, NULL, T_CONNECT, 0,
+ tlsdns_connect_connect_noalpn, NULL, T_CONNECT,
connect_tlsctx_noalpn);
WAIT_FOR_EQ(active_cconnects, 0);
/* We use TLS stream listener here intentionally, as it does not
* try to do ALPN. */
result = isc_nm_listentls(listen_nm, &tcp_listen_addr,
- tls_accept_cb_noalpn, NULL, 0, 0, NULL,
+ tls_accept_cb_noalpn, NULL, 0, NULL,
server_tlsctx_noalpn, &listen_sock);
assert_int_equal(result, ISC_R_SUCCESS);
isc_refcount_increment0(&active_cconnects);
isc_nm_tlsdnsconnect(connect_nm, &connect_addr, &tcp_listen_addr,
- connect_connect_cb, NULL, T_CONNECT, 0,
+ connect_connect_cb, NULL, T_CONNECT,
tcp_connect_tlsctx);
WAIT_FOR_EQ(saccepts, 1);
void
ns__client_put_cb(void *client0) {
ns_client_t *client = client0;
+ ns_clientmgr_t *manager = NULL;
+
+ REQUIRE(NS_CLIENT_VALID(client));
+
+ manager = client->manager;
ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT,
ISC_LOG_DEBUG(3), "freeing client");
* Call this first because it requires a valid client.
*/
ns_query_free(client);
+ client_extendederror_reset(client);
client->magic = 0;
client->shuttingdown = true;
- isc_mem_put(client->manager->mctx, client->sendbuf,
- NS_CLIENT_SEND_BUFFER_SIZE);
+ isc_mem_put(manager->mctx, client->sendbuf, NS_CLIENT_SEND_BUFFER_SIZE);
if (client->opt != NULL) {
INSIST(dns_rdataset_isassociated(client->opt));
dns_rdataset_disassociate(client->opt);
dns_message_puttemprdataset(client->message, &client->opt);
}
- client_extendederror_reset(client);
dns_message_detach(&client->message);
- if (client->manager != NULL) {
- clientmgr_detach(&client->manager);
- }
-
/*
* Destroy the fetchlock mutex that was created in
* ns_query_init().
*/
isc_mutex_destroy(&client->query.fetchlock);
+
+ isc_mem_put(manager->mctx, client, sizeof(*client));
+
+ clientmgr_detach(&manager);
}
/*
ns_interfacemgr_getclientmgr(ifp->mgr);
INSIST(VALID_MANAGER(clientmgr));
+ INSIST(clientmgr->tid == isc_nm_tid());
- client = isc_nmhandle_getextra(handle);
+ client = isc_mem_get(clientmgr->mctx, sizeof(*client));
result = ns__client_setup(client, clientmgr, true);
if (result != ISC_R_SUCCESS) {
#endif /* if defined(HAVE_GEOIP2) */
if (scan) {
- result = isc_nm_routeconnect(nm, route_connected, mgr, 0);
+ result = isc_nm_routeconnect(nm, route_connected, mgr);
if (result != ISC_R_SUCCESS) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO,
"unable to open route socket: %s",
/* Reserve space for an ns_client_t with the netmgr handle */
result = isc_nm_listenudp(ifp->mgr->nm, &ifp->addr, ns__client_request,
- ifp, sizeof(ns_client_t),
- &ifp->udplistensocket);
+ ifp, &ifp->udplistensocket);
return (result);
}
result = isc_nm_listentcpdns(
ifp->mgr->nm, &ifp->addr, ns__client_request, ifp,
- ns__client_tcpconn, ifp, sizeof(ns_client_t), ifp->mgr->backlog,
+ ns__client_tcpconn, ifp, ifp->mgr->backlog,
&ifp->mgr->sctx->tcpquota, &ifp->tcplistensocket);
if (result != ISC_R_SUCCESS) {
isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR,
result = isc_nm_listentlsdns(
ifp->mgr->nm, &ifp->addr, ns__client_request, ifp,
- ns__client_tcpconn, ifp, sizeof(ns_client_t), ifp->mgr->backlog,
+ ns__client_tcpconn, ifp, ifp->mgr->backlog,
&ifp->mgr->sctx->tcpquota, sslctx, &ifp->tcplistensocket);
if (result != ISC_R_SUCCESS) {
for (size_t i = 0; i < neps; i++) {
result = isc_nm_http_endpoints_add(epset, eps[i],
- ns__client_request, ifp,
- sizeof(ns_client_t));
+ ns__client_request, ifp);
if (result != ISC_R_SUCCESS) {
break;
}
client->state = 4;
ns__client_reset_cb(client);
ns__client_put_cb(client);
- isc_mem_put(mctx, client, sizeof(ns_client_t));
atomic_store(&client_addrs[i], (uintptr_t)NULL);
}
isc_result_t
ns_test_getclient(ns_interface_t *ifp0, bool tcp, ns_client_t **clientp) {
isc_result_t result;
- ns_client_t *client = isc_mem_get(mctx, sizeof(ns_client_t));
+ ns_client_t *client = isc_mem_get(clientmgr->mctx, sizeof(*client));
int i;
UNUSED(ifp0);
projects / thirdparty / bind9.git / commitdiff
