Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Jul 2020 06:47:38 +0000 (UTC)
From:      Tom Jones <thj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r363413 - stable/12/sys/netinet
Message-ID:  <202007220647.06M6lcXH029713@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thj
Date: Wed Jul 22 06:47:38 2020
New Revision: 363413
URL: https://svnweb.freebsd.org/changeset/base/363413

Log:
  MFC r350749, r362275
  
  r350749:
  Rename IPPROTO 33 from SEP to DCCP
  
  IPPROTO 33 is DCCP in the IANA Registry:
  https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
  
  IPPROTO_SEP was added about 20 years ago in r33804. The entries were added
  straight from RFC1700, without regard to whether they were used.
  
  The reference in RFC1700 for SEP is '[JC120] <mystery contact>', this is an
  indication that the protocol number was probably in use in a private network.
  
  As RFC1700 is no longer the authoritative list of internet numbers and that
  IANA assinged 33 to DCCP in RFC4340, change the header to the actual
  authoritative source.
  
  Reviewed by:	Richard Scheffenegger, bz
  Approved by:	bz (mentor)
  Differential Revision:	https://reviews.freebsd.org/D21178
  
  r362275:
  Add header definition for RFC4340, Datagram Congestion Control Protocol
  
  Add a header definition for DCCP as defined in RFC4340. This header definition
  is required to perform validation when receiving and forwarding DCCP packets.
  We do not currently support DCCP.
  
  Reviewed by:	gallatin, bz
  Approved by:	bz (co-mentor)
  MFC with:	350749
  Differential Revision:	https://reviews.freebsd.org/D21179

Added:
  stable/12/sys/netinet/dccp.h
     - copied unchanged from r362275, head/sys/netinet/dccp.h
Modified:
  stable/12/sys/netinet/in.h
Directory Properties:
  stable/12/   (props changed)

Copied: stable/12/sys/netinet/dccp.h (from r362275, head/sys/netinet/dccp.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/12/sys/netinet/dccp.h	Wed Jul 22 06:47:38 2020	(r363413, copy of r362275, head/sys/netinet/dccp.h)
@@ -0,0 +1,78 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2019 Tom Jones <thj@freebsd.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _NETINET_DCCP_H_
+#define _NETINET_DCCP_H_
+
+/* DCCP protocol header as per RFC4340 */
+struct dccphdr {
+	uint16_t	d_sport;
+	uint16_t	d_dport;
+	uint8_t		d_doff;
+#if BYTE_ORDER == LITTLE_ENDIAN
+	uint8_t		d_cscov:4,
+			d_ccval:4;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	uint8_t		d_ccval:4,
+			d_cscov:4;
+#endif
+	uint8_t		d_cksum[2];
+#if BYTE_ORDER == LITTLE_ENDIAN
+	uint8_t		d_res:3,
+			d_type:4,
+			d_x:1;
+#endif
+#if BYTE_ORDER == BIG_ENDIAN
+	uint8_t		d_x:1,
+			d_type:4,
+			d_res:3;
+#endif
+       /*
+        * Provide enough space for both the short (24 bit) sequence number and
+        * the long (48 bit) sequene number and a leading reserved byte in
+        * front of the long sequence number.
+        */
+       union dccp_seqno {
+               uint8_t shortseq[3];
+               struct dccp_long_seqno {
+                       uint8_t res;
+                       uint8_t seq[6];
+               } longseq;
+       } d_seqno;
+};
+
+#define d_seqno_short d_seqno.shortseq;
+#define d_seqno_long d_seqno.longseq.seq;
+
+#define DCCP_SHORTHDR	12
+#define DCCP_LONGHDR	16
+#define DCCP_EXTHDR	0x80
+
+#endif /* _NETINET_DCCP_H */

Modified: stable/12/sys/netinet/in.h
==============================================================================
--- stable/12/sys/netinet/in.h	Wed Jul 22 06:45:24 2020	(r363412)
+++ stable/12/sys/netinet/in.h	Wed Jul 22 06:47:38 2020	(r363413)
@@ -169,7 +169,7 @@ __END_DECLS
 #define	IPPROTO_BLT		30		/* Bulk Data Transfer */
 #define	IPPROTO_NSP		31		/* Network Services */
 #define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
+#define	IPPROTO_DCCP		33		/* Datagram Congestion Control Protocol */
 #define	IPPROTO_3PC		34		/* Third Party Connect */
 #define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
 #define	IPPROTO_XTP		36		/* XTP */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007220647.06M6lcXH029713>