Add SCTP and TCP as protocols for sending probe packets.

MFC after:	4 weeks

2 files changed, 244 insertions, 8 deletions

diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index d52950a95268b..4aa51553b7579 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -40,7 +40,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl adIlnNrUv
+.Op Fl adIlnNrSTUv
 .Ek
 .Bk -words
 .Op Fl f Ar firsthop
@@ -119,7 +119,7 @@ Do not resolve numeric address to hostname.
 Use a packet with no upper layer header for the probes,
 instead of UDP datagrams.
 .It Fl p Ar port
-Set UDP port number to
+Set SCTP/TCP/UDP port number to
 .Ar port .
 .It Fl q Ar probes
 Set the number of probe per hop count to
@@ -138,6 +138,10 @@ that has no route through it
 .It Fl s Ar src
 .Ar Src
 specifies the source IPv6 address to be used.
+.It Fl S
+Use SCTP packets for the probes.
+.It Fl T
+Use TCP segments for the probes.
 .It Fl U
 Use UDP datagrams for the probes.
 This is the default.
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index f5b2f47a9d82c..af6a4704ccc3e 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -271,6 +271,8 @@ static const char rcsid[] =
 
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
+#include <netinet/sctp.h>
+#include <netinet/tcp.h>
 #include <netinet/udp.h>
 
 #ifdef IPSEC
@@ -307,10 +309,14 @@ const char *pr_type(int);
 int	packet_ok(struct msghdr *, int, int);
 void	print(struct msghdr *, int);
 const char *inetname(struct sockaddr *);
+u_int32_t sctp_crc32c(void *, u_int32_t);
+u_int16_t in_cksum(u_int16_t *addr, int);
+u_int16_t tcp_chksum(struct sockaddr_in6 *, struct sockaddr_in6 *,
+    void *, u_int32_t);
 void	usage(void);
 
 int rcvsock;			/* receive (icmp) socket file descriptor */
-int sndsock;			/* send (udp) socket file descriptor */
+int sndsock;			/* send (raw/udp) socket file descriptor */
 
 struct msghdr rcvmhdr;
 struct iovec rcviov[2];
@@ -394,8 +400,9 @@ main(int argc, char *argv[])
 #endif
 
 	seq = 0;
+	ident = htons(getpid() & 0xffff); /* same as ping6 */
 
-	while ((ch = getopt(argc, argv, "aA:df:g:Ilm:nNp:q:rs:Uvw:")) != -1)
+	while ((ch = getopt(argc, argv, "aA:df:g:Ilm:nNp:q:rs:STUvw:")) != -1)
 		switch (ch) {
 		case 'a':
 			as_path = 1;
@@ -455,7 +462,6 @@ main(int argc, char *argv[])
 			break;
 		case 'I':
 			useproto = IPPROTO_ICMPV6;
-			ident = htons(getpid() & 0xffff); /* same as ping6 */
 			break;
 		case 'l':
 			lflag++;
@@ -516,6 +522,12 @@ main(int argc, char *argv[])
 			 */
 			source = optarg;
 			break;
+		case 'S':
+			useproto = IPPROTO_SCTP;
+			break;
+		case 'T':
+			useproto = IPPROTO_TCP;
+			break;
 		case 'U':
 			useproto = IPPROTO_UDP;
 			break;
@@ -557,7 +569,9 @@ main(int argc, char *argv[])
 		}
 		break;
 	case IPPROTO_NONE:
