From nobody Thu May 23 20:04:15 2024 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 4VlfJb4FRcz5LCx3; Thu, 23 May 2024 20:04:15 +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 4VlfJb3dZVz3wyF; Thu, 23 May 2024 20:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716494655; 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=NCuTtKmSHVnOpwkZTdqpVDqp9oSpUAqC6UAu/xEmSU0=; b=Tx9JKaVF0Wc4p0Mq/pYhLrCdx/+qITnKk/gfpVQSL01IycDmdINOYRTvta2Og8p8WyCXGx 3wanHtXvoJ1JSvr+foVzaDQH8U1Cg5e6hoktzG4JA+PYkLj332AaHGwnj2LS9ddIgW2fg5 Ss5KbYfH9cVWkLF0zOYJMX7f7Hc3UlGuvD9aN45CVgYnotlzhVMGWZJyTCFpPin2M+8NO6 KXPn3zldyn5byBTB+TEllBQxltvATsxAut8lYBE60iqXw165+nUi/4EXc5W7RL0ScranSd Wu5X+0VHOddvPE0azdO914+c+irHvrwjvBbtg5PNE05WPzo8xEsHi1vnvdAeSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716494655; a=rsa-sha256; cv=none; b=hlhyHu5VTYHKJOlpqXjI8sTQHMVv389MDtakC0GDh2BIM/+qvMW/NOETbseQLoV21mihfG MvbiaslMg7gokh3o2srYFHGW9Hqc9AxKQqhO0+c+XAB3GGSE4itJ12Wax1uazlO441VvE7 JoJ34vMyF8K6Lotw8Xy0VdWNo+Si7lx45KNjuURv6VOfbcgSv6vmxCAFYB1eBLDaY7x9M1 e29AZ2CMMUzYvHeVSCrtdHGqX6eoXY/WAV0dH+g/he+eeGu2pHkX7r7I/qMhjTZSqa4JpX yNQDZOULKxpRP9KwcmvFcvYIqru5OiiRw4b7pRA1pTA0w4Xxr/sr+6skgRNbRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716494655; 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=NCuTtKmSHVnOpwkZTdqpVDqp9oSpUAqC6UAu/xEmSU0=; b=A0PNN7AlOzz06ZQO8jZ4+xygvI8+6m2cmCqUgW+mNTYRFZNcxaYFTs//pOrDKcIaIMrZhw bmCac3XRyOQkkpIGCoh1uXvaekM7KNcsDMVqWQnR/KhGCzkJYJcmQT3gJwU/DwDgza8rZp LKcfa6iLkv0yDJaaDASbbDzz1lU5UHyx/K5khKUFB5hdY6Gim+m8SwC01IMBfGwSmqh924 fB7EJvhffFDjKhxcnz/t9EHzsu4SGsnBC7WOlzxSqAcIUfjFl9LX6oe7GEJ6/eJ/n3/ic2 Tpsc78A0CkUkMFWKQQlzvSiwjHyG6jIuA4Uytk+NyHSiwfeAKOyzfvBQpG0hYg== 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 4VlfJb3FD5z13Wp; Thu, 23 May 2024 20:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44NK4FnZ021453; Thu, 23 May 2024 20:04:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44NK4Fjx021450; Thu, 23 May 2024 20:04:15 GMT (envelope-from git) Date: Thu, 23 May 2024 20:04:15 GMT Message-Id: <202405232004.44NK4Fjx021450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2356b60be702 - main - 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2356b60be7024b10ddc4361fc22f96205b55fbbb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2356b60be7024b10ddc4361fc22f96205b55fbbb commit 2356b60be7024b10ddc4361fc22f96205b55fbbb Author: Lexi Winter AuthorDate: 2024-05-05 18:21:06 +0000 Commit: Warner Losh CommitDate: 2024-05-23 20:02:57 +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 --- 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 e5b94ca053e1..8cd18d875820 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -144,7 +144,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) @@ -375,7 +375,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