From nobody Sat Jun 17 10:06:03 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 4Qjs9l2J9Xz4f3Vg; Sat, 17 Jun 2023 10:06:03 +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 4Qjs9l1qJ8z3qMW; Sat, 17 Jun 2023 10:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686996363; 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=3vSGKZFdyu/zAL9NRW5fvoChZj/qT30vs4l8rsuInOc=; b=FPahwvrHn2LqAr7nmbkj4p4urcV8hE60VcxpFgpHyYCFhtDQHoHe9yS7vwFUwWzT8E7JRb N9AzJexrzwl6ibBleFhf9babAydmx75rc9cCmJTWibWH+rOU2z/DbjtfzroRCYAepHz2ad kmpxrOqZXUG8ionJooEPpr42j0O3whNZvcDUJ86hgTTRtPM98mJnYOajsH2ToB8FuRw5Ho mWgCa82RAxRy9Ws4s99pnmuiMU6x14SXtMaFS/rGupCfB/7XTQ8sykYQwQlayHSRp6UnAQ XFaF58miR7n7SSQJYhOkJKYl4bnsqWrWWkxcZod0eHTJ5fqZVlckPcmXiN9oSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686996363; 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=3vSGKZFdyu/zAL9NRW5fvoChZj/qT30vs4l8rsuInOc=; b=QxpK+DyZKVggfomCObZlRtBmL29KcPDdnFv4rlnZwM3PECLlY2Zysvh163K4PpoAtWbQUN 9Dez5Dhh/GsEdAQcgbBrtPiMDnEqZLiUWJosJGtEw8Yzu/sG6iIeMIkcSOh3JQzjuSg79k 094F6lE9YnOsPCc+GHUvka9J8uz+oOmucFpWmE2MsJLaBRinlTx/lW9G90z/Kl4K7rBdUd 4UpQNEDgYDSqWb9doykEQgk/4p1DYjm+RUixCZV/H5itQFSAiUY6O57oqGuGh1nuuQ/GO4 y4Bl21H2EiIfBilwr+KP6u0wd/w066NS2wEDVjgnBABGjbQcB2fYmkoI568jtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686996363; a=rsa-sha256; cv=none; b=UEpuFh3ZyK8Hv/hXAQu4SqTSIw264at6UyiS1Uf9nu/Sngr9YMK2Aj0qFxU3mp9hcTN42X nA2tcHfGWwkSd8JEKQxjHFoosYzHZJK7JFTT4GcSDRVKbkZIg/vdbcWdkYs9CBok1eAPAR CCBvWO2cJwMo1bQVPZJ0c2gBMUGUuSs/KIvd1Papec7tDyl83bNeM+i6Lsq0CWfTiGpa/a ZbJTD6051YB4tdvjOTxnjwqpH2/Ynhzv2tcUr0QSp8vaD2X/5VYvaA9heA2eZNvEtCtc9H KMhbqoFvwyZh5bqDqYe0me/T76D3ToIomN7T5ImRkJZ0sqWa3keoDOCwBHNv5A== 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 4Qjs9l0sZvz159f; Sat, 17 Jun 2023 10:06:03 +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 35HA63V0091044; Sat, 17 Jun 2023 10:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35HA6329091043; Sat, 17 Jun 2023 10:06:03 GMT (envelope-from git) Date: Sat, 17 Jun 2023 10:06:03 GMT Message-Id: <202306171006.35HA6329091043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 1ad8d2ee1f7d - main - tcpdump: Reconnect pfsync printer 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: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ad8d2ee1f7dec1d747ec955a68fbbb362958315 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad8d2ee1f7dec1d747ec955a68fbbb362958315 commit 1ad8d2ee1f7dec1d747ec955a68fbbb362958315 Author: Joseph Mingrone AuthorDate: 2023-06-16 13:40:00 +0000 Commit: Joseph Mingrone CommitDate: 2023-06-17 10:05:58 +0000 tcpdump: Reconnect pfsync printer Fixes: ee67461e (tpcdump: Update to 4.99.4) Reported by: glebius Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D40578 --- contrib/tcpdump/netdissect.h | 2 +- contrib/tcpdump/print-pfsync.c | 4 ++-- contrib/tcpdump/print.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h index a4b05b557616..7696c4e41cd8 100644 --- a/contrib/tcpdump/netdissect.h +++ b/contrib/tcpdump/netdissect.h @@ -698,7 +698,7 @@ extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int); extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int); extern void otv_print(netdissect_options *, const u_char *, u_int); extern void pfsync_ip_print(netdissect_options *, const u_char *, u_int); -extern u_int pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); +extern void pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *); extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *); extern void pimv1_print(netdissect_options *, const u_char *, u_int); diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c index 83670481d40f..5710e36ded6c 100644 --- a/contrib/tcpdump/print-pfsync.c +++ b/contrib/tcpdump/print-pfsync.c @@ -57,7 +57,7 @@ static void print_src_dst(netdissect_options *, const struct pfsync_state_peer *, uint8_t); static void print_state(netdissect_options *, union pfsync_state_union *, int); -u_int +void pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register const u_char *p) { @@ -78,7 +78,7 @@ out: hex_print(ndo, "\n\t", p, caplen); } fn_print_char(ndo, '\n'); - return (caplen); + return; } void diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c index 42a4548e8689..41a6b524fbf8 100644 --- a/contrib/tcpdump/print.c +++ b/contrib/tcpdump/print.c @@ -188,6 +188,9 @@ static const struct printer printers[] = { #if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H) { pflog_if_print, DLT_PFLOG }, #endif +#if defined(DLT_PFSYNC) && defined(HAVE_NET_PFVAR_H) + { pfsync_if_print, DLT_PFSYNC}, +#endif #ifdef DLT_PKTAP { pktap_if_print, DLT_PKTAP }, #endif