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

implement maxudp under windows

Browse Source 
(cherry picked from commit 2f558854b7)
This commit is contained in:
Mark Andrews
2019-08-08 18:31:20 +10:00
parent 96ab258bd9
commit b44ad05d20
4 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/named/main.c
View File

@@ -507,6 +507,9 @@ parse_T_opt(char *option) {
maxudp = 1460;
} else if (!strncmp(option, "maxudp=", 7)) {
maxudp = atoi(option + 7);
if (maxudp <= 0) {
ns_main_earlyfatal("bad maxudp");
}
} else if (!strncmp(option, "mkeytimers=", 11)) {
p = strtok(option + 11, "/");
if (p == NULL) {

2
lib/isc/include/isc/socket.h
View File

@@ -1223,7 +1223,7 @@ isc__socketmgr_setreserved(isc_socketmgr_t *mgr, uint32_t);
*/
void
isc__socketmgr_maxudp(isc_socketmgr_t *mgr, int maxudp);
isc__socketmgr_maxudp(isc_socketmgr_t *mgr, unsigned int maxudp);
/*%<
* Test interface. Drop UDP packet > 'maxudp'.
*/

11
lib/isc/unix/socket.c
View File

@@ -483,7 +483,7 @@ struct isc__socketmgr {
#else /* USE_WATCHER_THREAD */
unsigned int refs;
#endif /* USE_WATCHER_THREAD */
int maxudp;
size_t maxudp;
};
#ifdef USE_SHARED_MANAGER
@@ -2022,8 +2022,11 @@ doio_recv(isc__socket_t *sock, isc_socketevent_t *dev) {
* Simulate a firewall blocking UDP responses bigger than
* 'maxudp' bytes.
*/
if (sock->manager->maxudp != 0 && cc > sock->manager->maxudp)
if (sock->manager->maxudp != 0 &&
cc > (int)sock->manager->maxudp)
{
return (DOIO_SOFT);
}
}
socket_log(sock, &dev->address, IOEVENT,
@@ -2116,7 +2119,7 @@ doio_send(isc__socket_t *sock, isc_socketevent_t *dev) {
resend:
if (sock->type == isc_sockettype_udp &&
sock->manager->maxudp != 0 &&
write_count > (size_t)sock->manager->maxudp)
write_count > sock->manager->maxudp)
cc = write_count;
else
cc = sendmsg(sock->fd, &msghdr, 0);
@@ -4420,7 +4423,7 @@ isc__socketmgr_setreserved(isc_socketmgr_t *manager0, uint32_t reserved) {
}
void
isc__socketmgr_maxudp(isc_socketmgr_t *manager0, int maxudp) {
isc__socketmgr_maxudp(isc_socketmgr_t *manager0, unsigned int maxudp) {
isc__socketmgr_t *manager = (isc__socketmgr_t *)manager0;
REQUIRE(VALID_MANAGER(manager));

80
lib/isc/win32/socket.c
View File

@@ -321,19 +321,20 @@ typedef struct IoCompletionInfo {
struct isc_socketmgr {
/* Not locked. */
unsigned int magic;
isc_mem_t *mctx;
isc_mutex_t lock;
isc_stats_t *stats;
unsigned int magic;
isc_mem_t *mctx;
isc_mutex_t lock;
isc_stats_t *stats;
/* Locked by manager lock. */
ISC_LIST(isc_socket_t) socklist;
ISC_LIST(isc_socket_t) socklist;
bool bShutdown;
isc_condition_t shutdown_ok;
HANDLE hIoCompletionPort;
int maxIOCPThreads;
HANDLE hIOCPThreads[MAX_IOCPTHREADS];
DWORD dwIOCPThreadIds[MAX_IOCPTHREADS];
isc_condition_t shutdown_ok;
HANDLE hIoCompletionPort;
int maxIOCPThreads;
HANDLE hIOCPThreads[MAX_IOCPTHREADS];
DWORD dwIOCPThreadIds[MAX_IOCPTHREADS];
size_t maxudp;
/*
* Debugging.
@@ -1239,14 +1240,24 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
sock->recvbuf.from_addr_len);
if (isc_sockaddr_getport(&dev->address) == 0) {
if (isc_log_wouldlog(isc_lctx, IOEVENT_LEVEL)) {
socket_log(__LINE__, sock, &dev->address, IOEVENT,
isc_msgcat, ISC_MSGSET_SOCKET,
ISC_MSG_ZEROPORT,
socket_log(__LINE__, sock, &dev->address,
IOEVENT, isc_msgcat,
ISC_MSGSET_SOCKET, ISC_MSG_ZEROPORT,
"dropping source port zero packet");
}
sock->recvbuf.remaining = 0;
return;
}
/*
* Simulate a firewall blocking UDP responses bigger than
* 'maxudp' bytes.
*/
if (sock->manager->maxudp != 0 &&
sock->recvbuf.remaining > sock->manager->maxudp)
{
sock->recvbuf.remaining = 0;
return;
}
} else if (sock->type == isc_sockettype_tcp) {
dev->address = sock->address;
}
@@ -1379,6 +1390,18 @@ startio_send(isc_socket_t *sock, isc_socketevent_t *dev, int *nbytes,
int status;
struct msghdr *mh;
/*
* Simulate a firewall blocking UDP responses bigger than
* 'maxudp' bytes.
*/
if (sock->type == isc_sockettype_udp &&
sock->manager->maxudp != 0 &&
dev->region.length - dev->n > sock->manager->maxudp)
{
*nbytes = dev->region.length - dev->n;
return (DOIO_SUCCESS);
}
lpo = (IoCompletionInfo *)HeapAlloc(hHeapHandle,
HEAP_ZERO_MEMORY,
sizeof(IoCompletionInfo));
@@ -2270,9 +2293,11 @@ internal_recv(isc_socket_t *sock, int nbytes)
"internal_recv: %d bytes received", nbytes);
/*
* If we got here, the I/O operation succeeded. However, we might still have removed this
* event from our notification list (or never placed it on it due to immediate completion.)
* Handle the reference counting here, and handle the cancellation event just after.
* If we got here, the I/O operation succeeded. However, we might
* still have removed this event from our notification list (or never
* placed it on it due to immediate completion.)
* Handle the reference counting here, and handle the cancellation
* event just after.
*/
INSIST(sock->pending_iocp > 0);
sock->pending_iocp--;
@@ -2280,13 +2305,15 @@ internal_recv(isc_socket_t *sock, int nbytes)
sock->pending_recv--;
/*
* The only way we could have gotten here is that our I/O has successfully completed.
* Update our pointers, and move on. The only odd case here is that we might not
* have received enough data on a TCP stream to satisfy the minimum requirements. If
* this is the case, we will re-issue the recv() call for what we need.
* The only way we could have gotten here is that our I/O has
* successfully completed. Update our pointers, and move on.
* The only odd case here is that we might not have received
* enough data on a TCP stream to satisfy the minimum requirements.
* If this is the case, we will re-issue the recv() call for what
* we need.
*
* We do check for a recv() of 0 bytes on a TCP stream. This means the remote end
* has closed.
* We do check for a recv() of 0 bytes on a TCP stream. This
* means the remote end has closed.
*/
if (nbytes == 0 && sock->type == isc_sockettype_tcp) {
send_recvdone_abort(sock, ISC_R_EOF);
@@ -2699,6 +2726,7 @@ isc__socketmgr_create2(isc_mem_t *mctx, isc_socketmgr_t **managerp,
manager->bShutdown = false;
manager->totalSockets = 0;
manager->iocp_total = 0;
manager->maxudp = 0;
*managerp = manager;
@@ -4275,3 +4303,11 @@ isc_socketmgr_createinctx(isc_mem_t *mctx, isc_appctx_t *actx,
return (result);
}
void
isc_socketmgr_maxudp(isc_socketmgr_t *manager, unsigned int maxudp) {
REQUIRE(VALID_MANAGER(manager));
manager->maxudp = maxudp;
}