From nobody Tue Aug 30 23:24:56 2022 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 4MHNgs1qRXz4bYMk; Tue, 30 Aug 2022 23:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MHNgs1PX7z3qn2; Tue, 30 Aug 2022 23:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661901897; 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=f1GJHSWMhMQMpZe0LK6n109tgocLR3gZbmExLVBwRkk=; b=s/n4RQHzS/icDTKTmnWtOIfiuPJD4xJ3edk9HX6ZPw/YbIoiJ7lmr3vfRpU3hSGrVNi0fd /D5zj0ui1p489g8gMoGhxFzUeLuG+YCSoYZ2iXmTX2oxZruCzqTrwlZhGbDInGxnptHLeP 9oLh/UR6WasffEtFuyzSzCzlbzZQNUq4Ld1TCOZkhOWq/K/D0/uAYdVjH+sTD38NjtHyvh KSkkEA62hhH5AjesXYU38qE1od9XSHzPPMX9mYhxu884slEv+p9EyX98g+hpTrzIGuD1Cu VoCjZWnoe8WyxeDI0+di+FJQ64OYncB65HQR56bFwXBsYGiko8iqe2wbfpdWRg== 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 4MHNgs0Tw1zwhl; Tue, 30 Aug 2022 23:24:57 +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 27UNOuHf073207; Tue, 30 Aug 2022 23:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UNOu6f073206; Tue, 30 Aug 2022 23:24:56 GMT (envelope-from git) Date: Tue, 30 Aug 2022 23:24:56 GMT Message-Id: <202208302324.27UNOu6f073206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f70a2e294854 - main - ipfwpcap: use PF_DIVERT/SOCK_RAW instead of PF_INET/SOCK_RAW/IPPROTO_DIVERT 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f70a2e2948540f0fdf6afa332b8bf5197eff4255 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661901897; 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=f1GJHSWMhMQMpZe0LK6n109tgocLR3gZbmExLVBwRkk=; b=Ang6WfxWvo8/Vrr9cx1qB3tSFn2+3EkCY337KdHbbQIKAfMp88cjA2OHMeNZ6k1Ue90F7p 7zSabtw8RuVul3AIVO8GOGypH5Z1uy+nvR/TmOyTSpj1c8OgRkiouyPmsEXBPSqJ4wxTK5 EFALyTM8bT9/5a9u3H1h1YmmIb7Nyw/JgHja50GeG0xCnR5wTh2pMPMhe6BX05Kjj7Hyzj hwBs9H2dDukO4PL6HEfY7H768x1d+tC6g6PHBEQGyPg1FJhkzBfXZT3dMmOOF5ZP60mxU5 5h4LJ4E9ujwq+WH/KxZsRqYNXpuI/NOz36dKX7wJmmX4VkRPF8b/50PHgsvG1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661901897; a=rsa-sha256; cv=none; b=vbrIkVteV554aJz24i5HELqWaY3zPQgR3ADnfV1pRbYJwY/Nv55lNRKzchbpwn/QtzQL41 ZUiIJTTA4aFqQFoOwvGAuIj1nDvVknvDa3G6w/mulNm3ToU8YKfQQYv0xqhaIJ81ygX3ui 7LJw0t7F0vi2mzMhSqcuON18aPW7AkoEAU+S+TVGTOLJjqVHxkVqe5QiLVILon2y1p8+GS uavMf+3jeAooQ4HY5SfAujCDfKOIpIsFftk6bsqwGyEOqsZzQDa0Vf309P1XcKDl5plkkI svoHDCvg5DiXPw9AFdYFdcNclTLg2K0iafPwzBNVU9eDga/o9TO2tcXzLz4L6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f70a2e2948540f0fdf6afa332b8bf5197eff4255 commit f70a2e2948540f0fdf6afa332b8bf5197eff4255 Author: Gleb Smirnoff AuthorDate: 2022-08-30 23:22:50 +0000 Commit: Gleb Smirnoff CommitDate: 2022-08-30 23:24:37 +0000 ipfwpcap: use PF_DIVERT/SOCK_RAW instead of PF_INET/SOCK_RAW/IPPROTO_DIVERT --- usr.sbin/ipfwpcap/ipfwpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ipfwpcap/ipfwpcap.c b/usr.sbin/ipfwpcap/ipfwpcap.c index 96ee47e836a6..22a83220855f 100644 --- a/usr.sbin/ipfwpcap/ipfwpcap.c +++ b/usr.sbin/ipfwpcap/ipfwpcap.c @@ -202,7 +202,7 @@ main(int ac, char *av[]) if (debug) fprintf(stderr, "bind to %d.\ndump to '%s'.\n", portnum, dumpf); - if ((r = socket(PF_INET, SOCK_RAW, IPPROTO_DIVERT)) == -1) { + if ((r = socket(PF_DIVERT, SOCK_RAW, 0)) == -1) { perror("socket(DIVERT)"); exit(2); }