-		if ((sndsock = socket(AF_INET6, SOCK_RAW, IPPROTO_NONE)) < 0) {
+	case IPPROTO_SCTP:
+	case IPPROTO_TCP:
+		if ((sndsock = socket(AF_INET6, SOCK_RAW, useproto)) < 0) {
 			perror("socket(SOCK_RAW)");
 			exit(5);
 		}
@@ -641,6 +655,12 @@ main(int argc, char *argv[])
 		minlen = 0;
 		datalen = 0;
 		break;
+	case IPPROTO_SCTP:
+		minlen = sizeof(struct sctphdr);
+		break;
+	case IPPROTO_TCP:
+		minlen = sizeof(struct tcphdr);
+		break;
 	default:
 		fprintf(stderr, "traceroute6: unknown probe protocol %d.\n",
 		    useproto);
@@ -1026,6 +1046,9 @@ void
 send_probe(int seq, u_long hops)
 {
 	struct icmp6_hdr *icp;
+	struct sctphdr *sctp;
+	struct sctp_chunkhdr *chk;
+	struct tcphdr *tcp;
 	int i;
 
 	i = hops;
@@ -1051,6 +1074,43 @@ send_probe(int seq, u_long hops)
 	case IPPROTO_NONE:
 		/* No space for anything. No harm as seq/tv32 are decorative. */
 		break;
+	case IPPROTO_SCTP:
+		sctp = (struct sctphdr *)outpacket;
+
+		sctp->src_port = htons(ident);
+		sctp->dest_port = htons(port + seq);
+		sctp->v_tag = (sctp->src_port << 16) | sctp->dest_port;
+		sctp->checksum = htonl(0);
+		if (datalen >= (u_long)(sizeof(struct sctphdr) +
+		    sizeof(struct sctp_chunkhdr))) {
+			chk = (struct sctp_chunkhdr *)(sctp + 1);
+			chk->chunk_type = SCTP_SHUTDOWN_ACK;
+			chk->chunk_flags = 0;
+			chk->chunk_length = htons(4);
+		}
+		if (datalen >= (u_long)(sizeof(struct sctphdr) +
+		    2 * sizeof(struct sctp_chunkhdr))) {
+			chk = chk + 1;
+			chk->chunk_type = SCTP_PAD_CHUNK;
+			chk->chunk_flags = 0;
+			chk->chunk_length = htons((u_int16_t)(datalen -
+			    sizeof(struct sctphdr) -
+			    sizeof(struct sctp_chunkhdr)));
+		}
+		sctp->checksum = sctp_crc32c(outpacket, datalen);
+		break;
+	case IPPROTO_TCP:
+		tcp = (struct tcphdr *)outpacket;
+
+		tcp->th_sport = htons(ident);
+		tcp->th_dport = htons(port + seq);
+		tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport;
+		tcp->th_ack = 0;
+		tcp->th_off = 5;
+		tcp->th_flags = TH_SYN;
+		tcp->th_sum = 0;
+		tcp->th_sum = tcp_chksum(&Src, &Dst, outpacket, datalen);
+		break;
 	default:
 		fprintf(stderr, "Unknown probe protocol %d.\n", useproto);
 		exit(1);
@@ -1228,6 +1288,8 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
 	    || type == ICMP6_DST_UNREACH) {
 		struct ip6_hdr *hip;
 		struct icmp6_hdr *icmp;
+		struct sctphdr *sctp;
+		struct tcphdr *tcp;
 		struct udphdr *udp;
 		void *up;
 
@@ -1252,6 +1314,24 @@ packet_ok(struct msghdr *mhdr, int cc, int seq)
 				return (type == ICMP6_TIME_EXCEEDED ?
 				    -1 : code + 1);
 			break;
+		case IPPROTO_SCTP:
+			sctp = (struct sctphdr *)up;
+			if (sctp->src_port == htons(ident) &&
+			    sctp->dest_port == htons(port + seq) &&
+			    sctp->v_tag ==
+			    (u_int32_t)((sctp->src_port << 16) | sctp->dest_port))
+				return (type == ICMP6_TIME_EXCEEDED ?
+				    -1 : code + 1);
+			break;
+		case IPPROTO_TCP:
+			tcp = (struct tcphdr *)up;
+			if (tcp->th_sport == htons(ident) &&
+			    tcp->th_dport == htons(port + seq) &&
+			    tcp->th_seq ==
+			    (tcp_seq)((tcp->th_sport << 16) | tcp->th_dport))
+				return (type == ICMP6_TIME_EXCEEDED ?
+				    -1 : code + 1);
+			break;
 		case IPPROTO_NONE:
 			return (type == ICMP6_TIME_EXCEEDED ?  -1 : code + 1);
 		default:
@@ -1312,10 +1392,11 @@ get_uphdr(struct ip6_hdr *ip6, u_char *lim)
 	while (lim - cp >= (nh == IPPROTO_NONE ? 0 : 8)) {
 		switch (nh) {
 		case IPPROTO_ESP:
-		case IPPROTO_TCP:
 			return(NULL);
 		case IPPROTO_ICMPV6:
 			return(useproto == nh ? cp : NULL);
+		case IPPROTO_SCTP:
+		case IPPROTO_TCP:
 		case IPPROTO_UDP:
 			return(useproto == nh ? cp : NULL);
 		case IPPROTO_NONE:
@@ -1410,12 +1491,163 @@ inetname(struct sockaddr *sa)
 	return line;
 }
 
+/*
+ * CRC32C routine for the Stream Control Transmission Protocol
+ */
+
+#define CRC32C(c, d) (c = (c>>8) ^ crc_c[(c^(d))&0xFF])
+
+static u_int32_t crc_c[256] = {
+	0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
+	0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+	0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+	0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+	0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
+	0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+	0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
+	0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+	0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+	0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+	0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
+	0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+	0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
+	0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+	0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+	0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+	0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
+	0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+	0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
+	0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+	0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+	0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+	0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
+	0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+	0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
+	0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+	0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+	0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+	0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
+	0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+	0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
+	0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+	0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+	0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+	0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
+	0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+	0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
+	0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+	0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+	0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+	0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
+	0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+	0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
+	0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+	0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+	0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+	0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
+	0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+	0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
+	0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+	0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+	0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+	0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
+	0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+	0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
+	0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+	0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+	0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+	0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
+	0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+	0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
+	0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+	0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+	0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351
+};
+
+u_int32_t
+sctp_crc32c(void *packet, u_int32_t len)
+{
+	u_int32_t i, crc32c;
+	u_int8_t byte0, byte1, byte2, byte3;
+	u_int8_t *buf = (u_int8_t *)packet;
+
+	crc32c = ~0;
+	for (i = 0; i < len; i++)
+		CRC32C(crc32c, buf[i]);
+	crc32c = ~crc32c;
+	byte0  = crc32c & 0xff;
+	byte1  = (crc32c>>8) & 0xff;
+	byte2  = (crc32c>>16) & 0xff;
+	byte3  = (crc32c>>24) & 0xff;
+	crc32c = ((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3);
+	return htonl(crc32c);
+}
+
+u_int16_t
+in_cksum(u_int16_t *addr, int len)
+{
+	int nleft = len;
+	u_int16_t *w = addr;
+	u_int16_t answer;
+	int sum = 0;
+
+	/*
+	 *  Our algorithm is simple, using a 32 bit accumulator (sum),
+	 *  we add sequential 16 bit words to it, and at the end, fold
+	 *  back all the carry bits from the top 16 bits into the lower
+	 *  16 bits.
+	 */
+	while (nleft > 1)  {
+		sum += *w++;
+		nleft -= 2;
+	}
+
+	/* mop up an odd byte, if necessary */
+	if (nleft == 1)
+		sum += *(u_char *)w;
+
+	/*
+	 * add back carry outs from top 16 bits to low 16 bits
+	 */
+	sum = (sum >> 16) + (sum & 0xffff);	/* add hi 16 to low 16 */
+	sum += (sum >> 16);			/* add carry */
+	answer = ~sum;				/* truncate to 16 bits */
+	return (answer);
+}
+
+u_int16_t
+tcp_chksum(struct sockaddr_in6 *src, struct sockaddr_in6 *dst,
+    void *payload, u_int32_t len)
+{
+	struct {
+		struct in6_addr src;
+		struct in6_addr dst;
+		u_int32_t len;
+		u_int8_t zero[3];
+		u_int8_t next;
+	} pseudo_hdr;
+	u_int16_t sum[2];
+
+	pseudo_hdr.src = src->sin6_addr;
+	pseudo_hdr.dst = dst->sin6_addr;
+	pseudo_hdr.len = htonl(len);
+	pseudo_hdr.zero[0] = 0;
+	pseudo_hdr.zero[1] = 0;
+	pseudo_hdr.zero[2] = 0;
+	pseudo_hdr.next = IPPROTO_TCP;
+
+	sum[1] = in_cksum((u_int16_t *)&pseudo_hdr, sizeof(pseudo_hdr));
+	sum[0] = in_cksum(payload, len);
+
+	return (~in_cksum(sum, sizeof(sum)));
+}
+
 void
 usage(void)
 {
 
 	fprintf(stderr,
-"usage: traceroute6 [-adIlnNrUv] [-A as_server] [-f firsthop] [-g gateway]\n"
+"usage: traceroute6 [-adIlnNrSTUv] [-A as_server] [-f firsthop] [-g gateway]\n"
 "       [-m hoplimit] [-p port] [-q probes] [-s src] [-w waittime] target\n"
 "       [datalen]\n");
 	exit(1);