From nobody Wed Nov 15 20:00:08 2023 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 4SVvCX3NQqz50glP; Wed, 15 Nov 2023 20:00:08 +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 4SVvCX2Wqgz4XV3; Wed, 15 Nov 2023 20:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700078408; 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=flWY8x64bz8Ls++9ggpoJn+UeiSLkUxiEItq7Hqc0Mg=; b=i1SNhUv2QvAwqV4q5mvIU4NPEN+qQebXdwqkcxwYdyJMKLmqF0GffD4gQHdnOND63xE6qQ bVHIU5TTlxlrsfgk2qZYLSnuxF35jBieZ4dSt4KByK0QI4uzK9Zu0Hfq93QQ2MB8vWRt6Y uIE401lR+r1XQPjfEnkfo7C7XyXjx0ftTHgu3QNM6bW8Dx7idIBnC38sMdm+hF4iOvG6sc zTnRZHSF7P+EGiz09paBNWMSlBz/Fq/9l8A3wHMwjCNOHlDZ68nS7O0lRCfoHdbt4r9CpI IH1lJ7sbm270b+UDCQJNwcGOD9c27aZa9BdV7Dfkaz4AiUC24BrKgDJpHGzEqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700078408; 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=flWY8x64bz8Ls++9ggpoJn+UeiSLkUxiEItq7Hqc0Mg=; b=CvoXcqJxHZta6ubVCkFtuMPRgSRE2qNjS3/IHjIFNnnescZvHIrcDAd66xJk52DnRWSpWs s4Yy0kJsW09KENYsZgCCH3Con9Y60NwP39dZg4TqY1Emh8hjPBUcV+CRmCzYI35c95u2Xm PIRXpefUa9RW9m+DPpPPSLvW+5AAJ06ogR4P4Vs+t/jJANTuQ//vY2c+40x/Mj4/5xm6by /brw4g13fVVwTG7t+VWvJ14XBHlJGDKOqCppjubv0JogH6fGooDTEF7aS9Sh2ODsUnGlcE Iy23FWT0ix/I59hdByduzBukfGKa/6XFmQyld430Me8qzJGEd9VLAk2Z4uKZ7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700078408; a=rsa-sha256; cv=none; b=S3/BK7fljz0M2naDEIKfUb9Fkn9Q6Mon8QdbHvOxEMmfigPfILXDivILKfplmVujZG8q5x WXyc5g+f47dMNC3a+mchlBJykwxhXddP4p43N7rOenqElpwBh3ZjuB1qKOkA+O9oQ/lWTx a+Oxo23ep2qJUVywphTGzqeqkTkNB4kl6JEjAlgWWip7Gzr0Hy3DoM6zZwxVdlqc/DYLjl EYvEBR8ePfFpeJIX1oJ6tkK+x+4P9rEPh6giIur/T65K0cxbcz6+rEMEa8q3bukYySwuLp T9Ru6OwYxPzBsGvE0DBYi+8I33cyKz0aNoKSOjxX7IS2D8uaAa2oOcVMrBoPpQ== 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 4SVvCX1b07zVh2; Wed, 15 Nov 2023 20:00:08 +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 3AFK08QJ049680; Wed, 15 Nov 2023 20:00:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFK08su049676; Wed, 15 Nov 2023 20:00:08 GMT (envelope-from git) Date: Wed, 15 Nov 2023 20:00:08 GMT Message-Id: <202311152000.3AFK08su049676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f88698a4ebc6 - stable/14 - tcpdump: decode pfsync packets on network interfaces 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: 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f88698a4ebc6e879608a435a6ffda475190dc739 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f88698a4ebc6e879608a435a6ffda475190dc739 commit f88698a4ebc6e879608a435a6ffda475190dc739 Author: Luiz Amaral AuthorDate: 2023-11-08 15:12:14 +0000 Commit: Kristof Provost CommitDate: 2023-11-15 09:45:33 +0000 tcpdump: decode pfsync packets on network interfaces When print-ip-demux.c was introduced on ee67461e, the pfsync_ip_print function was missed, causing tcpdump to treat pfsync packets on network interfaces as an unknown protocol. MFC after: 1 week Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D42504 (cherry picked from commit 85247ee6a2ba1c2dd0053e9be9055efa4be1438e) --- contrib/tcpdump/print-ip-demux.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/tcpdump/print-ip-demux.c b/contrib/tcpdump/print-ip-demux.c index a0a6fbd11f3a..758601910881 100644 --- a/contrib/tcpdump/print-ip-demux.c +++ b/contrib/tcpdump/print-ip-demux.c @@ -216,6 +216,12 @@ again: } break; +#ifdef HAVE_NET_IF_PFLOG_H + case IPPROTO_PFSYNC: + pfsync_ip_print(ndo, bp, length); + break; +#endif + case IPPROTO_NONE: ND_PRINT("no next header"); break;