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

post-merge-fixes

Browse Source
This commit is contained in:
Witold Kręcicki
2020-07-22 00:41:58 +02:00
committed by Evan Hunt
parent f43af328b6
commit f8ef33db6d
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/misc/options
View File

@@ -224,7 +224,7 @@ options {
listen-on-v6 [ port <integer> ] [ dscp
<integer> ] {
<address_match_element>; ... }; // may occur multiple times
lmdb-mapsize <sizeval>;
lmdb-mapsize <sizeval>; // non-operational
lock-file ( <quoted_string> | none );
maintain-ixfr-base <boolean>; // ancient
managed-keys-directory <quoted_string>;
@@ -585,7 +585,7 @@ view <string> [ <class> ] {
}; // may occur multiple times
key-directory <quoted_string>;
lame-ttl <duration>;
lmdb-mapsize <sizeval>;
lmdb-mapsize <sizeval>; // non-operational
maintain-ixfr-base <boolean>; // ancient
managed-keys { <string> (
static-key | initial-key

4
doc/misc/options.active
View File

@@ -201,7 +201,7 @@ options {
listen-on-v6 [ port <integer> ] [ dscp
<integer> ] {
<address_match_element>; ... }; // may occur multiple times
lmdb-mapsize <sizeval>;
lmdb-mapsize <sizeval>; // non-operational
lock-file ( <quoted_string> | none );
managed-keys-directory <quoted_string>;
masterfile-format ( map | raw | text );
@@ -525,7 +525,7 @@ view <string> [ <class> ] {
}; // may occur multiple times
key-directory <quoted_string>;
lame-ttl <duration>;
lmdb-mapsize <sizeval>;
lmdb-mapsize <sizeval>; // non-operational
managed-keys { <string> (
static-key | initial-key
| static-ds | initial-ds

9
lib/isc/netmgr/netmgr.c
View File

@@ -595,13 +595,10 @@ process_queue(isc__networker_t *worker, isc_queue_t *queue) {
uv_stop(&worker->loop);
isc_mempool_put(worker->mgr->evpool, ievent);
return;
<<<<<<< HEAD
case netievent_udpconnect:
isc__nm_async_udpconnect(worker, ievent);
break;
=======
>>>>>>> netmgr: server-side TLS support
case netievent_udplisten:
isc__nm_async_udplisten(worker, ievent);
break;
@@ -611,16 +608,14 @@ process_queue(isc__networker_t *worker, isc_queue_t *queue) {
case netievent_udpsend:
isc__nm_async_udpsend(worker, ievent);
break;
<<<<<<< HEAD
case netievent_udpread:
isc__nm_async_udpread(worker, ievent);
break;
case netievent_udpclose:
isc__nm_async_udpclose(worker, ievent);
break;
=======
>>>>>>> netmgr: server-side TLS support
case netievent_tcpconnect:
isc__nm_async_tcpconnect(worker, ievent);
break;
@@ -1144,7 +1139,7 @@ isc__nmhandle_get(isc_nmsocket_t *sock, isc_sockaddr_t *peer,
handle->ah_pos = pos;
UNLOCK(&sock->lock);
if (sock->type == isc_nm_tcpsocket || sock->type == isc_nm_tlssocket
if (sock->type == isc_nm_tcpsocket || sock->type == isc_nm_tlssocket ||
(sock->type == isc_nm_udpsocket && sock->client)) {
INSIST(sock->statichandle == NULL);
sock->statichandle = handle;

12
lib/isc/netmgr/tls.c
View File

@@ -70,7 +70,7 @@ tls_do_bio(isc_nmsocket_t *sock, int rv) {
region.length);
isc_region_t dregion =
(isc_region_t){ region.base, rv };
sock->rcb.recv(sock->tcphandle, ISC_R_SUCCESS,
sock->rcb.recv(sock->statichandle, ISC_R_SUCCESS,
&dregion, sock->rcbarg);
free(region.base);
}
@@ -116,7 +116,7 @@ tls_do_bio(isc_nmsocket_t *sock, int rv) {
error:
/* XXXWPK TODO log it ! */
if (sock->rcb.recv != NULL) {
sock->rcb.recv(sock->tcphandle, ISC_R_SUCCESS, NULL,
sock->rcb.recv(sock->statichandle, ISC_R_SUCCESS, NULL,
sock->rcbarg);
} else {
tls_close_direct(sock);
@@ -138,7 +138,7 @@ tls_readcb(isc_nmhandle_t *handle, isc_result_t result, isc_region_t *region,
/* TODO accept_cb should be called if we're not initialized yet!
*/
if (tlssock->rcb.recv != NULL) {
tlssock->rcb.recv(tlssock->tcphandle, result, region,
tlssock->rcb.recv(tlssock->statichandle, result, region,
tlssock->rcbarg);
}
isc__nm_tls_close(tlssock);
@@ -152,11 +152,11 @@ tls_readcb(isc_nmhandle_t *handle, isc_result_t result, isc_region_t *region,
if (SSL_is_init_finished(tlssock->tls.ssl) == 1) {
if (tlssock->server) {
tlssock->listener->accept_cb.accept(
tlssock->tcphandle, ISC_R_SUCCESS,
tlssock->statichandle, ISC_R_SUCCESS,
tlssock->listener->accept_cbarg);
} else {
tlssock->accept_cb.connect(
tlssock->tcphandle, ISC_R_SUCCESS,
tlssock->statichandle, ISC_R_SUCCESS,
tlssock->accept_cbarg);
}
tlssock->tls.state = IO;
@@ -293,7 +293,7 @@ tls_send_direct(isc_nmsocket_t *sock, isc__nm_uvreq_t *req) {
}
INSIST((unsigned)rv == req->uvbuf.len);
tls_do_bio(sock, TLS_CHECK_RV);
req->cb.send(sock->tcphandle, ISC_R_SUCCESS, req->cbarg);
req->cb.send(sock->statichandle, ISC_R_SUCCESS, req->cbarg);
isc__nm_uvreq_put(&req, sock);
return (ISC_R_SUCCESS);
}