From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1921) id 6660A385742A; Mon, 11 Jul 2022 11:55:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6660A385742A Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Sebastian Huber To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] kernel: deprecate Internet Class A/B/C X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Karels X-Git-Refname: refs/heads/master X-Git-Oldrev: 73784208e3f457a5e2aea6016fbc29398be91574 X-Git-Newrev: a9a87c19217336e3738d2fbff91468855c6a307c Message-Id: <20220711115515.6660A385742A@sourceware.org> Date: Mon, 11 Jul 2022 11:55:15 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2022 11:55:15 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Da9a87c19217= 336e3738d2fbff91468855c6a307c commit a9a87c19217336e3738d2fbff91468855c6a307c Author: Mike Karels Date: Tue Oct 26 22:01:09 2021 -0500 kernel: deprecate Internet Class A/B/C =20 Hide historical Class A/B/C macros unless IN_HISTORICAL_NETS is defined; define it for user level. Define IN_MULTICAST separately from IN_CLASS= D, and use it in pf instead of IN_CLASSD. Stop using class for setting default masks when not specified; instead, define new default mask (24 bits). Warn when an Internet address is set without a mask. =20 MFC after: 1 month Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D32708 Diff: --- newlib/libc/sys/rtems/include/netinet/in.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/newlib/libc/sys/rtems/include/netinet/in.h b/newlib/libc/sys/r= tems/include/netinet/in.h index 059f50d9b..4c692b6df 100644 --- a/newlib/libc/sys/rtems/include/netinet/in.h +++ b/newlib/libc/sys/rtems/include/netinet/in.h @@ -342,10 +342,15 @@ __END_DECLS #define IPPORT_MAX 65535 =20 /* - * Definitions of bits in internet address integers. - * On subnets, the decomposition of addresses to host and net parts - * is done according to subnet mask, not the masks here. + * Historical definitions of bits in internet address integers + * (pre-CIDR). Class A/B/C are long obsolete, and now deprecated. + * Hide these definitions from the kernel unless IN_HISTORICAL_NETS + * is defined. Provide the historical definitions to user level for now. */ +#ifndef _KERNEL +#define IN_HISTORICAL_NETS +#endif +#ifdef IN_HISTORICAL_NETS #define IN_CLASSA(i) (((in_addr_t)(i) & 0x80000000) =3D=3D 0) #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NSHIFT 24 @@ -362,12 +367,17 @@ __END_DECLS #define IN_CLASSC_NET 0xffffff00 #define IN_CLASSC_NSHIFT 8 #define IN_CLASSC_HOST 0x000000ff +#endif /* IN_HISTORICAL_NETS */ + +#define IN_NETMASK_DEFAULT 0xffffff00 /* mask when forced to guess */ =20 -#define IN_CLASSD(i) (((in_addr_t)(i) & 0xf0000000) =3D=3D 0xe0000000) +#define IN_MULTICAST(i) (((in_addr_t)(i) & 0xf0000000) =3D=3D 0xe0000000) +#ifdef IN_HISTORICAL_NETS +#define IN_CLASSD(i) IN_MULTICAST(i) #define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ #define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ #define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ -#define IN_MULTICAST(i) IN_CLASSD(i) +#endif /* IN_HISTORICAL_NETS */ =20 #define IN_EXPERIMENTAL(i) (((in_addr_t)(i) & 0xf0000000) =3D=3D 0xf000000= 0) #define IN_BADCLASS(i) (((in_addr_t)(i) & 0xf0000000) =3D=3D 0xf0000000) @@ -398,7 +408,9 @@ __END_DECLS #define INADDR_ALLMDNS_GROUP ((in_addr_t)0xe00000fb) /* 224.0.0.251 */ #define INADDR_MAX_LOCAL_GROUP ((in_addr_t)0xe00000ff) /* 224.0.0.255 */ =20 +#ifdef IN_HISTORICAL_NETS #define IN_LOOPBACKNET 127 /* official! */ +#endif /* IN_HISTORICAL_NETS */ =20 #define IN_RFC3021_MASK ((in_addr_t)0xfffffffe)