From nobody Thu Oct 16 07:13:28 2025 X-Original-To: dev-commits-src-all@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 4cnK1P0Y2zz6CgB9; Thu, 16 Oct 2025 07:13:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnK1N70CKz3Kpt; Thu, 16 Oct 2025 07:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760598809; 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=uIpUGa7TF3S7uZ0HNim6IdGjEpqacv+icl3KwCEl/3o=; b=bZZ0PIIj7DKkmO49S7z/uJYQPAAI9KY/OG+97+DP3wF1ZFAny0sfE+pgr3OImXmC4Gbawz 5MhDaUmTKjwc1swPtSKeDm8lRpQBok/+KUG8cldvfNgZm7ielRSjO+r/E+KupHh/qQwnip 0GX6ftYUMetQlOvfENxKK3dcc4irjMwf71T/bcM9LUqstzLef7K7MQvg4FOTKnYsAIzser wD0X45yj+WN02UZYwlB8hqFGjY4AiZ9bCP+1rLChIkazqpgnJ6rDlE3EC0anuooYcS1yVq mHdM4f+yBN0LWMAEeV5HijcxNU0PDVsQMm1NLM0FHYFcRAGelom0h5U5i/p7Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760598809; 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=uIpUGa7TF3S7uZ0HNim6IdGjEpqacv+icl3KwCEl/3o=; b=TQ28wWbS/k/JeWisbHHGh/P45KvMQb3BIFeq4KM8Gpluzr9ZBFNpOgt/O+Vy0aRL0XEZMQ 5/jFFI4C5S0jsC7ARPSpRodRMZQSFAzUxrqpO5QrOpmXtyvUme94nEHjtiLHJAMQ7TDpTc czbMiDsr2MuK6/fCBA6omWVe5VbAytrf2lZwR/4fr8UYOnnP7C5Wp7WgKq8SdzQNGJnyfy oGqvGiA0aroj2WYYoOQ01Yerc8P1F1krNSpwFrAXjeJtom0TSAtu7BVlf4BMOR51iXcyzm YFlSmLq8FHXwPRtJgMBJzaOy1lFa140zNwRMzXUFpIEfZ4JNVGOi6WDVXUBc4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760598809; a=rsa-sha256; cv=none; b=a1YvI3oJrGMEg9hTvaZFIIY5ckdZzsasn5r9qdBGiAQNvayw6W90fKj6AZM3Qpj3yOEtLC 3HYycpF1xvJBQPncjLldcBcLzm7oD7DIRIBRqD2NN4xUNktBfIAr3hwf64UJreHo+FQe51 dl+WdS95XvwOQJNaADdF3tegtz8Je0HDQHdVhCZjmK1IJoMiFNE5M1r972//KXRDNCI2zi /hfQ7b3iXMDykiIjHCY1jM0vmK8XDKHmqcB3v0jgaL+kdcF2whX7huvVJt0RpD133hfN6j +VB4Aq023ZMnCpy2B0Y0+aNE3Jwh2QlYoi/YtoALNV0kM+GyJcfA0/Pf1Yj+6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cnK1N6Yk7z1Cs1; Thu, 16 Oct 2025 07:13:28 +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 59G7DSKx064272; Thu, 16 Oct 2025 07:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G7DSPL064269; Thu, 16 Oct 2025 07:13:28 GMT (envelope-from git) Date: Thu, 16 Oct 2025 07:13:28 GMT Message-Id: <202510160713.59G7DSPL064269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 057bc783c67e - stable/14 - arp(8): allow -i with -s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 057bc783c67e8196d0b8c8c60a7eee6f7dc05805 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=057bc783c67e8196d0b8c8c60a7eee6f7dc05805 commit 057bc783c67e8196d0b8c8c60a7eee6f7dc05805 Author: Lexi Winter AuthorDate: 2024-05-05 18:21:06 +0000 Commit: Eugene Grosbein CommitDate: 2025-10-16 07:12:22 +0000 arp(8): allow -i with -s arp(8) usually disallows adding a static ARP entry for an IP address which is not configured on a local interface. Change this to allow such ARP entries to be added if '-i' is provided to specify the interface the ARP entry relates to. Due to limitations in the kernel lltable, this still requires that a host route exists for the target address, but allows static ARP entries to be configured to proxy ARP for, e.g., local jails which use an IPv4 address with a /32 route. Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/1220 (cherry picked from commit 2356b60be7024b10ddc4361fc22f96205b55fbbb) --- usr.sbin/arp/arp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index fa2c595379d5..200912736137 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -156,7 +156,7 @@ main(int argc, char *argv[]) if (!func) func = F_GET; if (opts.rifname) { - if (func != F_GET && !(func == F_DELETE && opts.aflag)) + if (func != F_GET && func != F_SET && !(func == F_DELETE && opts.aflag)) xo_errx(1, "-i not applicable to this operation"); if ((opts.rifindex = if_nametoindex(opts.rifname)) == 0) { if (errno == ENXIO) @@ -387,7 +387,7 @@ set(int argc, char **argv) } } #ifndef WITHOUT_NETLINK - return (set_nl(0, dst, &sdl_m, host)); + return (set_nl(opts.rifindex, dst, &sdl_m, host)); #else return (set_rtsock(dst, &sdl_m, host)); #endif