svn commit: r366152 - stable/12/sbin/ping6

[Richard Scheffenegger]

Author: rscheff
Date: Fri Sep 25 10:57:11 2020
New Revision: 366152
URL: https://svnweb.freebsd.org/changeset/base/366152

Log:
  MFC r365547: Add -z "TOS" option to ping6, to test DSCP/ECN values
  
  ping has the option to add the (deprecated) TOS byte
  using the -z option. Adding the same option, with the
  same (deprecated) Traffic Class Byte (nowadays actually
  DSCP and ECN fields) to ping6 to validate proper QoS
  processing in network switches.
  
  Reviewed by:	tuexen
  MFC after:	2 weeks
  Sponsored by:	NetApp, Inc.
  Differential Revision:	https://reviews.freebsd.org/D26384

Modified:
  stable/12/sbin/ping6/ping6.8
  stable/12/sbin/ping6/ping6.c

Modified: stable/12/sbin/ping6/ping6.8
==============================================================================
--- stable/12/sbin/ping6/ping6.8	Fri Sep 25 10:49:26 2020	(r366151)
+++ stable/12/sbin/ping6/ping6.8	Fri Sep 25 10:57:11 2020	(r366152)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 22, 2014
+.Dd September 10, 2020
 .Dt PING6 8
 .Os
 .Sh NAME
@@ -87,6 +87,9 @@ packets to network hosts
 .Op Fl s Ar packetsize
 .Ek
 .Bk -words
+.Op Fl z Ar tclass
+.Ek
+.Bk -words
 .Op Ar hops ...
 .Ek
 .Bk -words
@@ -329,6 +332,8 @@ This option is present for backward compatibility.
 has no effect if
 .Fl w
 is specified.
+.It Fl z Ar tclass
+Use the specified traffic class when sending.
 .It Ar hops
 IPv6 addresses for intermediate nodes,
 which will be put into type 0 routing header.

Modified: stable/12/sbin/ping6/ping6.c
==============================================================================
--- stable/12/sbin/ping6/ping6.c	Fri Sep 25 10:49:26 2020	(r366151)
+++ stable/12/sbin/ping6/ping6.c	Fri Sep 25 10:57:11 2020	(r366152)
@@ -229,6 +229,7 @@ static char *hostname;
 static int ident;		/* process id to identify our packets */
 static u_int8_t nonce[8];	/* nonce field for node information */
 static int hoplimit = -1;	/* hoplimit */
+static int tclass = -1;		/* traffic class */
 static u_char *packet = NULL;
 static cap_channel_t *capdns;
 
@@ -351,7 +352,7 @@ main(int argc, char *argv[])
 #endif /*IPSEC_POLICY_IPSEC*/
 #endif
 	while ((ch = getopt(argc, argv,
-	    "a:b:c:DdfHg:h:I:i:l:mnNop:qrRS:s:tvwWx:X:" ADDOPTS)) != -1) {
+	    "a:b:c:DdfHg:h:I:i:l:mnNop:qrRS:s:tvwWx:X:z:" ADDOPTS)) != -1) {
 #undef ADDOPTS
 		switch (ch) {
 		case 'a':
@@ -576,6 +577,14 @@ main(int argc, char *argv[])
 				    optarg, MAXALARM);
 			alarm((int)alarmtimeout);
 			break;
+		case 'z':		/* traffic class */
+			tclass = strtol(optarg, &e, 10);
+			if (*optarg == '\0' || *e != '\0')
+				errx(1, "illegal traffic class %s", optarg);
+			if (255 < tclass || tclass < -1)
+				errx(1,
+				    "illegal traffic class -- %s", optarg);
+			break;
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
 		case 'P':
@@ -926,6 +935,12 @@ main(int argc, char *argv[])
 		memcpy(CMSG_DATA(scmsgp), &hoplimit, sizeof(hoplimit));
 
 		scmsgp = CMSG_NXTHDR(&smsghdr, scmsgp);
+	}
+
+	if (tclass != -1) {
+		if (setsockopt(ssend, IPPROTO_IPV6, IPV6_TCLASS,
+		    &tclass, sizeof(tclass)) == -1)
+			err(1, "setsockopt(IPV6_TCLASS)");
 	}
 
 	if (argc > 1) {	/* some intermediate addrs are specified */