From: Codarren Velvindron <codarren@hackers.mu>
Date: Sun, 15 Apr 2018 16:37:50 +0000 (+0400)
Subject: ntpd: deprecate IPTOS_LOWDELAY in favor of IPTOS_DSCP_AF21
X-Git-Tag: 1_29_0~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c43d431173a73617c079b7945b6629daaa7bca0;p=oweals%2Fbusybox.git

ntpd: deprecate IPTOS_LOWDELAY in favor of IPTOS_DSCP_AF21

Update QoS markers.
Use DSCP AF21 for interactive traffic. DSCP is defined in RFC2474.
Many modern equipment no longer support IPTOS.

Signed-off-by: Codarren Velvindron <codarren@hackers.mu>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/ntpd.c b/networking/ntpd.c
index 6cd497090..a1b8ac5b0 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -93,10 +93,10 @@
 
 #include "libbb.h"
 #include <math.h>
-#include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
+#include <netinet/ip.h> /* For IPTOS_DSCP_AF21 definition */
 #include <sys/timex.h>
-#ifndef IPTOS_LOWDELAY
-# define IPTOS_LOWDELAY 0x10
+#ifndef IPTOS_DSCP_AF21
+# define IPTOS_DSCP_AF21 0x48
 #endif
 
 
@@ -910,7 +910,7 @@ send_query_to_peer(peer_t *p)
 #if ENABLE_FEATURE_IPV6
 		if (family == AF_INET)
 #endif
-			setsockopt_int(fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+			setsockopt_int(fd, IPPROTO_IP, IP_TOS, IPTOS_DSCP_AF21);
 		free(local_lsa);
 	}
 
@@ -2320,7 +2320,7 @@ static NOINLINE void ntp_init(char **argv)
 				xfunc_die();
 		}
 		socket_want_pktinfo(G_listen_fd);
-		setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_LOWDELAY);
+		setsockopt_int(G_listen_fd, IPPROTO_IP, IP_TOS, IPTOS_DSCP_AF21);
 	}
 #endif
 	/* I hesitate to set -20 prio. -15 should be high enough for timekeeping */