faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: set DSCP for IPv6

Browse source 
Chrony's dscp setting currently applies to IPv4 only. This patch sets
the necessary option for IPv6 as well.
This commit is contained in:
Mike Ryan 2022-11-16 09:13:09 -05:00 committed by Miroslav Lichvar
parent e789b0817f
commit 8901293be8
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ntp_io.c
View file

@ -126,8 +126,14 @@ open_socket(int family, int local_port, int client_only, IPSockAddr *remote_addr
dscp = CNF_GetNtpDscp(); dscp = CNF_GetNtpDscp();
if (dscp > 0 && dscp < 64) { if (dscp > 0 && dscp < 64) {
#ifdef IP_TOS #ifdef IP_TOS
if (!SCK_SetIntOption(sock_fd, IPPROTO_IP, IP_TOS, dscp << 2)) if (family == IPADDR_INET4)
; if (!SCK_SetIntOption(sock_fd, IPPROTO_IP, IP_TOS, dscp << 2))
;
#endif
#if defined(FEAT_IPV6) && defined(IPV6_TCLASS)
if (family == IPADDR_INET6)
if (!SCK_SetIntOption(sock_fd, IPPROTO_IPV6, IPV6_TCLASS, dscp << 2))
;
#endif #endif
} }

3
sys_linux.c
View file

@ -633,6 +633,9 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
{ SOL_IP, IP_PKTINFO }, { SOL_IP, IP_FREEBIND }, { SOL_IP, IP_TOS }, { SOL_IP, IP_PKTINFO }, { SOL_IP, IP_FREEBIND }, { SOL_IP, IP_TOS },
#ifdef FEAT_IPV6 #ifdef FEAT_IPV6
{ SOL_IPV6, IPV6_V6ONLY }, { SOL_IPV6, IPV6_RECVPKTINFO }, { SOL_IPV6, IPV6_V6ONLY }, { SOL_IPV6, IPV6_RECVPKTINFO },
#ifdef IPV6_TCLASS
{ SOL_IPV6, IPV6_TCLASS },
#endif
#endif #endif
#ifdef SO_BINDTODEVICE #ifdef SO_BINDTODEVICE
{ SOL_SOCKET, SO_BINDTODEVICE }, { SOL_SOCKET, SO_BINDTODEVICE },