diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index 76a83e5e85..6ad8b71e4f 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -1886,7 +1886,7 @@ Boolean Options without a valid server COOKIE. A value below 128 is silently raised to 128. The default value is 4096, but the ``max-udp-size`` option may further limit the response size as the default for - ``max-udp-size`` is 1232. + ``max-udp-size`` is 4096. ``sit-secret`` This experimental option is obsolete. diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 4ccf58852a..bc260d222f 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -2099,6 +2099,32 @@ set_tcp_maxseg(isc_socket_t *sock, int size) { #endif /* ifdef TCP_MAXSEG */ } +static void +set_ip_dontfrag(isc_socket_t *sock) { + /* + * Set the Don't Fragment flag on IP packets + */ + if (sock->pf == AF_INET6) { +#if defined(IPV6_DONTFRAG) + (void)setsockopt(sock->fd, IPPROTO_IPV6, IPV6_DONTFRAG, + &(int){ 1 }, sizeof(int)); +#endif +#if defined(IPV6_MTU_DISCOVER) + (void)setsockopt(sock->fd, IPPROTO_IPV6, IPV6_MTU_DISCOVER, + &(int){ IP_PMTUDISC_DO }, sizeof(int)); +#endif + } else if (sock->pf == AF_INET) { +#if defined(IP_DONTFRAG) + (void)setsockopt(sock->fd, IPPROTO_IP, IP_DONTFRAG, &(int){ 1 }, + sizeof(int)); +#endif +#if defined(IP_MTU_DISCOVER) + (void)setsockopt(sock->fd, IPPROTO_IP, IP_MTU_DISCOVER, + &(int){ IP_PMTUDISC_DO }, sizeof(int)); +#endif + } +} + static isc_result_t opensocket(isc_socketmgr_t *manager, isc_socket_t *sock, isc_socket_t *dup_socket) { @@ -2317,53 +2343,8 @@ again: sock->fd, strbuf); } #endif /* IPV6_RECVPKTINFO */ -#if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) - /* - * Turn off Path MTU discovery on IPv6/UDP sockets. - */ - if (sock->pf == AF_INET6) { - int action = IPV6_PMTUDISC_DONT; - (void)setsockopt(sock->fd, IPPROTO_IPV6, - IPV6_MTU_DISCOVER, &action, - sizeof(action)); - } -#endif /* if defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DONT) */ #endif /* defined(USE_CMSG) */ -#if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT) - /* - * Turn off Path MTU discovery on IPv4/UDP sockets. - * Prefer IP_PMTUDISC_OMIT over IP_PMTUDISC_DONT - * if it available. - */ - if (sock->pf == AF_INET) { - int action; -#if defined(IP_PMTUDISC_OMIT) - action = IP_PMTUDISC_OMIT; - if (setsockopt(sock->fd, IPPROTO_IP, IP_MTU_DISCOVER, - &action, sizeof(action)) < 0) - { -#endif /* if defined(IP_PMTUDISC_OMIT) */ - action = IP_PMTUDISC_DONT; - (void)setsockopt(sock->fd, IPPROTO_IP, - IP_MTU_DISCOVER, &action, - sizeof(action)); -#if defined(IP_PMTUDISC_OMIT) - } -#endif /* if defined(IP_PMTUDISC_OMIT) */ - } -#endif /* if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT) */ -#if defined(IP_DONTFRAG) - /* - * Turn off Path MTU discovery on IPv4/UDP sockets. - */ - if (sock->pf == AF_INET) { - int off = 0; - (void)setsockopt(sock->fd, IPPROTO_IP, IP_DONTFRAG, - &off, sizeof(off)); - } -#endif /* if defined(IP_DONTFRAG) */ - #if defined(SET_RCVBUF) optlen = sizeof(size); if (getsockopt(sock->fd, SOL_SOCKET, SO_RCVBUF, (void *)&size, @@ -2430,6 +2411,8 @@ again: #endif /* ifdef IP_RECVTOS */ #endif /* defined(USE_CMSG) || defined(SET_RCVBUF) || defined(SET_SNDBUF) */ + set_ip_dontfrag(sock); + setup_done: inc_stats(manager->stats, sock->statsindex[STATID_OPEN]); if (sock->active == 0) {