From nobody Wed Nov 08 16:58:54 2023 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 4SQWWf6Y9mz50S5B; Wed, 8 Nov 2023 16:58:54 +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 4SQWWf5hlsz3Fwk; Wed, 8 Nov 2023 16:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699462734; 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=ecVt4SE4UwvuPujauFyaZZrYRAH6LFfZ/YXf8HoqgaU=; b=i4B+UDF/K1O+y/rAtW2CVn++Jpe+SDpm0DL4vAMqj0AHwVMMqRGSRPLNbwhG97YtHuu0KQ ngYVwt5JVxRsfe4uBfS8d87OSdbl7sIN5nJtk/eBYwgCaS5WTWUdFUXbSYRkUzPkkAA4CK r0rx8MlHbhMDtziXZLaV5//WwhLU9uz4VedvjVl4/OyBjtU1G6gfTMckjNI7vJ2ekJmnP/ icVuTK8H8GF74+eFS5VDI4mGEOUQsw4paL+iSuxcY6AkEr84mP+pWm43DR5qgjEUVk3iQA ORKJaheJBFqNUsf2tqpkh00eo43WVO8PJzCT1bj1hJJp+oXdBZ6sFQBe+7gxZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699462734; 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=ecVt4SE4UwvuPujauFyaZZrYRAH6LFfZ/YXf8HoqgaU=; b=AA1NMY7vD7omRZzbwGijyUvxtrJvNrURPezutgeRoe0US61gy0jydQFPLLS5Ww/C3VIahk MtqYTH6WAcpzyrelZKK8If2n3jahNkzEIO/m7SCNIokrBfTSVyF65DMwBsgPLg3MkpF6tC V0KatbfV6bmkng5Pg+t+nTsfr90bNCc0w2dfF7jq+hBdn0XaXnmtf2Afl405z8p7jh+Es1 kwgUlNSTdXEOiXz1kK5ccUO79Im1OXXnTZrh60YJQqzIzr4NSvKO/qSMQ1cuVIGVthgqao GR27ddhnXcGfMaD+65/2ytbzjQ+DXhSwRdL8PZ1P3h8fCQWNBWGlVLfIOYC7KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699462734; a=rsa-sha256; cv=none; b=ZAJAgD0n1cYNi0Fuix9XvfmqhHuuq9xRfDZlynGytYd4lxtVnvodS3JcuLeZbHt89kMnc5 aorZzLF9CJ6w0w5AkwfpxUgpuAAtek2p2PN5f8sSbOO6eck1Jf+t/RI1CCZhVTZj8DCG2D SvlnSNgsESpL/bQnYqTnUUJl9U0/N/1VVrz+bXm+56VeU6EWU7o+LysoitAdx8tMN3obve 2jEhYbt5KGwam1W96Xew5PMnpD7YBfKYIhvA0u+GY9Hl2fw18bUA3Ok+jOgcKVSBOR/gzI eOpXXsoW3okBuM5eFnXAmGYFcjHfkwiKnoy67neyUvr15eZxX62Cz6lNGoE57g== 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 4SQWWf4lRHzhCC; Wed, 8 Nov 2023 16:58:54 +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 3A8GwsQU094548; Wed, 8 Nov 2023 16:58:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8GwsRM094545; Wed, 8 Nov 2023 16:58:54 GMT (envelope-from git) Date: Wed, 8 Nov 2023 16:58:54 GMT Message-Id: <202311081658.3A8GwsRM094545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 85247ee6a2ba - main - tcpdump: decode pfsync packets on network interfaces 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 85247ee6a2ba1c2dd0053e9be9055efa4be1438e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=85247ee6a2ba1c2dd0053e9be9055efa4be1438e commit 85247ee6a2ba1c2dd0053e9be9055efa4be1438e Author: Luiz Amaral AuthorDate: 2023-11-08 15:12:14 +0000 Commit: Kristof Provost CommitDate: 2023-11-08 15:12:14 +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 --- 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;