From nobody Mon Jul 20 17:29:56 2026 X-Original-To: dev-commits-src-main@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 4h3nZs1lclz6mGdB for ; Mon, 20 Jul 2026 17:29:57 +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 4h3nZs1Gr1z3VB6 for ; Mon, 20 Jul 2026 17:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784568597; 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=qwIeX/d3++TL5eLXGgSY4H1k0bOlm2fRel1TnaoNmfQ=; b=uv6sD9YtWBQoaeoB8ML+6rPcA+R5IhE8hAW5uF1/jL8MjWtp1bkjKcoNzkngGFhtdT1Uo7 hasa+bMDYC1PjuI/D5b8/gk4+qzthZA8HbMIAPLW3jhuxZOGB27sX88iPVR5thsFVbPelx QYhweXTFngLqm0SRD6fJz1ni9l8ic830vxYGOuohDi+FpC4RIf4CmrlN4Uj1m5oEwtftWA 6h9rhIOZxHiWNXqsG3K0aD/diAo76yYtQz2vGeG1UIvJKYBXkv5Q1zlNv+v/o8g6Y1KL1m pYTVFhM/dznD0Cjzf7+LmgghEZ4GaAxIm2dY1O8O3Jl4u/zx1Lll8KZISI5t1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784568597; a=rsa-sha256; cv=none; b=PSjDIKqqt2cTFCgS8wzRn+5FdjpXs6Moon4y+pFvFp8z4PyvIHusUJvitOgohDRyGVhzfZ zr73rMgve+bnwcq2jWh3IG7nIpQKGSY0LEHVSWg9qJcHqFZF7aIN25ViRHBJq3cEJi4X+B CKeel2Oy7qIRD7HgbnE4zyljWBp3QlpI5s+6OCtCHO7xo44RjqJFjF6wngFWVx1ixqG0Yk wLl2ElVlfMHMLJDZWkYtJoiBJBG5NJKUdBx2Cw01q5GRWH6TbJTq2YNOLluvsXowCG48cL yw+pG65PCdIy4RDMwnnywcq6MAdskAPxBunKmjFB0cXs2FP+x3Bhke3p+F/mng== 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=1784568597; 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=qwIeX/d3++TL5eLXGgSY4H1k0bOlm2fRel1TnaoNmfQ=; b=bdhbka1bnGtvbPaO9420D1TT9DfeZGCG8KntFqIOYw4EFjZ1PtyIelnVuwcZX4XVtkqF+0 cxFliYEDrrfZmPl9FUUpp4MCiGyUrnEH8XRGg+fGp4rUr0a/akM0XPRBOTRylhtM2vc05v Ua+K0L61zXyYHMYuURzjcb47Xk1kS2lTGKP5qsNABZ4zyYMJvdDl3Hki/5DwJkeiAUVl8N fuZ2cXJWU0i9Fcl3+resPAh9abyZZqECR/Y/Tm43Od3h3Qz60H0nSbzaYsDxviIRYRtxTw eFBHDv8iSPEXJ3jytup/RQi7nHrQqYCMbln2UFEkHvJqfYvHISTKAKldI0dLTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h3nZr6zsbz19gx for ; Mon, 20 Jul 2026 17:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3770f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Jul 2026 17:29:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: b00d30950cde - main - net/if.c: Add fib-aware ifa_ifwithaddr() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b00d30950cde27eda8f51523a40f2c05a38daac1 Auto-Submitted: auto-generated Date: Mon, 20 Jul 2026 17:29:56 +0000 Message-Id: <6a5e5b14.3770f.65ed1c48@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=b00d30950cde27eda8f51523a40f2c05a38daac1 commit b00d30950cde27eda8f51523a40f2c05a38daac1 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-07-17 16:11:42 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-07-20 17:27:15 +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 --- 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 440b40102d53..1c57eb1492c2 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1708,18 +1708,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; @@ -1740,18 +1740,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 3c65b2b4d2d8..9a425fd81054 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -563,7 +563,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);