mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Creating TCP dispatch now creates/binds the socket

Browse Source 
Previously, creation of TCP dispatches differed from UDP in that a TCP
dispatch was created to attach to an existing socket, whereas a UDP
dispatch would be created in a vacuum and sockets would be opened on
demand when a transaction was initiated.

We are moving as much socket code as possible into the dispatch module,
so that it can be replaced with a netmgr version as easily as
possible. (This will also have the side effect of making TCP and UDP
dispatches more similar.)

As a step in that direction, this commit changes
dns_dispatch_createtcp() so that it creates the TCP socket.
This commit is contained in:
Evan Hunt
2020-12-18 14:59:50 -08:00
parent f439eb5d99
commit 4f30b679e7
4 changed files with 125 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/dns/request.c
View File

@@ -498,9 +498,6 @@ tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr,
const isc_sockaddr_t *srcaddr, const isc_sockaddr_t *destaddr,
isc_dscp_t dscp, bool *connected, dns_dispatch_t **dispatchp) {
isc_result_t result;
isc_socket_t *sock = NULL;
isc_sockaddr_t src;
isc_sockaddr_t bind_any;
if (!newtcp) {
result = dns_dispatch_gettcp(requestmgr->dispatchmgr, destaddr,
@@ -517,31 +514,9 @@ tcp_dispatch(bool newtcp, dns_requestmgr_t *requestmgr,
}
}
result = isc_socket_create(requestmgr->socketmgr,
isc_sockaddr_pf(destaddr),
isc_sockettype_tcp, &sock);
if (result != ISC_R_SUCCESS) {
return (result);
}
if (srcaddr == NULL) {
isc_sockaddr_anyofpf(&bind_any, isc_sockaddr_pf(destaddr));
result = isc_socket_bind(sock, &bind_any, 0);
} else {
src = *srcaddr;
isc_sockaddr_setport(&src, 0);
result = isc_socket_bind(sock, &src, 0);
}
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
isc_socket_dscp(sock, dscp);
result = dns_dispatch_createtcp(requestmgr->dispatchmgr, sock,
requestmgr->taskmgr, srcaddr, destaddr,
0, dispatchp);
cleanup:
isc_socket_detach(&sock);
result = dns_dispatch_createtcp(
requestmgr->dispatchmgr, requestmgr->socketmgr,
requestmgr->taskmgr, srcaddr, destaddr, 0, dscp, dispatchp);
return (result);
}