From nobody Wed Sep 7 03:55:37 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 4MMpLx4Gqpz4bQDj; Wed, 7 Sep 2022 03:55:37 +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 4MMpLx2cMLz3S9r; Wed, 7 Sep 2022 03:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662522937; 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=2cm7r2w5wZBGnbvCSfDEPXxYQpMB8aLj6RCVu7f74K0=; b=qU+4WHc5i1cs2xJs4s2bUDkn6AyZGtDcQ80Y985UrT+LvZt4VQCM6onNzBvVsdzVdGORMC nzK8JQilTJEG8G/u35IVczDLajxlZmc60C1uQZ/urK1kneY0rGioaoKXSX9PlbyS1E7V2s ObQGvL/c92S6JdUvltOicQxTTlcVdBKepiJqdQdDK2V+QWszaaewYlHeVGt8JJguWWUD0b v3oSlcRYqHEfOr1kW7PsmZ+EOR+7EqLggxdoYZJUXvJRV2MXN/3eyYwhkTTe+2bpI9tIDW 8Qy7k72VuBQ+ZihRkWg6A9BKMpQKjFTtf9NJw9vLf9NvaN/w1A5uFXImnpxRhg== 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 4MMpLx1fnHzPTy; Wed, 7 Sep 2022 03:55:37 +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 2873tbod069911; Wed, 7 Sep 2022 03:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2873tbt4069910; Wed, 7 Sep 2022 03:55:37 GMT (envelope-from git) Date: Wed, 7 Sep 2022 03:55:37 GMT Message-Id: <202209070355.2873tbt4069910@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: aa74cc6d6f99 - main - divert(4): do not depend on ipfw(4) 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa74cc6d6f995f3ede4969ae5e0a0329d02754b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662522937; 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=2cm7r2w5wZBGnbvCSfDEPXxYQpMB8aLj6RCVu7f74K0=; b=WYzvrZwdTaGnrQhnXcBDU/C9NxdXmqSHjRdNOOjt8gzKXsbC7kOpzjbcFUjR68WC3Z6psd 4nawAVI5XluflndSeS7myGUyxBEVt3zICqmm8JL9EsTaBEwxFkEgiyXX0zynMQNImVD7rl 2yScFF3xepGxZSJTc+utw5WOE4d7hFp50NkS9VlBBzw1BvFXpYEpsi53pN/EYr5/lgxV+U uZAQBn9rCZcvPbQeNU0NqpyyvcxQyjPLyTXBhbp1jQqmUK9/IU9fcGNxLrlyNFOT+KU5Zq r+BV6aBg9XT2xcZlxjdTzArrVsrLFPQCgK+/YurcBbxHP1mx1UWvbIaFmzFbaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662522937; a=rsa-sha256; cv=none; b=Zo723lUYxUD1EgwNoIOhTy3/6qfsf/NbT15pt2kFKw9s9k8Jz/Oi3alep9fDNlBo/JTRMP i2HWNCh665/7MDvYR7lBr5QKa/YOmwHkX4gvQwtPWK4O28Eyfns4XqFLs/9DQNlMKrTiT+ oE9epjR0/z/WNKpcJh+Rlku/ErrA7bwEFSipXBzQ3wXeLNciymg10gQXO38um+6I08RZvf fmyK4MfCMhCuq3gCLrrsMCf7eVAWH+MUmpYF3fr8QWaJFnA3HYnQsy/cCye6rDmUIjXtPu J96hUP8K9UXcQ5xiOaxCsN7HqbLVNIwdI5p7nY9/8U+kASIPgL1STlUHLKcq5w== 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=aa74cc6d6f995f3ede4969ae5e0a0329d02754b4 commit aa74cc6d6f995f3ede4969ae5e0a0329d02754b4 Author: Gleb Smirnoff AuthorDate: 2022-09-07 03:54:57 +0000 Commit: Gleb Smirnoff CommitDate: 2022-09-07 03:54:57 +0000 divert(4): do not depend on ipfw(4) Although originally socket was intended to use with ipfw(4) only, now it also can be used with pf(4). On a kernel without packet filters, it still can be used to inject traffic. --- sys/conf/files | 2 +- sys/modules/Makefile | 3 +-- sys/netinet/ip_divert.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 1e3518fcfcb0..a0e969b59e5f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4333,7 +4333,7 @@ netinet/in_prot.c optional inet | inet6 netinet/in_proto.c optional inet | inet6 netinet/in_rmx.c optional inet netinet/in_rss.c optional inet rss -netinet/ip_divert.c optional ipdivert ipfirewall +netinet/ip_divert.c optional ipdivert inet | ipdivert inet6 netinet/ip_ecn.c optional inet | inet6 netinet/ip_encap.c optional inet | inet6 netinet/ip_fastfwd.c optional inet diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0c5e14a5e4c5..68b3dfcac776 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -170,7 +170,7 @@ SUBDIR= \ ${_io} \ ${_ioat} \ ${_ipoib} \ - ${_ipdivert} \ + ipdivert \ ${_ipfilter} \ ${_ipfw} \ ipfw_nat \ @@ -465,7 +465,6 @@ _if_stf= if_stf .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) _if_me= if_me -_ipdivert= ipdivert _ipfw= ipfw .if ${MK_INET6_SUPPORT} != "no" || defined(ALL_MODULES) _ipfw_nat64= ipfw_nat64 diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index aa0ffdb55530..dd76a1792325 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -763,5 +763,4 @@ static moduledata_t ipdivertmod = { }; DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_FIREWALL, SI_ORDER_ANY); -MODULE_DEPEND(ipdivert, ipfw, 3, 3, 3); MODULE_VERSION(ipdivert, 1);