From nobody Mon Jun 9 10:58:56 2025 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 4bG8745M9jz5xxMv; Mon, 09 Jun 2025 10:58:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bG874232rz4Hqy; Mon, 09 Jun 2025 10:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749466736; 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=C2CvhuMkVX1ELpoOC+JKHm5mmIyeJRPywfQKT6LNv/I=; b=TTt0iya9eMHOz8Ont3hqfmRoiWAOkVbO0zJTc807aZ/X+x3iAKbWVDt/tqlI7xF5dB7hnW 9SSIdTEc9leICl8tO7iAgjhiQD2p1Zp91rt2WbFzDjvrvCfEalImJXgMnTGZS2xi+9K70O +2QrzH+6ccocKHGE88rhDGNK42OyUQTCNDj+AQOfO+bPU7ACRnv4Nbpq2AU3jQA7zOMlcE cgq/W+sBz+Xcgo+2Bx5+v8aFfgl7krBt2v3g8dkkTRKRuB4+LLP6eoC8/KsSE2U6Wg1Mx7 nat234TKVllzb/FKFl3N1AaVK1YNXcLhUi4PcQHFt4iuaoO8UgwftxgsPEt1lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749466736; 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=C2CvhuMkVX1ELpoOC+JKHm5mmIyeJRPywfQKT6LNv/I=; b=JhNPTEZ1A+R/0h9di3QYBkFntZUppisxYp/iXfyPAXUhdyDw1w0AMJw3NpFaYkezUq79VG FvVj28tSE9Hu/Ys6xyzAU/TpQkSZkECezLV4QRovMTlCJmZIxMmR03zQ1vnr/SSIM0vCSw btO/20j/3+GX2bMvKdBq+/POQ1oZgLRjPuVt8h/dd9RhoVh3826jNPZq/oBHhPtQpgaxAc bVhyGLCM5XAJDGSbce/95pvGk3/4VN0o/grjzOlsNJva3PZbkMC8X261n3eNLvoC0JwoTo tiH88fMg7RjIotDPbm4N7I9YUgGPJm4PEd4EP3a/8+n4gyRYBhqGP+ZdSrhoVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749466736; a=rsa-sha256; cv=none; b=PcRTlkFE47xqMCkpjbOncykXenvo05HwBfOynkXlwjJG26uihSKm8pEuCsKw4yMg9ihhg7 W5XdxvlW1aHpttrHcJTLj2pQr0J/uVp3WdxbKoPrcnBsxSqwDThSovuZ3cZaG2zNkTNnLm vBitjAvBqlLKtnIbt0H1QPARZkgjTFTOjJxz7t2b/XFxoNEhX1zqk7EBJHhCGzlk805s2K Mfq9dDYv28/XmKlIo6JjFFpNIKwP3VDmser5pYEaQITmOJEFAVg+RYEGvvsKlihsY4UJFW hPfa1kJ2tZWl6+yYhZmtxalfKZFrI4ZF3WB4KInetQrEwvYxJPAVLWFrvwob9A== 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 4bG8741ZlhzsB1; Mon, 09 Jun 2025 10:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 559Awues045153; Mon, 9 Jun 2025 10:58:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 559Awune045150; Mon, 9 Jun 2025 10:58:56 GMT (envelope-from git) Date: Mon, 9 Jun 2025 10:58:56 GMT Message-Id: <202506091058.559Awune045150@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: be0706e8e15d - stable/13 - netcat: Allow service names to be used. 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be0706e8e15de57c7d245abe918f494d90a49934 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=be0706e8e15de57c7d245abe918f494d90a49934 commit be0706e8e15de57c7d245abe918f494d90a49934 Author: Dag-Erling Smørgrav AuthorDate: 2025-05-31 18:07:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-07 06:51:39 +0000 netcat: Allow service names to be used. Someone should really do a vendor import, but it's non-trivial, as we have local modifications. In the meantime, here's a nine-year-old upstream patch which allows service names to be used instead of port numbers. MFC after: 1 week Obtained from: OpenBSD Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D50348 (cherry picked from commit 6d3d1fc3a30453be19831f79399bcba0ae822ad1) --- contrib/netcat/nc.1 | 6 +++--- contrib/netcat/netcat.c | 42 +++++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index 2627920cca15..dadff019e9b8 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/nc.1 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 10, 2020 +.Dd May 14, 2025 .Dt NC 1 .Os .Sh NAME @@ -334,8 +334,8 @@ sockets, a destination is required and is the socket path to connect to option is given). .Pp .Ar port -can be a single integer or a range of ports. -Ranges are in the form nn-mm. +can be a specified as a numeric port number, or as a service name. +Ports may be specified in a range of the form nn-mm. In general, a destination port must be specified, unless the diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c index eb3c7544be76..20bb2d056fce 100644 --- a/contrib/netcat/netcat.c +++ b/contrib/netcat/netcat.c @@ -116,6 +116,7 @@ char *portlist[PORT_MAX+1]; char *unix_dg_tmp_socket; void atelnet(int, unsigned char *, unsigned int); +int strtoport(char *portstr, int udp); void build_ports(char *); void help(void); int local_listen(char *, char *, struct addrinfo); @@ -1145,6 +1146,26 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) } } +int +strtoport(char *portstr, int udp) +{ + struct servent *entry; + const char *errstr; + char *proto; + int port = -1; + + proto = udp ? "udp" : "tcp"; + + port = strtonum(portstr, 1, PORT_MAX, &errstr); + if (errstr == NULL) + return port; + if (errno != EINVAL) + errx(1, "port number %s: %s", errstr, portstr); + if ((entry = getservbyname(portstr, proto)) == NULL) + errx(1, "service \"%s\" unknown", portstr); + return ntohs(entry->s_port); +} + /* * build_ports() * Build an array of ports in portlist[], listing each port @@ -1153,7 +1174,6 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) void build_ports(char *p) { - const char *errstr; char *n; int hi, lo, cp; int x = 0; @@ -1163,13 +1183,8 @@ build_ports(char *p) n++; /* Make sure the ports are in order: lowest->highest. */ - hi = strtonum(n, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, n); - lo = strtonum(p, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, p); - + hi = strtoport(n, uflag); + lo = strtoport(p, uflag); if (lo > hi) { cp = hi; hi = lo; @@ -1198,11 +1213,12 @@ build_ports(char *p) } } } else { - hi = strtonum(p, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, p); - portlist[0] = strdup(p); - if (portlist[0] == NULL) + char *tmp; + + hi = strtoport(p, uflag); + if (asprintf(&tmp, "%d", hi) != -1) + portlist[0] = tmp; + else err(1, NULL); } }