From nobody Fri Dec 10 16:29:11 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40AB718D6A16; Fri, 10 Dec 2021 16:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J9bvX479sz3F7h; Fri, 10 Dec 2021 16:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1542A1D36E; Fri, 10 Dec 2021 16:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BAGTBOT076933; Fri, 10 Dec 2021 16:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAGTBaS076932; Fri, 10 Dec 2021 16:29:11 GMT (envelope-from git) Date: Fri, 10 Dec 2021 16:29:11 GMT Message-Id: <202112101629.1BAGTBaS076932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: d98a0edb267e - stable/13 - man pages: deprecate Internet Class A/B/C List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d98a0edb267efb468c7631cc83dc401217a28142 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639153753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIBSkkvYQle5w3cC58K8RF7I4KLUdtLfa2xpf8n6+as=; b=g2jibAMcRMDx9G5KfKwq/L1o0tVk9mwqRRIRnf3eMZAVV7gEKaaf8jZltgZrq5vxKelOlu 3WXgPUL78jys7jcczGKd8PdR9Qa6bwx7DCR5BP7UvIInHk8GUZdBh2cwclwgofcckCr0+a DaVoZG5ma+t+95l8cMvJCmeQ0ONJYpb/msQ7Tjpi7pl1FEW9zb2a8XxaRURejEX6iLBIcJ 7HSUROCdw7pBcAymeYIx/ZWeqVySSF3VGCH+6NKYD/idCivvRhWTMgogdD7CBJyxJ0UCJj nNtcW3MNKJ37Q0yICVHhIkVXH8mtV2McxxUbFKZzt03zFMYGmnfEA+clDw2GJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639153753; a=rsa-sha256; cv=none; b=PT531tvwSzV+ijLyu1ChIo5lMcloeK1+7R4PcsoZOW7FoatPtayAxdct897PjOgJUNnMCL CLqzG0rgc2HYkzfMCo3QpsmLn66oqygkdhzxO6pf5QZQD2ttsmxZOG4IO92BQnrTJ5h89X w8CrUJyG8rk49yp75QEGGf57UFj1LrAhY4EtZISXwSplWFnt4p9KTPzASVblDGJ3AzKMTz UOD33g+IGxxbMJmZcthYPPVXvG6h05quhp1h8zEGvvzElrwil05D9NShi9DjJHgJAsom0G lSocWW3Zj7xAYX5HlI25FanVtvT3JpPQDe75oScqehIxgNS9HDcpYzxHUmkuzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=d98a0edb267efb468c7631cc83dc401217a28142 commit d98a0edb267efb468c7631cc83dc401217a28142 Author: Mike Karels AuthorDate: 2021-10-27 03:25:09 +0000 Commit: Mike Karels CommitDate: 2021-12-10 16:25:45 +0000 man pages: deprecate Internet Class A/B/C Mark functions inet_netof(), inet_lnaof(), and inet_makeaddr() as deprecated, as they assume Class A/B/C. inet_makeaddr() mostly works when networks are a multiple of 8 bits, but warn for anything other than historical classes. Reduce other mentions of network classes. (cherry picked from commit 12bd931d8c64ad2d5e78c7ab917efbff326152ca) --- lib/libc/net/inet.3 | 24 ++++++++++-------------- lib/libc/net/inet_net.3 | 12 +++--------- share/man/man5/resolver.5 | 11 ++++++----- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3 index a36cb313f7d3..cb44394d0a0c 100644 --- a/lib/libc/net/inet.3 +++ b/lib/libc/net/inet.3 @@ -28,7 +28,7 @@ .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 14, 2007 +.Dd November 9, 2021 .Dt INET 3 .Os .Sh NAME @@ -157,18 +157,20 @@ The routine .Fn inet_ntoa_r is the reentrant version of .Fn inet_ntoa . -The routine +The deprecated routine .Fn inet_makeaddr takes an Internet network number and a local -network address and constructs an Internet address +host address on that network, and constructs an Internet address from it. -The routines +It should only be assumed to work for historical class A/B/C networks. +The deprecated routines .Fn inet_netof and .Fn inet_lnaof break apart Internet host addresses, returning -the network number and local network address part, -respectively. +the network number and local host address part, +respectively, +assuming the historical class A/B/C network masks. .Pp All Internet addresses are returned in network order (bytes ordered from left to right). @@ -203,17 +205,11 @@ ordered from right to left. .Pp When a three part address is specified, the last part is interpreted as a 16-bit quantity and placed -in the right-most two bytes of the network address. -This makes the three part address format convenient -for specifying Class B network addresses as -.Dq Li 128.net.host . +in the least significant two bytes of the network address. .Pp When a two part address is supplied, the last part is interpreted as a 24-bit quantity and placed in -the right most three bytes of the network address. -This makes the two part address format convenient -for specifying Class A network addresses as -.Dq Li net.host . +the least significant three bytes of the network address. .Pp When only one part is given, the value is stored directly in the network address without any byte diff --git a/lib/libc/net/inet_net.3 b/lib/libc/net/inet_net.3 index f0721729ff05..4028984bd09b 100644 --- a/lib/libc/net/inet_net.3 +++ b/lib/libc/net/inet_net.3 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 18, 2016 +.Dd November 9, 2021 .Dt INET_NET 3 .Os .Sh NAME @@ -120,17 +120,11 @@ That is, little-endian bytes are ordered from right to left. .Pp When a three part number is specified, the last part is interpreted as a 16-bit quantity and placed -in the rightmost two bytes of the Internet network number. -This makes the three part number format convenient -for specifying Class B network numbers as -.Dq Li 128.net.host . +in the least significant two bytes of the Internet network number. .Pp When a two part number is supplied, the last part is interpreted as a 24-bit quantity and placed in -the rightmost three bytes of the Internet network number. -This makes the two part number format convenient -for specifying Class A network numbers as -.Dq Li net.host . +the least significant three bytes of the Internet network number. .Pp When only one part is given, the value is stored directly in the Internet network number without any byte diff --git a/share/man/man5/resolver.5 b/share/man/man5/resolver.5 index cc439f123442..21e1f8f99131 100644 --- a/share/man/man5/resolver.5 +++ b/share/man/man5/resolver.5 @@ -28,7 +28,7 @@ .\" @(#)resolver.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd August 16, 2018 +.Dd November 9, 2021 .Dt RESOLVER 5 .Os .Sh NAME @@ -104,15 +104,16 @@ with a total of 256 characters. .It Sy sortlist Sortlist allows addresses returned by gethostbyname to be sorted. A sortlist is specified by IP address netmask pairs. -The netmask is -optional and defaults to the natural netmask of the net. +If the netmask is not specified, +it defaults to the historical Class A/B/C netmask of the net; +this usage is deprecated. The IP address -and optional network pairs are separated by slashes. +and network pairs are separated by slashes. Up to 10 pairs may be specified. E.g., .Pp -.Dl "sortlist 130.155.160.0/255.255.240.0 130.155.0.0" +.Dl "sortlist 10.9.1.0/255.255.240.0 10.9.0.0/255.255.0.0" .It Sy options Options allows certain internal resolver variables to be modified. The syntax is