From nobody Thu Aug 6 16:19:37 2026 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 4hGCCy5hxVz6nHvD for ; Thu, 06 Aug 2026 16:19:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGCCy2LXrz3RYH for ; Thu, 06 Aug 2026 16:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786033182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nF9BJ3hC4SuGGXipf6RUzl6Iab49c9e2TX1IPvi1OOk=; b=u3FTl1/88rrKZAyortXPq4AXdAWcCS1LPoGaJwCGVYSKseDreIdsYQtM7meBsIBer0oW5V cPhtyOfTj6MJ/qkQhAs4YhciPaWRFC5MyaADXHjtle39Rt7nc/Cn6V1MQaH9NIt1ihi34R ksNJJ7UpPafXVve4lSquYxfUH1/BhLRTEzMdElqQwnJQEoGn5qeLW/lVY+zTnmMjXxrdwQ eVcB46xj5ajxERw07DPkwaWI0hrLRs9FqR4piOnPppMrluXfBkXZ7bISnrbaEY15ZX2Dbu ULPwQCVDEupg20AWJnvQL9r3Ta96gu25p2nlAX4cB6MXChYJ7MAgjkIhwayK4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786033182; a=rsa-sha256; cv=none; b=NReqs3aB3kNmAoyVhmycW7gUAlqmB414+sYafrl+2GVLfUP84hxxF1+2XmHbnPiut67tjj dIqrW8FNxD+PIRF3rIoOB7pJmIGnSv0p4yFOHmmx1dOsPYiV2wnOli9pBaaNIOHM7Mtfup R0bFjrjETsCFpC3uRhqW51czaj3/aqDDqe6vMdVFley3JRcaCZb1eREIq/Lva5LHfuVfGF gqVjCWsMQFtH4cSDj5bS85RUji3/hPFGmOz6pb7mtjD/QWQGoUXyGw60G0od+lErJLLEVq qm0mgUezH6xymLEPXWa2JVZ1W/vNIWmdUSlnORcIAcEW3Rx/QrY7U/B28VPepQ== 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=1786033182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nF9BJ3hC4SuGGXipf6RUzl6Iab49c9e2TX1IPvi1OOk=; b=foPmJ0/m9bzy9QiTyoxG1Tb6JIVdOvethjTVg53L0ihljVe9HVVvRikJwD6E7beK1fh8f6 KcVxi/yVsqp4ZNGtRpBXgxLi4f05UBTiDBJdFAylw0qgq0KO3yTJFnSP9JmXzNSFbVvax/ p1FEAUQHlBJBMdWovGeYTzAzdXoNAwsfExn+M5wph3lJWsoEwFKoLE35SjNK1y3f7fuVWm tpDwFPkrBa2ApX8Qro73PdAN1Ekb2kmaGP9tniHGIFUj8ju7ZD7tfnw0XzMCCxC4HpUzRI 7nZpk/jN3NbPpMosqagQYQKvsPjouUjGQ5W9Vc9OsJNSq09heVdGQXeDIBWw7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGCCy191DzCNT for ; Thu, 06 Aug 2026 16:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f06e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 16:19:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pouria Mousavizadeh Tehrani From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: 7f1009d61c3e - stable/15 - net/if.c: Add fib-aware ifa_ifwithaddr() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7f1009d61c3e70b34af749d4d7f21c5e152b3baf Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 16:19:37 +0000 Message-Id: <6a74b419.1f06e.4f756a97@gitrepo.freebsd.org> The branch stable/15 has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=7f1009d61c3e70b34af749d4d7f21c5e152b3baf commit 7f1009d61c3e70b34af749d4d7f21c5e152b3baf Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-07-17 16:11:42 +0000 Commit: Bojan Novković CommitDate: 2026-08-06 16:18:25 +0000 net/if.c: Add fib-aware ifa_ifwithaddr() Add FIB selection logic by introducing ifa_ifwithaddr_fib() to support FIB-specific lookups. Then have ifa_ifwithaddr() wrap it with RT_ALL_FIBS. Also, do the same for ifa_ifwithaddr_check(). Reviewed by: glebius, bnovkov Differential Revision: https://reviews.freebsd.org/D58305 (cherry picked from commit b00d30950cde27eda8f51523a40f2c05a38daac1) --- sys/net/if.c | 29 +++++++++++++++++++++++------ sys/net/if_var.h | 2 ++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index ed22bbd8f8da..8ee7d3f3f924 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1817,18 +1817,18 @@ sa_dl_equal(const struct sockaddr *a, const struct sockaddr *b) } /* - * Locate an interface based on a complete address. + * Locate an interface on the specified fib based on a complete address. */ -/*ARGSUSED*/ struct ifaddr * -ifa_ifwithaddr(const struct sockaddr *addr) +ifa_ifwithaddr_fib(const struct sockaddr *addr, int fibnum) { struct ifnet *ifp; struct ifaddr *ifa; NET_EPOCH_ASSERT(); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { + if ((fibnum != RT_ALL_FIBS) && (ifp->if_fib != fibnum)) + continue; CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family != addr->sa_family) continue; @@ -1849,18 +1849,35 @@ done: return (ifa); } +/* + * Locate an interface based on a complete address. + */ +struct ifaddr * +ifa_ifwithaddr(const struct sockaddr *addr) +{ + + return (ifa_ifwithaddr_fib(addr, RT_ALL_FIBS)); +} + int -ifa_ifwithaddr_check(const struct sockaddr *addr) +ifa_ifwithaddr_fib_check(const struct sockaddr *addr, int fibnum) { struct epoch_tracker et; int rc; NET_EPOCH_ENTER(et); - rc = (ifa_ifwithaddr(addr) != NULL); + rc = (ifa_ifwithaddr_fib(addr, fibnum) != NULL); NET_EPOCH_EXIT(et); return (rc); } +int +ifa_ifwithaddr_check(const struct sockaddr *addr) +{ + + return (ifa_ifwithaddr_fib_check(addr, RT_ALL_FIBS)); +} + /* * Locate an interface based on the broadcast address. */ diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 961259bb0ca1..3d0f0624aed2 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -547,7 +547,9 @@ int ifa_add_loopback_route(struct ifaddr *, struct sockaddr *); int ifa_del_loopback_route(struct ifaddr *, struct sockaddr *); int ifa_switch_loopback_route(struct ifaddr *, struct sockaddr *); +struct ifaddr *ifa_ifwithaddr_fib(const struct sockaddr *, int); struct ifaddr *ifa_ifwithaddr(const struct sockaddr *); +int ifa_ifwithaddr_fib_check(const struct sockaddr *, int); int ifa_ifwithaddr_check(const struct sockaddr *); struct ifaddr *ifa_ifwithbroadaddr(const struct sockaddr *, int); struct ifaddr *ifa_ifwithdstaddr(const struct sockaddr *, int);