From nobody Mon Apr 11 11:25:13 2022
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 A7FCF1A8B173;
	Mon, 11 Apr 2022 11:25:13 +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 4KcRNT4K8yz4bFQ;
	Mon, 11 Apr 2022 11:25:13 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1649676313;
	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=/FcSTQqEC22A0hBV9L5OHfEApHKzyM5JUfVBetgN7Z4=;
	b=soIUgA7HZU/7QXEaGTO5NuTf/o+rVANoA3DbTG3rK9pQNovH/zqOyuZ0blRLF70YytsdVn
	593lAE0sk0GpGJY1rDoSh/43wsPJOdFM3Bq6yESWD+mLXsiffIYslk4LHOSLTbKnlCbKW5
	rH867Oz8rHjGUa48nZvYcYOZ4Hijx/W+O/zbCQ/SDOFVcF4uost1DVhBFphREUnXEAilk+
	i52iuMwmIIRJoXynVhQJ6ei+0N5p1XtT9JyJbZV9XlQgcxgqZp5qdqyRmKeOQqeLDKS2eN
	GdekAJ1DExgdHbw7EL9W2Vipk8kQljvDzdnEJ039yGZdLWvHSBzuhYl3Lyup1g==
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 709E621FAA;
	Mon, 11 Apr 2022 11:25:13 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23BBPDgt040968;
	Mon, 11 Apr 2022 11:25:13 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BBPD8o040967;
	Mon, 11 Apr 2022 11:25:13 GMT
	(envelope-from git)
Date: Mon, 11 Apr 2022 11:25:13 GMT
Message-Id: <202204111125.23BBPD8o040967@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Subject: git: 7d98cc096b99 - main - Fix ipfw fwd that doesn't work in some cases
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: ae
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 7d98cc096b995ca3bfd85277ed009b0f872c3e1b
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1649676313;
	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=/FcSTQqEC22A0hBV9L5OHfEApHKzyM5JUfVBetgN7Z4=;
	b=DlNMVLjIH4bSL76Gjthq81mRxYJfgWxQLExZ2mPDSk8lcG15eMxqivfW3QLKRHzoBCu6n7
	BWMkN52C9sWHc+b+un1erh3enntMmFgFGX/IrVBmk//0ZiPqqOe6jENy/3CLxWp6g41nVB
	X8qoOS/+4EPSchs30vckkh++igrkW3p7WqnKnPQ3tXXzOnJQTfbTI+y/M3dGh6NoaZ2kdy
	avn62G1N1x3yIwz3UkGjC9x4zhsvVtcBOY9/FVMC4yjPIqb+DFYdWaE3tD//JXutzLjzPP
	r3h04knxubrnKL3fUrU0aMO03g2GPeDPICllLQHRA3mtqtGXo7d16LOFhA/MwA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649676313; a=rsa-sha256; cv=none;
	b=e+ogfxtGUI5Ub03icZL5DsbbwDJAXwM0V6Wd4RuoMg6aEs+smgvt46gUUplOjnhHEKKbVL
	Gyao/O59n78ek8R/LkVwd4pB37tCZ59bzyy6kImP3vD3spd4kTyFLmPlDGqapFiBZJav+r
	izJOA/ale1pRQz1m23FSoICu03ZmJdnuWH4nCqRui8z2+jGjKqInzNwvbY3NZlnb6Fjovh
	uzrwUCKqetSc0TUS3NLkQACdM4UpD89S9lKomoe9ZPOQfgyBEXIiYcYFZqtCTuNMBCfYjR
	XHR0Uu4iWdVpVYbgfZwCcdzrYFB/t03YCTwWyiStFwnLSDrZeiPRA254cBgIyw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by ae:

URL: https://cgit.FreeBSD.org/src/commit/?id=7d98cc096b995ca3bfd85277ed009b0f872c3e1b

commit 7d98cc096b995ca3bfd85277ed009b0f872c3e1b
Author:     Andrey V. Elsukov <ae@FreeBSD.org>
AuthorDate: 2022-04-01 13:49:25 +0000
Commit:     Andrey V. Elsukov <ae@FreeBSD.org>
CommitDate: 2022-04-11 11:16:43 +0000

    Fix ipfw fwd that doesn't work in some cases
    
    For IPv4 use dst pointer as destination address in fib4_lookup().
    It keeps destination address from IPv4 header and can be changed
    when PACKET_TAG_IPFORWARD tag was set by packet filter.
    
    For IPv6 override destination address with address from dst_sa.sin6_addr,
    that was set from PACKET_TAG_IPFORWARD tag.
    
    Reviewed by:    eugen
    MFC after:      1 week
    PR:             256828, 261697, 255705
    Differential Revision: https://reviews.freebsd.org/D34732
---
 sys/netinet/ip_output.c   | 2 +-
 sys/netinet6/ip6_output.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 818d115d8a2d..b68a6536c8b8 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -513,7 +513,7 @@ again:
 	} else {
 		struct nhop_object *nh;
 
-		nh = fib4_lookup(M_GETFIB(m), ip->ip_dst, 0, NHR_NONE,
+		nh = fib4_lookup(M_GETFIB(m), dst->sin_addr, 0, NHR_NONE,
 		    m->m_pkthdr.flowid);
 		if (nh == NULL) {
 #if defined(IPSEC) || defined(IPSEC_SUPPORT)
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 406776bdb5a4..818b08c3ab40 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -772,6 +772,8 @@ again:
 		ia = ifatoia6(nh->nh_ifa);
 		if (nh->nh_flags & NHF_GATEWAY)
 			dst->sin6_addr = nh->gw6_sa.sin6_addr;
+		else if (fwd_tag != NULL)
+			dst->sin6_addr = dst_sa.sin6_addr;
 nonh6lookup:
 		;
 	}